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

..

alphamaskF.glsl

Catching up with Lindies part 2

2012-03-25 10:47:20 +02:00

alphamaskV.glsl

Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.

2011-12-09 14:02:29 -06:00

clipF.glsl

Missed two shaders in earlier v3 merge.

2012-04-16 23:22:18 -05:00

clipV.glsl

Missed two shaders in earlier v3 merge.

2012-04-16 23:22:18 -05:00

customalphaF.glsl

Catching up with Lindies part 2

2012-03-25 10:47:20 +02:00

customalphaV.glsl

Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.

2011-12-09 14:02:29 -06:00

debugF.glsl

Catching up with Lindies part 2

2012-03-25 10:47:20 +02:00

debugV.glsl

Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.

2011-12-09 14:02:29 -06:00

downsampleDepthF.glsl

Mats.

2013-11-02 01:20:05 -05:00

downsampleDepthRectF.glsl

Mats.

2013-11-02 01:20:05 -05:00

downsampleDepthV.glsl

Occlusion FBOs in deferred.

2013-10-26 18:07:56 -05:00

glowcombineF.glsl

Fix shader compilation/out-of-spec issues

2013-10-05 17:33:34 -04:00

glowcombineFXAAF.glsl

Fix shader compilation/out-of-spec issues

2013-10-05 17:33:34 -04:00

glowcombineFXAAV.glsl

Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.

2011-12-09 14:02:29 -06:00

glowcombineV.glsl

Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.

2011-12-09 14:02:29 -06:00

highlightF.glsl

Catching up with Lindies part 2

2012-03-25 10:47:20 +02:00

highlightV.glsl

Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.

2011-12-09 14:02:29 -06:00

occlusionCubeV.glsl

Lindie viewer-dev catchup regarding rendering pipeline.

2012-06-30 20:05:31 -05:00

occlusionF.glsl

Catching up with Lindies part 2

2012-03-25 10:47:20 +02:00

occlusionV.glsl

Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.

2011-12-09 14:02:29 -06:00

onetexturenocolorF.glsl

Catching up with Lindies part 2

2012-03-25 10:47:20 +02:00

onetexturenocolorV.glsl

Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.

2011-12-09 14:02:29 -06:00

solidcolorF.glsl

Catching up with Lindies part 2

2012-03-25 10:47:20 +02:00

solidcolorIntelV.glsl

Dirty patch Intel HD4000 shader-confusion

2013-05-27 06:47:00 +02:00

solidcolorV.glsl

Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.

2011-12-09 14:02:29 -06:00

splattexturerectF.glsl

Fix shader compilation/out-of-spec issues

2013-10-05 17:33:34 -04:00

splattexturerectV.glsl

Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.

2011-12-09 14:02:29 -06:00

twotextureaddF.glsl

Catching up with Lindies part 2

2012-03-25 10:47:20 +02:00

twotextureaddV.glsl

Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.

2011-12-09 14:02:29 -06:00

uiF.glsl

Catching up with Lindies part 2

2012-03-25 10:47:20 +02:00

uiV.glsl

Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.

2011-12-09 14:02:29 -06:00