From 206565d9650eeffc86b4223a75203a29bc94cce7 Mon Sep 17 00:00:00 2001 From: Novatux Date: Sun, 8 Dec 2013 08:01:20 +0100 Subject: Fix shaders on some GPUs --- client/shaders/solids_shader/opengl_fragment.glsl | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'client/shaders/solids_shader/opengl_fragment.glsl') diff --git a/client/shaders/solids_shader/opengl_fragment.glsl b/client/shaders/solids_shader/opengl_fragment.glsl index 80efc86a7..0b6d8f3fc 100644 --- a/client/shaders/solids_shader/opengl_fragment.glsl +++ b/client/shaders/solids_shader/opengl_fragment.glsl @@ -23,14 +23,16 @@ const float e = 2.718281828459; void main (void) { - float use_normalmap = texture2D(useNormalmap,vec2(1.0,1.0)).r; - float enable_bumpmapping = enableBumpmapping; - vec3 color; vec2 uv = gl_TexCoord[0].st; + +#ifdef NORMALS float height; vec2 tsEye = vec2(tsEyeVec.x,-tsEyeVec.y); + float use_normalmap = texture2D(useNormalmap,vec2(1.0,1.0)).r; + float enable_bumpmapping = enableBumpmapping; + if ((enableParallaxOcclusion == 1.0) && (use_normalmap > 0.0)) { float map_height = texture2D(normalTexture, uv).a; if (map_height < 1.0){ @@ -69,6 +71,9 @@ void main (void) } else { color = texture2D(baseTexture, uv).rgb; } +#else + color = texture2D(baseTexture, uv).rgb; +#endif float alpha = texture2D(baseTexture, uv).a; vec4 col = vec4(color.r, color.g, color.b, alpha); -- cgit v1.2.3