Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
fe0a761ce6b1a0aabb3ef5bb4a166f1057f4bbcd
SingularityViewer/indra/newview/app_settings/shaders/class1/deferred
History
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
..
alphaF.glsl
Merge remote-tracking branch 'upstream/master'
2013-11-03 12:17:50 -05:00
alphaV.glsl
Mats.
2013-11-02 01:20:05 -05:00
attachmentShadowF.glsl
Catching up with Lindies part 3
2012-03-26 15:01:53 +02:00
attachmentShadowV.glsl
Mats.
2013-11-02 01:20:05 -05:00
avatarAlphaNoColorV.glsl
Mats.
2013-11-02 01:20:05 -05:00
avatarEyesV.glsl
Fixies, missed files
2012-03-28 01:45:10 +02:00
avatarF.glsl
Mats.
2013-11-02 01:20:05 -05:00
avatarShadowF.glsl
Catching up with Lindies part 2
2012-03-25 10:47:20 +02:00
avatarShadowV.glsl
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
2011-12-09 14:02:29 -06:00
avatarV.glsl
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
2011-12-09 14:02:29 -06:00
blurLightF.glsl
Merge remote-tracking branch 'upstream/master'
2013-11-03 12:17:50 -05:00
blurLightV.glsl
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
2011-12-09 14:02:29 -06:00
bumpF.glsl
Mats.
2013-11-02 01:20:05 -05:00
bumpSkinnedV.glsl
Unstaged changes cleanup. Further vectorization. Change in binormal/bitangent calculation.
2013-10-09 15:43:23 -05:00
bumpV.glsl
Unstaged changes cleanup. Further vectorization. Change in binormal/bitangent calculation.
2013-10-09 15:43:23 -05:00
cloudsF.glsl
Mats.
2013-11-02 01:20:05 -05:00
cloudsV.glsl
Renderer update. Incl mac fixes, DoF improvements, windlight floater code cleanup. (shining-fixes merge)
2012-02-09 14:26:21 -06:00
cofF.glsl
Fix shader compilation/out-of-spec issues
2013-10-05 17:33:34 -04:00
diffuseAlphaMaskF.glsl
Mats.
2013-11-02 01:20:05 -05:00
diffuseAlphaMaskIndexedF.glsl
Mats.
2013-11-02 01:20:05 -05:00
diffuseAlphaMaskNoColorF.glsl
Mats.
2013-11-02 01:20:05 -05:00
diffuseF.glsl
Mats.
2013-11-02 01:20:05 -05:00
diffuseIndexedF.glsl
Mats.
2013-11-02 01:20:05 -05:00
diffuseNoColorV.glsl
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
2011-12-09 14:02:29 -06:00
diffuseSkinnedV.glsl
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
2011-12-09 14:02:29 -06:00
diffuseV.glsl
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
2011-12-09 14:02:29 -06:00
dofCombineF.glsl
Fix shader compilation/out-of-spec issues
2013-10-05 17:33:34 -04:00
emissiveF.glsl
Merge remote-tracking branch 'upstream/master'
2013-11-03 12:17:50 -05:00
emissiveV.glsl
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
2011-12-09 14:02:29 -06:00
fullbrightF.glsl
Merge remote-tracking branch 'upstream/master'
2013-11-03 12:17:50 -05:00
fullbrightShinyF.glsl
Merge remote-tracking branch 'upstream/master'
2013-11-03 12:17:50 -05:00
fullbrightShinyV.glsl
Mats.
2013-11-02 01:20:05 -05:00
fullbrightV.glsl
Mats.
2013-11-02 01:20:05 -05:00
fxaaF.glsl
Merge remote-tracking branch 'upstream/master'
2013-11-03 12:17:50 -05:00
impostorF.glsl
Mats.
2013-11-02 01:20:05 -05:00
impostorV.glsl
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
2011-12-09 14:02:29 -06:00
luminanceF.glsl
Catching up with Lindies part 2
2012-03-25 10:47:20 +02:00
luminanceV.glsl
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
2011-12-09 14:02:29 -06:00
materialF.glsl
Mats.
2013-11-02 01:20:05 -05:00
materialV.glsl
Mats.
2013-11-02 01:20:05 -05:00
multiPointLightF.glsl
Merge remote-tracking branch 'upstream/master'
2013-11-03 12:17:50 -05:00
multiPointLightV.glsl
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
2011-12-09 14:02:29 -06:00
multiSpotLightF.glsl
Mats.
2013-11-02 01:20:05 -05:00
normgenF.glsl
Fix shader compilation/out-of-spec issues
2013-10-05 17:33:34 -04:00
normgenV.glsl
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
2011-12-09 14:02:29 -06:00
pointLightF.glsl
Merge remote-tracking branch 'upstream/master'
2013-11-03 12:17:50 -05:00
pointLightV.glsl
Mats.
2013-11-02 01:20:05 -05:00
postDeferredF.glsl
Fix shader compilation/out-of-spec issues
2013-10-05 17:33:34 -04:00
postDeferredGammaCorrect.glsl
Mats.
2013-11-02 01:20:05 -05:00
postDeferredNoDoFF.glsl
Fix shader compilation/out-of-spec issues
2013-10-05 17:33:34 -04:00
postDeferredNoTCV.glsl
Fixies, missed files
2012-03-28 01:45:10 +02:00
postDeferredV.glsl
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
2011-12-09 14:02:29 -06:00
postgiF.glsl
Catching up with Lindies part 2
2012-03-25 10:47:20 +02:00
shadowAlphaMaskF.glsl
Updated deferred rendering (STORM-1819 Ternary/Graded shadows)
2012-05-22 23:36:38 -05:00
shadowAlphaMaskV.glsl
Updated deferred rendering (STORM-1819 Ternary/Graded shadows)
2012-05-22 23:36:38 -05:00
shadowCubeV.glsl
Lindie viewer-dev catchup regarding rendering pipeline.
2012-06-30 20:05:31 -05:00
shadowF.glsl
Catching up with Lindies part 2
2012-03-25 10:47:20 +02:00
shadowV.glsl
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
2011-12-09 14:02:29 -06:00
skyF.glsl
Mats.
2013-11-02 01:20:05 -05:00
skyV.glsl
Cheapo sun bloom contribution in deferred.
2012-12-19 02:30:44 -06:00
softenLightF.glsl
Mats.
2013-11-02 01:20:05 -05:00
softenLightV.glsl
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
2011-12-09 14:02:29 -06:00
spotLightF.glsl
Mats.
2013-11-02 01:20:05 -05:00
srgb_mac.glsl
Mats.
2013-11-02 01:20:05 -05:00
srgb.glsl
Mats.
2013-11-02 01:20:05 -05:00
starsF.glsl
Mats.
2013-11-02 01:20:05 -05:00
starsV.glsl
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
2011-12-09 14:02:29 -06:00
sunLightF.glsl
Fix shader compilation/out-of-spec issues
2013-10-05 17:33:34 -04:00
sunLightNoFragCoordV.glsl
Fixies, missed files
2012-03-28 01:45:10 +02:00
sunLightSSAOF.glsl
Merge remote-tracking branch 'upstream/master'
2013-11-03 12:17:50 -05:00
sunLightV.glsl
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
2011-12-09 14:02:29 -06:00
terrainF.glsl
Mats.
2013-11-02 01:20:05 -05:00
terrainV.glsl
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
2011-12-09 14:02:29 -06:00
treeF.glsl
Mats.
2013-11-02 01:20:05 -05:00
treeShadowF.glsl
Catching up with Lindies part 2
2012-03-25 10:47:20 +02:00
treeShadowV.glsl
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
2011-12-09 14:02:29 -06:00
treeV.glsl
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
2011-12-09 14:02:29 -06:00
underWaterF.glsl
Mats.
2013-11-02 01:20:05 -05:00
waterF.glsl
Merge remote-tracking branch 'upstream/master'
2013-11-03 12:17:50 -05:00
waterV.glsl
Mats.
2013-11-02 01:20:05 -05:00