summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-11-09 15:21:22 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-11-09 15:21:22 +0900
commit7bb0ad8b287d7b1336bbadd1c4ee57cf4352210a (patch)
tree3c3051f77a95d06f7ae44a215e9b55734c4a19b6 /src/bin
parent35f9073a4223972d1347ebb80bac31a3b336adff (diff)
Revert "remove ifdef from glsl in glview shader - ifdefs not universally supported"
This reverts commit 54883cb7fb0c42f37615f1485e554d947b42c369.
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/test_glview.c3
-rw-r--r--src/bin/test_glview_simple.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/bin/test_glview.c b/src/bin/test_glview.c
index 2fd21bfa9..8cedd9d01 100644
--- a/src/bin/test_glview.c
+++ b/src/bin/test_glview.c
@@ -327,6 +327,9 @@ static const char vertex_shader[] =
327 "}\n"; 327 "}\n";
328 328
329 static const char fragment_shader[] = 329 static const char fragment_shader[] =
330 "#ifdef GL_ES\n"
331 "precision mediump float;\n"
332 "#endif\n"
330 "uniform vec4 color;\n" 333 "uniform vec4 color;\n"
331 "uniform vec3 light;\n" 334 "uniform vec3 light;\n"
332 "varying vec3 rotated_normal;\n" 335 "varying vec3 rotated_normal;\n"
diff --git a/src/bin/test_glview_simple.c b/src/bin/test_glview_simple.c
index 324e68a79..fb976f0ca 100644
--- a/src/bin/test_glview_simple.c
+++ b/src/bin/test_glview_simple.c
@@ -70,6 +70,9 @@ init_shaders(GLData *gld)
70 "} \n"; 70 "} \n";
71 71
72 GLbyte fShaderStr[] = 72 GLbyte fShaderStr[] =
73 "#ifdef GL_ES \n"
74 "precision mediump float; \n"
75 "#endif \n"
73 "void main() \n" 76 "void main() \n"
74 "{ \n" 77 "{ \n"
75 " gl_FragColor = vec4 ( 1.0, 0.0, 0.0, 1.0 );\n" 78 " gl_FragColor = vec4 ( 1.0, 0.0, 0.0, 1.0 );\n"