diff options
| author | ruslantproductengine <ruslantproductengine@lindenlab.com> | 2016-07-18 20:09:18 +0300 |
|---|---|---|
| committer | ruslantproductengine <ruslantproductengine@lindenlab.com> | 2016-07-18 20:09:18 +0300 |
| commit | eebbda288d9ba4f8f3061c05ff5eb2d7b0d1cb35 (patch) | |
| tree | 5bf0a798040a6b992fb1acad0f6a20416348c0c1 /indra/newview/app_settings/shaders/class1/objects/simpleV.glsl | |
| parent | 1c4dbc64abc7ff176b5dcbbc64d0454968efad74 (diff) | |
Backed out changeset: 5fe5ad059c05
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/objects/simpleV.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/objects/simpleV.glsl | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/indra/newview/app_settings/shaders/class1/objects/simpleV.glsl b/indra/newview/app_settings/shaders/class1/objects/simpleV.glsl index c744dc1397..37a20383e2 100644 --- a/indra/newview/app_settings/shaders/class1/objects/simpleV.glsl +++ b/indra/newview/app_settings/shaders/class1/objects/simpleV.glsl @@ -27,13 +27,6 @@ uniform mat3 normal_matrix; uniform mat4 texture_matrix0; uniform mat4 modelview_matrix; uniform mat4 modelview_projection_matrix; -uniform bool invert_tex_y = false; -const mat4 invTexM = mat4( - 1, 0, 0, 0, - 0,-1, 0, 0, - 0, 0, 1, 0, - 0, 0, 0, 1 -); ATTRIBUTE vec3 position; void passTextureIndex(); @@ -58,10 +51,7 @@ void main() gl_Position = modelview_projection_matrix*vec4(position.xyz, 1.0); vary_texcoord0 = (texture_matrix0 * vec4(texcoord0, 0, 1)).xy; - if(invert_tex_y) - { - vary_texcoord0 = vec2(invTexM * vec4(vary_texcoord0,0,1)).xy; - } + vec3 norm = normalize(normal_matrix * normal); |