projects / zefram / minetest / minetest_engine.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0b0919e)
Fix texture bumpmapping on some GPUs
authorZeg9 <dazeg9@gmail.com>
Fri, 2 Aug 2013 10:32:21 +0000 (12:32 +0200)
committerPilzAdam <pilzadam@minetest.net>
Sun, 4 Aug 2013 19:49:48 +0000 (21:49 +0200)
client/shaders/bumpmaps_liquids/opengl_fragment.glsl patch | blob | history
client/shaders/bumpmaps_solids/opengl_fragment.glsl patch | blob | history

diff --git a/client/shaders/bumpmaps_liquids/opengl_fragment.glsl b/client/shaders/bumpmaps_liquids/opengl_fragment.glsl
index ea618384ffa660f0b975ff67e0b0f8518af5f0f1..bf6bbf04398735b03c9fe35b6bbb79c19ccacd97 100644 (file)
--- a/client/shaders/bumpmaps_liquids/opengl_fragment.glsl
+++ b/client/shaders/bumpmaps_liquids/opengl_fragment.glsl
@@ -26,8 +26,7 @@ void main (void)
        \r
        \r
        float specular = pow(clamp(dot(R, lVec), 0.0, 1.0),1.0);\r
-       vec4 vSpecular = 0.2*specular * diffuse;        \r
-    color += vSpecular;\r
+    color += vec3(0.2*specular*diffuse);\r
  \r
   \r
        col = vec4(color.r, color.g, color.b, alpha);\r
diff --git a/client/shaders/bumpmaps_solids/opengl_fragment.glsl b/client/shaders/bumpmaps_solids/opengl_fragment.glsl
index 6203592f7019542787b6a1a9b5c8655380f82b2c..c72e8cbce53ff9491f2d7c0935084cdea1c19dbc 100644 (file)
--- a/client/shaders/bumpmaps_solids/opengl_fragment.glsl
+++ b/client/shaders/bumpmaps_solids/opengl_fragment.glsl
@@ -26,8 +26,7 @@ void main (void)
        \r
        \r
        float specular = pow(clamp(dot(R, lVec), 0.0, 1.0),1.0);\r
-       vec4 vSpecular = 0.2*specular * diffuse;        \r
-    color += vSpecular;\r
+    color += vec3(0.2*specular*diffuse);\r
  \r
   \r
        col = vec4(color.r, color.g, color.b, alpha);\r
Minetest engine