Andros Baphomet
fe0a761ce6
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
indra/newview/app_settings/shaders/class1/deferred/alphaNonIndexedNoColorF.glsl
indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyF.glsl
indra/newview/app_settings/shaders/class1/deferred/fxaaF.glsl
indra/newview/app_settings/shaders/class1/deferred/giF.glsl
indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl
indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl
indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedF.glsl
indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedNoColorF.glsl
indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl
indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl
2013-11-03 12:17:50 -05:00
Shyotl
af8f8bb040
Mats.
2013-11-02 01:20:05 -05:00
Andros Baphomet
f6861cd5ba
Fix shader compilation/out-of-spec issues
2013-10-05 17:33:34 -04:00
Shyotl
08a3828cc9
Applied Tofu Linden's water atmospherics improvements.
...
59f73ee6a143fdcb8d84
2012-12-08 16:50:35 -06:00
Shyotl
e8ec81bf04
Experimentation with normalpacking and component precision.
2012-10-14 04:00:02 -05:00
Siana Gearz
3f0f955a76
Catching up with Lindies part 2
2012-03-25 10:47:20 +02:00
Shyotl
ffb285c6ff
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
...
-Nametag bubble visbility is oddly inconsistent. May vanish with future planned UI merges...
-VBOs are PAINFULLY slow on ATI hardware. This repos self-compiled davep/shining-fixes branch, so I'll leave the ball in LL's court for now regarding that.
2011-12-09 14:02:29 -06:00
Shyotl
8e7733b2ce
Lazy shader update. attribute -> ATTRIBUTE, varying -> VARYING. Moved some shader preprocessor stuff from llviewershadermgr.cpp to llshadermgr.cpp to match LL (although it looks more messy)
2011-11-24 01:03:03 -06:00
Shyotl
9bda97786f
Batch indexing/no-fixed-function WIP.
2011-08-09 01:11:05 -05:00
Shyotl
0193173e46
Added #version string to many shaders. Added a few to-be-implemented shader files
2011-05-18 14:58:57 -05:00
Shyotl
d1d6994419
Full v2.6 renderer.
2011-05-12 00:13:38 -05:00
Shyotl
ef90cc74e4
Whoops. Reverting some stuff I was toying around with.
2011-03-10 23:13:00 -06:00
Shyotl
1b039a1be6
Deferred has sky and water textures now. Underwater is still borked.
...
Deferred fastalpha behaves a bit better.
Pulled over patch for https://jira.secondlife.com/browse/STORM-336 and https://jira.secondlife.com/browse/STORM-1011 from linden repo
Sky rendered using new LL method. Assuming this fixes issues on AMD cards(works on cat 11.2)
Added a few things missed related to spatial-parition updating.
Added 'SkipReflectOcclusionUpdates' setting that prevents occlusion updates for reflection pass. Less taxing on CPU.
2011-03-10 23:06:46 -06:00
Hazim Gazov
7a86d01598
Imported existing code
2010-04-02 02:48:44 -03:00
