Revert "Evas GL: Fix 'run-time shader' patch by changing position 'extension GL_OES_E...

This reverts commit 45b7bf098bea3d1d5bf468387239cfa0dd7c1058.

Change-Id: I4babc4fe364576b9538e8e8474a6b762bd7b0da1

diff --git a/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x b/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x
index 4826b6c..558531a 100644 (file)
--- a/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x
+++ b/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x
@@ -8,15 +8,15 @@ static const char fragment_glsl[] =
    " * through cpp first (in which case the precision must be manually added).\n"
    " */\n"
    "#ifdef GL_ES\n"
-   "# ifdef SHD_EXTERNAL\n"
-   "# extension GL_OES_EGL_image_external : require\n"
-   "#  define SAMPLER_EXTERNAL_OES samplerExternalOES\n"
-   "# endif\n"
    "# ifdef GL_FRAGMENT_PRECISION_HIGH\n"
    "precision highp float;\n"
    "# else\n"
    "precision mediump float;\n"
    "# endif\n"
+   "# ifdef SHD_EXTERNAL\n"
+   "extension GL_OES_EGL_image_external : require\n"
+   "#  define SAMPLER_EXTERNAL_OES samplerExternalOES\n"
+   "# endif\n"
    "#else\n"
    "# define SAMPLER_EXTERNAL_OES sampler2D\n"
    "#endif\n"

diff --git a/src/modules/evas/engines/gl_common/shader/include.glsl b/src/modules/evas/engines/gl_common/shader/include.glsl
index f14b412..b8f8ac1 100755 (executable)
--- a/src/modules/evas/engines/gl_common/shader/include.glsl
+++ b/src/modules/evas/engines/gl_common/shader/include.glsl
@@ -1,14 +1,14 @@
 define(`FRAGMENT_SHADER',`
 #ifdef GL_ES
-# ifdef SHD_EXTERNAL
-# extension GL_OES_EGL_image_external : require
-#  define SAMPLER_EXTERNAL_OES samplerExternalOES
-# endif
 # ifdef GL_FRAGMENT_PRECISION_HIGH
 precision highp float;
 # else
 precision mediump float;
 # endif
+# ifdef SHD_EXTERNAL
+extension GL_OES_EGL_image_external : require
+#  define SAMPLER_EXTERNAL_OES samplerExternalOES
+# endif
 #else
 # define SAMPLER_EXTERNAL_OES sampler2D
 #endif