diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-04-24 07:41:30 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-04-24 07:41:30 -0700 |
| commit | 339770698c0152d68d9b47ab73f8c6a5d9d8edfe (patch) | |
| tree | a9269949595ac8765483c3305907e527c0ac2494 /indra/newview/app_settings/shaders/class2/deferred | |
| parent | b2cd1144713e4e1bbf77edf6547f633be55ab8ea (diff) | |
| parent | 79318043218a9ec6cb6e52eca936487177554903 (diff) | |
Merge vwr-dev-mat
Diffstat (limited to 'indra/newview/app_settings/shaders/class2/deferred')
| -rw-r--r-- | indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl | 12 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class2/deferred/alphaV.glsl | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl index aedb9ea510..73c85c0419 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl @@ -25,10 +25,6 @@ #extension GL_ARB_texture_rectangle : enable -#define INDEXED 1 -#define NON_INDEXED 2 -#define NON_INDEXED_NO_COLOR 3 - #ifdef DEFINE_GL_FRAGCOLOR out vec4 frag_color; #else @@ -228,9 +224,8 @@ void main() col = vec4(0.0f,0.0f,0.0f,0.0f); #define LIGHT_LOOP(i) \ - col.rgb += light_diffuse[i].rgb * calcPointLightOrSpotLight(pos.xyz, normal, light_position[i], light_direction[i].xyz, light_attenuation[i].x, light_attenuation[i].y, light_attenuation[i].z); - - + col.rgb += light_diffuse[i].rgb * calcPointLightOrSpotLight(pos.xyz, normal, light_position[i], light_direction[i].xyz, light_attenuation[i].x, light_attenuation[i].y, light_attenuation[i].z); + LIGHT_LOOP(1) LIGHT_LOOP(2) LIGHT_LOOP(3) @@ -240,8 +235,7 @@ void main() LIGHT_LOOP(7) color.rgb += diff.rgb * vary_pointlight_col * col.rgb; - + frag_color = color; - } diff --git a/indra/newview/app_settings/shaders/class2/deferred/alphaV.glsl b/indra/newview/app_settings/shaders/class2/deferred/alphaV.glsl index b77da75617..127c1709b8 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/alphaV.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/alphaV.glsl @@ -158,7 +158,7 @@ void main() pos = (modelview_matrix * vert); gl_Position = modelview_projection_matrix*vec4(position.xyz, 1.0); #endif - + #endif #ifdef USE_INDEXED_TEX |