From 231af66b902e6e93571dc5dd6c48a17470088dc0 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Mon, 31 Oct 2011 16:00:05 +0100 Subject: [PATCH] Fixing for OS X --- .../shaders/class2/effects/gaussBlurF.glsl | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/indra/newview/app_settings/shaders/class2/effects/gaussBlurF.glsl b/indra/newview/app_settings/shaders/class2/effects/gaussBlurF.glsl index f58622ab6..2cdd934e0 100644 --- a/indra/newview/app_settings/shaders/class2/effects/gaussBlurF.glsl +++ b/indra/newview/app_settings/shaders/class2/effects/gaussBlurF.glsl @@ -4,28 +4,28 @@ uniform sampler2DRect RenderTexture; uniform int horizontalPass; -uniform float offset[2] = float[2]( 1.3846153846, 3.2307692308 ); -uniform float weight[3] = float[3]( 0.2270270270, 0.3162162162, 0.0702702703 ); +vec2 offset = vec2( 1.3846153846, 3.2307692308 ); +vec3 weight = vec3( 0.2270270270, 0.3162162162, 0.0702702703 ); void main(void) { - vec4 color = texture2DRect(RenderTexture, gl_TexCoord[0].st)*weight[0]; + vec4 color = texture2DRect(RenderTexture, gl_TexCoord[0].st)*weight.x; if(horizontalPass == 1) { - color += weight[1] * texture2DRect(RenderTexture, vec2(gl_TexCoord[0].x+offset[0],gl_TexCoord[0].y)); - color += weight[1] * texture2DRect(RenderTexture, vec2(gl_TexCoord[0].x-offset[0],gl_TexCoord[0].y)); - color += weight[2] * texture2DRect(RenderTexture, vec2(gl_TexCoord[0].x+offset[1],gl_TexCoord[0].y)); - color += weight[2] * texture2DRect(RenderTexture, vec2(gl_TexCoord[0].x-offset[1],gl_TexCoord[0].y)); + color += weight.y * texture2DRect(RenderTexture, vec2(gl_TexCoord[0].x+offset.x,gl_TexCoord[0].y)); + color += weight.y * texture2DRect(RenderTexture, vec2(gl_TexCoord[0].x-offset.x,gl_TexCoord[0].y)); + color += weight.z * texture2DRect(RenderTexture, vec2(gl_TexCoord[0].x+offset.y,gl_TexCoord[0].y)); + color += weight.z * texture2DRect(RenderTexture, vec2(gl_TexCoord[0].x-offset.y,gl_TexCoord[0].y)); } else { - color += weight[1] * texture2DRect(RenderTexture, vec2(gl_TexCoord[0].x,gl_TexCoord[0].y+offset[0])); - color += weight[1] * texture2DRect(RenderTexture, vec2(gl_TexCoord[0].x,gl_TexCoord[0].y-offset[0])); - color += weight[2] * texture2DRect(RenderTexture, vec2(gl_TexCoord[0].x,gl_TexCoord[0].y+offset[1])); - color += weight[2] * texture2DRect(RenderTexture, vec2(gl_TexCoord[0].x,gl_TexCoord[0].y-offset[1])); + color += weight.y * texture2DRect(RenderTexture, vec2(gl_TexCoord[0].x,gl_TexCoord[0].y+offset.x)); + color += weight.y * texture2DRect(RenderTexture, vec2(gl_TexCoord[0].x,gl_TexCoord[0].y-offset.x)); + color += weight.z * texture2DRect(RenderTexture, vec2(gl_TexCoord[0].x,gl_TexCoord[0].y+offset.y)); + color += weight.z * texture2DRect(RenderTexture, vec2(gl_TexCoord[0].x,gl_TexCoord[0].y-offset.y)); } gl_FragColor = color; -} \ No newline at end of file +}