diff options
author | Michael Pohoreski <ptolemy@lindenlab.com> | 2022-06-07 23:17:49 +0000 |
---|---|---|
committer | Michael Pohoreski <ptolemy@lindenlab.com> | 2022-06-07 23:17:49 +0000 |
commit | d385c73b6e6df968a19a2bb7f0ec1e72bd01e8dc (patch) | |
tree | 3de84edb6fac1518cbe909d9ba811b45a5c738a3 /indra/newview | |
parent | a185fae28d7e035226d4b5f7c350f94830001b06 (diff) | |
parent | 0837b65fdd2ea7f50f47209bd8f1109968a677fb (diff) |
Merged in ptolemy_fix_fullbright_shiny (pull request #1011)
DRTVWR-559: Fix fullbrightShiny not compiling on AMD due to type mismatch
Approved-by: Dave Parks
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyF.glsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyF.glsl b/indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyF.glsl index 9fcee04c32..f693323d45 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyF.glsl @@ -38,7 +38,7 @@ uniform sampler2D diffuseMap; VARYING vec4 vertex_color; VARYING vec2 vary_texcoord0; VARYING vec3 vary_texcoord1; -VARYING vec4 vary_position; +VARYING vec3 vary_position; uniform samplerCube environmentMap; @@ -74,7 +74,7 @@ void main() vec3 amblit; vec3 additive; vec3 atten; - vec3 pos = vary_position.xyz/vary_position.w; + vec3 pos = vary_position.xyz; calcAtmosphericVars(pos.xyz, vec3(0), 1.0, sunlit, amblit, additive, atten, false); |