jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ce5a91241966fd2717300be09529e9d017b64c35
commit ce5a91241966fd2717300be09529e9d017b64c35
Author: Dmytro Dadyka <d.dad...@samsung.com>
Date: Tue Mar 24 10:06:25 2015 -0700
[Evas: Evas_3D] Fix shader code for using with GL_ES
Summary: GL_ES variables precision added.
Reviewers: cedric, jpeg
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2234
---
.../gl_common/shader_3d/evas_gl_3d_shaders.x | 80 ++++++++++++++++++++++
.../evas/engines/gl_common/shader_3d/include.shd | 6 ++
2 files changed, 86 insertions(+)
diff --git a/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
b/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
index c4d328a..fde35e8 100644
--- a/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
+++ b/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
@@ -2,6 +2,11 @@
* See: modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh */
static const char const vertex_color_vert_glsl[] =
+ "#ifdef GL_ES\n"
+ "precision mediump float;\n"
+ "precision mediump int;\n"
+ "precision lowp sampler2D;\n"
+ "#endif\n"
"uniform mat4 uMatrixMvp;\n"
"varying vec4 vColor;\n"
"#ifdef VERTEX_POSITION\n"
@@ -41,6 +46,11 @@ static const char const vertex_color_vert_glsl[] =
"}\n";
static const char const vertex_color_frag_glsl[] =
+ "#ifdef GL_ES\n"
+ "precision mediump float;\n"
+ "precision mediump int;\n"
+ "precision lowp sampler2D;\n"
+ "#endif\n"
"varying vec4 vColor;\n"
"#ifdef FOG_ENABLED\n"
"uniform float uFogFactor;\n"
@@ -58,6 +68,11 @@ static const char const vertex_color_frag_glsl[] =
"}\n";
static const char const diffuse_vert_glsl[] =
+ "#ifdef GL_ES\n"
+ "precision mediump float;\n"
+ "precision mediump int;\n"
+ "precision lowp sampler2D;\n"
+ "#endif\n"
"uniform mat4 uMatrixMvp;\n"
"#ifdef VERTEX_POSITION\n"
"attribute vec4 aPosition0;\n"
@@ -99,6 +114,11 @@ static const char const diffuse_vert_glsl[] =
"}\n";
static const char const diffuse_frag_glsl[] =
+ "#ifdef GL_ES\n"
+ "precision mediump float;\n"
+ "precision mediump int;\n"
+ "precision lowp sampler2D;\n"
+ "#endif\n"
"#ifdef NEED_TEX_COORD\n"
"varying vec2 vTexCoord;\n"
"#endif //TEX_COORD\n"
@@ -137,6 +157,11 @@ static const char const diffuse_frag_glsl[] =
"}\n";
static const char const flat_vert_glsl[] =
+ "#ifdef GL_ES\n"
+ "precision mediump float;\n"
+ "precision mediump int;\n"
+ "precision lowp sampler2D;\n"
+ "#endif\n"
"uniform mat4 uMatrixMvp;\n"
"uniform mat3 uMatrixNormal;\n"
"uniform mat4 uMatrixModelview;\n"
@@ -260,6 +285,11 @@ static const char const flat_vert_glsl[] =
"}\n";
static const char const flat_frag_glsl[] =
+ "#ifdef GL_ES\n"
+ "precision mediump float;\n"
+ "precision mediump int;\n"
+ "precision lowp sampler2D;\n"
+ "#endif\n"
"varying vec2 vFactor;\n"
"#ifdef NEED_TEX_COORD\n"
"varying vec2 vTexCoord;\n"
@@ -408,6 +438,11 @@ static const char const flat_frag_glsl[] =
"}\n";
static const char const phong_vert_glsl[] =
+ "#ifdef GL_ES\n"
+ "precision mediump float;\n"
+ "precision mediump int;\n"
+ "precision lowp sampler2D;\n"
+ "#endif\n"
"uniform mat4 uMatrixMvp;\n"
"uniform mat3 uMatrixNormal;\n"
"uniform mat4 uMatrixModelview;\n"
@@ -499,6 +534,11 @@ static const char const phong_vert_glsl[] =
"}\n";
static const char const phong_frag_glsl[] =
+ "#ifdef GL_ES\n"
+ "precision mediump float;\n"
+ "precision mediump int;\n"
+ "precision lowp sampler2D;\n"
+ "#endif\n"
"varying vec3 vLightVector;\n"
"varying vec3 vLightHalfVector;\n"
"varying vec3 vNormal;\n"
@@ -684,6 +724,11 @@ static const char const phong_frag_glsl[] =
"}\n";
static const char const normal_map_vert_glsl[] =
+ "#ifdef GL_ES\n"
+ "precision mediump float;\n"
+ "precision mediump int;\n"
+ "precision lowp sampler2D;\n"
+ "#endif\n"
"uniform mat4 uMatrixMvp;\n"
"uniform mat3 uMatrixNormal;\n"
"uniform mat4 uMatrixModelview;\n"
@@ -832,6 +877,11 @@ static const char const normal_map_vert_glsl[] =
"}\n";
static const char const normal_map_frag_glsl[] =
+ "#ifdef GL_ES\n"
+ "precision mediump float;\n"
+ "precision mediump int;\n"
+ "precision lowp sampler2D;\n"
+ "#endif\n"
"varying vec3 vLightVector;\n"
"varying vec3 vLightHalfVector;\n"
"uniform sampler2D uTextureNormal0;\n"
@@ -1050,6 +1100,11 @@ static const char const normal_map_frag_glsl[] =
"}\n";
static const char const shadow_map_vert_glsl[] =
+ "#ifdef GL_ES\n"
+ "precision mediump float;\n"
+ "precision mediump int;\n"
+ "precision lowp sampler2D;\n"
+ "#endif\n"
"uniform mat4 uMatrixMvp;\n"
"#ifdef VERTEX_POSITION\n"
"attribute vec4 aPosition0;\n"
@@ -1095,6 +1150,11 @@ static const char const shadow_map_vert_glsl[] =
"}\n";
static const char const shadow_map_frag_glsl[] =
+ "#ifdef GL_ES\n"
+ "precision mediump float;\n"
+ "precision mediump int;\n"
+ "precision lowp sampler2D;\n"
+ "#endif\n"
"#ifdef ALPHA_TEST_ENABLED\n"
"#ifdef NEED_TEX_COORD\n"
"varying vec2 vTexCoord;\n"
@@ -1127,6 +1187,11 @@ static const char const shadow_map_frag_glsl[] =
"}\n";
static const char const color_pick_vert_glsl[] =
+ "#ifdef GL_ES\n"
+ "precision mediump float;\n"
+ "precision mediump int;\n"
+ "precision lowp sampler2D;\n"
+ "#endif\n"
"uniform mat4 uMatrixMvp;\n"
"#ifdef VERTEX_POSITION\n"
"attribute vec4 aPosition0;\n"
@@ -1150,6 +1215,11 @@ static const char const color_pick_vert_glsl[] =
"}\n";
static const char const color_pick_frag_glsl[] =
+ "#ifdef GL_ES\n"
+ "precision mediump float;\n"
+ "precision mediump int;\n"
+ "precision lowp sampler2D;\n"
+ "#endif\n"
"uniform float uColorPick;\n"
"void main()\n"
"{\n"
@@ -1157,6 +1227,11 @@ static const char const color_pick_frag_glsl[] =
"}\n";
static const char const parallax_occlusion_vert_glsl[] =
+ "#ifdef GL_ES\n"
+ "precision mediump float;\n"
+ "precision mediump int;\n"
+ "precision lowp sampler2D;\n"
+ "#endif\n"
"uniform mat4 uMatrixMvp;\n"
"uniform mat3 uMatrixNormal;\n"
"uniform mat4 uMatrixModelview;\n"
@@ -1275,6 +1350,11 @@ static const char const parallax_occlusion_vert_glsl[] =
"}\n";
static const char const parallax_occlusion_frag_glsl[] =
+ "#ifdef GL_ES\n"
+ "precision mediump float;\n"
+ "precision mediump int;\n"
+ "precision lowp sampler2D;\n"
+ "#endif\n"
"varying vec3 vLightVector;\n"
"varying vec3 vLightHalfVector;\n"
"uniform sampler2D uTextureNormal0;\n"
diff --git a/src/modules/evas/engines/gl_common/shader_3d/include.shd
b/src/modules/evas/engines/gl_common/shader_3d/include.shd
index 568c004..f65bb96 100644
--- a/src/modules/evas/engines/gl_common/shader_3d/include.shd
+++ b/src/modules/evas/engines/gl_common/shader_3d/include.shd
@@ -1,3 +1,9 @@
+`#ifdef GL_ES
+precision mediump float;
+precision mediump int;
+precision lowp sampler2D;
+#endif'
+
define(`FRAGMENT_SHADER_USE_TEX_COORD',`
#ifdef NEED_TEX_COORD
varying vec2 vTexCoord;
--
