summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorZeg9 <dazeg9@gmail.com>2013-08-02 12:32:21 +0200
committerPilzAdam <pilzadam@minetest.net>2013-08-04 21:49:48 +0200
commit44eb01695a1e8f4322ca2f8553c98c5d5523c93e (patch)
tree6e40bc7a5e1862ecf491a7ce0fb2ecf9b7ddb684 /client
parent0b0919e81c3365c2564a17f06d75a5fa314cf786 (diff)
downloadminetest-44eb01695a1e8f4322ca2f8553c98c5d5523c93e.tar.gz
minetest-44eb01695a1e8f4322ca2f8553c98c5d5523c93e.tar.bz2
minetest-44eb01695a1e8f4322ca2f8553c98c5d5523c93e.zip
Fix texture bumpmapping on some GPUs
Diffstat (limited to 'client')
-rw-r--r--client/shaders/bumpmaps_liquids/opengl_fragment.glsl3
-rw-r--r--client/shaders/bumpmaps_solids/opengl_fragment.glsl3
2 files changed, 2 insertions, 4 deletions
diff --git a/client/shaders/bumpmaps_liquids/opengl_fragment.glsl b/client/shaders/bumpmaps_liquids/opengl_fragment.glsl
index ea618384f..bf6bbf043 100644
--- a/client/shaders/bumpmaps_liquids/opengl_fragment.glsl
+++ b/client/shaders/bumpmaps_liquids/opengl_fragment.glsl
@@ -26,8 +26,7 @@ void main (void)
float specular = pow(clamp(dot(R, lVec), 0.0, 1.0),1.0);
- vec4 vSpecular = 0.2*specular * diffuse;
- color += vSpecular;
+ color += vec3(0.2*specular*diffuse);
col = vec4(color.r, color.g, color.b, alpha);
diff --git a/client/shaders/bumpmaps_solids/opengl_fragment.glsl b/client/shaders/bumpmaps_solids/opengl_fragment.glsl
index 6203592f7..c72e8cbce 100644
--- a/client/shaders/bumpmaps_solids/opengl_fragment.glsl
+++ b/client/shaders/bumpmaps_solids/opengl_fragment.glsl
@@ -26,8 +26,7 @@ void main (void)
float specular = pow(clamp(dot(R, lVec), 0.0, 1.0),1.0);
- vec4 vSpecular = 0.2*specular * diffuse;
- color += vSpecular;
+ color += vec3(0.2*specular*diffuse);
col = vec4(color.r, color.g, color.b, alpha);