diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-04-20 04:32:03 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-04-20 04:32:03 -0700 |
| commit | ff54e85daa04e80f926955d1a57460229e6d9d1b (patch) | |
| tree | 8da926efb9f82c8b0fad54069f68fbcb2e956e1b /indra/newview/app_settings/shaders/class1 | |
| parent | 5cb597dd8ebf71ef1d19fccf9a9ec7a688899f79 (diff) | |
Fixup merge with vwr-dev-mat
Diffstat (limited to 'indra/newview/app_settings/shaders/class1')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl | 1 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/materialF.glsl | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl index 11759af2ad..93f9e05aec 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl @@ -177,7 +177,6 @@ void main() #ifndef USE_VERTEX_COLOR vec4 diffuse_color = vec4(1,1,1,1); #endif - //vec4 color = calcLighting(pos.xyz, norm, diffuse_color, vec4(0.)); vec4 col = vec4(0.0, 0.0, 0.0, diffuse_color.a); diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl index 09a2d4467a..482d0ccc74 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl @@ -381,13 +381,11 @@ vec3 scaleSoftClip(vec3 light) } #else - #ifdef DEFINE_GL_FRAGCOLOR out vec4 frag_data[3]; #else #define frag_data gl_FragData #endif - #endif uniform sampler2D diffuseMap; @@ -632,5 +630,4 @@ void main() frag_data[1] = final_specular; // XYZ = Specular color. W = Specular exponent. frag_data[2] = final_normal; // XY = Normal. Z = Env. intensity. #endif - } |