Brad Davis
|
aea07fe671
|
Merge branch 'master' into gl4_1
Conflicts:
libraries/gpu/src/gpu/Config.slh
libraries/render-utils/src/deferred_light_limited.slv
libraries/render-utils/src/simple.slf
libraries/render-utils/src/simple_textured.slf
tests/render-utils/src/main.cpp
tools/scribe/src/main.cpp
|
2015-07-31 15:08:37 -07:00 |
|
ZappoMan
|
8007fba909
|
add type to shader include
|
2015-07-23 15:37:56 -07:00 |
|
ZappoMan
|
e6262de864
|
CR feedback
|
2015-07-23 14:56:52 -07:00 |
|
Brad Davis
|
fbf3a0cbe6
|
Working on GL 4
|
2015-06-23 09:48:16 -07:00 |
|
Sam Gateau
|
9b63739a72
|
Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations
|
2015-03-31 17:35:34 -07:00 |
|
Sam Gateau
|
614e1aa6ae
|
Cleaning the Model rendering path from any use of glMaterial
|
2015-01-14 16:44:44 -08:00 |
|
Sam Gateau
|
d9efafac7e
|
updating the model fragment shaders to use DeferredBUfferWrite
|
2015-01-13 14:11:38 -08:00 |
|
Sam Gateau
|
522e7698a5
|
first step factorizing the packDeferredFragment
|
2015-01-13 10:23:00 -08:00 |
|
Sam Gateau
|
fc698a8525
|
first step factorizing the packDeferredFragment
|
2015-01-12 18:51:26 -08:00 |
|