diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-03-25 22:50:26 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-03-25 22:50:26 +0000 |
| commit | 6fcf38217e8772b2f90c7a8e7ce6b60071f6d20c (patch) | |
| tree | a8e35fe195cc86c616daf9d8a21571e04bc2bc35 /indra/newview/app_settings/shaders/class1/lighting | |
| parent | 11a3589665aae1a2423e258e40eba45c117627d5 (diff) | |
merge release@82858 maint-render-2-merge@83010 -> release
QAR-389
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/lighting')
3 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightF.glsl index 9ab986be6d..071489bca8 100644 --- a/indra/newview/app_settings/shaders/class1/lighting/lightF.glsl +++ b/indra/newview/app_settings/shaders/class1/lighting/lightF.glsl @@ -9,7 +9,7 @@ uniform sampler2D diffuseMap; void default_lighting() { - color = gl_Color * texture2D(diffuseMap, gl_TexCoord[0].xy); + vec4 color = gl_Color * texture2D(diffuseMap, gl_TexCoord[0].xy); gl_FragColor = color; } diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightShinyF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightShinyF.glsl index c6f7f8b81b..89785c45cb 100644 --- a/indra/newview/app_settings/shaders/class1/lighting/lightShinyF.glsl +++ b/indra/newview/app_settings/shaders/class1/lighting/lightShinyF.glsl @@ -11,7 +11,7 @@ uniform samplerCube environmentMap; void shiny_lighting() { - color = gl_Color * texture2D(diffuseMap, gl_TexCoord[0].xy); + vec4 color = gl_Color * texture2D(diffuseMap, gl_TexCoord[0].xy); gl_FragColor = color; } diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightShinyWaterF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightShinyWaterF.glsl index 75f61ccdf1..7ac3c359bf 100644 --- a/indra/newview/app_settings/shaders/class1/lighting/lightShinyWaterF.glsl +++ b/indra/newview/app_settings/shaders/class1/lighting/lightShinyWaterF.glsl @@ -11,7 +11,7 @@ uniform samplerCube environmentMap; void shiny_lighting_water() { - color = gl_Color * texture2D(diffuseMap, gl_TexCoord[0].xy); + vec4 color = gl_Color * texture2D(diffuseMap, gl_TexCoord[0].xy); gl_FragColor = color; } |