Commit Graph

12893 Commits

Author SHA1 Message Date
Vincent Lejeune
dea23d7a69 Properly reapply HD3000 particle fix 2014-09-10 18:57:40 +02:00
Vincent Lejeune
e77b5dddeb Revert "Forgot to fix a particle shader for hd3000"
This reverts commit 48fcea8ee8.
2014-09-10 18:57:03 +02:00
Vincent Lejeune
48fcea8ee8 Forgot to fix a particle shader for hd3000 2014-09-10 18:09:38 +02:00
Vincent Lejeune
2e860207d2 Move texture management function in a separate file. 2014-09-10 17:05:08 +02:00
Marianne Gagnon
2672d9b923 Merge branch 'master' of https://github.com/supertuxkart/stk-code 2014-09-09 20:47:35 -04:00
Marianne Gagnon
cc3924081a Fix LOD 2014-09-09 20:47:22 -04:00
Vincent Lejeune
112ae43d03 Remove unneeded if (version/glcap) in shader ctor 2014-09-10 01:49:37 +02:00
hiker
8e12e68425 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-09-10 09:45:12 +10:00
Vincent Lejeune
8fd97615f3 Fix particle for hd3000 2014-09-10 01:42:51 +02:00
hiker
ae726b0902 Show "?" if a track has no screenshot (instead of the screenshot of
the previous track).
2014-09-10 09:39:20 +10:00
Vincent Lejeune
6e6b8e63b6 Inverted logic for compute shaders 2014-09-10 01:37:36 +02:00
Vincent Lejeune
c374beeb10 Disable all extension on OSX
OSX does support GL 4.1 + a couple of 4.2 extensions. Since not all 4.2
extensions are present, disable extensions support instead of supporting
several combinaisons of extensions.
2014-09-10 00:20:32 +02:00
vlj
9adda0bfeb Try to fix OSX 2014-09-09 21:58:53 +02:00
vlj
e8288c139d Add some documentation to add new material. 2014-09-09 17:48:22 +02:00
vlj
cc141fc992 Factorize matrix block uniform assignment 2014-09-09 17:27:10 +02:00
vlj
fbe2896460 Use non debug gl ctx in non debug build 2014-09-09 16:57:46 +02:00
vlj
a45152b915 Clean some #define 2014-09-09 16:39:28 +02:00
hiker
81da7cc2f7 Merge branch 'master' of github.com:supertuxkart/stk-code 2014-09-09 13:18:17 +10:00
hiker
1a7b384633 Fixed typo. 2014-09-09 13:14:56 +10:00
Vincent Lejeune
a83ef4ae2e Preload power up textures 2014-09-09 01:08:38 +02:00
Vincent Lejeune
e8db943dc2 Make computeCameraMatrix faster 2014-09-09 00:52:21 +02:00
vlj
ef89e168f8 Improve fps translation code. 2014-09-08 20:15:11 +02:00
vlj
eaf9d796e8 Fix missing material in basic glsl 2014-09-08 19:27:41 +02:00
vlj
752741307e Fix transparent in basic glsl pipeline 2014-09-08 19:14:21 +02:00
vlj
5f0b6095ba Fix basic glsl pipeline 2014-09-08 19:03:04 +02:00
vlj
9a19f6541b VAOManager: double buffer size when required. 2014-09-08 16:49:48 +02:00
vlj
24a626877a Use immutable storage for ibo 2014-09-08 16:33:10 +02:00
hiker
52a9993ba3 Minor cosmetic changes. 2014-09-08 21:26:49 +10:00
Vincent Lejeune
68cbe48969 Optimise VAOManager::getBase() 2014-09-08 03:01:50 +02:00
Vincent Lejeune
fee5858959 Do not make handle not resident when deleting GLMesh
There is no way to delete an Handle except by deleting underlying
texture so it's fine.
2014-09-08 02:26:48 +02:00
Vincent Lejeune
f3ec623093 Add a profiler marker for buffer upload 2014-09-08 01:33:21 +02:00
Marianne Gagnon
5ac75b915a Find better names for markers 2014-09-07 18:56:21 -04:00
Marianne Gagnon
01d114329f Add profiler markers in race update 2014-09-07 18:54:36 -04:00
hiker
abb14c7cab Merge branch 'master' of github.com:supertuxkart/stk-code 2014-09-08 08:07:17 +10:00
hiker
e55d3c9896 Removed some unnecessary #includes in .hpp files to reduce compile time. 2014-09-08 08:06:54 +10:00
Vincent Lejeune
ad4dcd9245 Fix new[]/delete[] mismatch 2014-09-07 23:04:30 +02:00
Vincent Lejeune
28fc15640c Use previous way to detect features 2014-09-07 22:58:13 +02:00
Deve
5692e47739 Set selection to "start" by default in track info screen.
Don't start the race using left or right arrow.
2014-09-07 22:52:45 +02:00
Vincent Lejeune
9116431792 Use unordered_map for vaomanager 2014-09-07 20:00:21 +02:00
Vincent Lejeune
af4136f864 Factorize vaomanager in its own file. 2014-09-07 19:58:53 +02:00
Vincent Lejeune
193b588e22 Do not render GI if no RSM. 2014-09-07 19:14:20 +02:00
Vincent Lejeune
e2a9f34186 Clean some unneeded code. 2014-09-07 19:08:10 +02:00
Vincent Lejeune
3617055115 Use tinygettext for fps/polycount/Ktris 2014-09-07 19:03:09 +02:00
Vincent Lejeune
b78cffb432 Remove unneeded omp.h include 2014-09-07 18:39:16 +02:00
Vincent Lejeune
d16e192f75 Fix minimap generation 2014-09-07 18:38:31 +02:00
hiker
803f1260d0 Merge pull request #1509 from konstin/asan
fixing crash when running with asan
2014-09-08 01:08:16 +10:00
konstin
30bb8ca2fd fixing crash when running with asan 2014-09-07 15:57:53 +02:00
hiker
6c8c4de899 Fix windows compilation with new dependency package (libglew only
comes with dynamic libs, not static).
2014-09-07 23:09:29 +10:00
Vincent Lejeune
9f940770a4 Make frustrum culling calculation parallel 2014-09-07 01:37:06 +02:00
Vincent Lejeune
4822b8a75e Fix travis 2014-09-07 00:44:56 +02:00