evas-gl-engine: Fix incorrect shader code for SHD_EXTENSION and etc

1. Fix incorrect fragment shader codo for SHD_EXTENSION
2. Fix the code about referencing Outbuf in Evas-GL TBM

Change-Id: Ia9790185b9d0d00f0acfef74c92df5d678c31193

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 2b071f2..1120163 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 b8f8ac1..f14b412 100644 (file)
--- 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

diff --git a/src/modules/evas/engines/gl_tbm/evas_engine.c b/src/modules/evas/engines/gl_tbm/evas_engine.c
index 2550922..76e3279 100644 (file)
--- a/src/modules/evas/engines/gl_tbm/evas_engine.c
+++ b/src/modules/evas/engines/gl_tbm/evas_engine.c
@@ -1761,7 +1761,7 @@ eng_image_native_set(void *engine, void *image, void *native)
                n->ns_data.tbm.buffer = buffer;
 
                if (glsym_eglCreateImage)
-                 n->ns_data.tbm.surface = glsym_eglCreateImage(eng_get_ob(re)->egl_disp,
+                 n->ns_data.tbm.surface = glsym_eglCreateImage(ob->egl_disp,
                                                                EGL_NO_CONTEXT,
                                                                EGL_NATIVE_SURFACE_TIZEN,
                                                                (void *)buffer,
@@ -1769,7 +1769,7 @@ eng_image_native_set(void *engine, void *image, void *native)
                else
                  ERR("Try eglCreateImage on EGL with no support");
                if (!n->ns_data.tbm.surface)
-                 ERR("eglCreateImage() for %p failed", buffer);
+                 ERR("eglCreateImage() for %p failed, code=%#x", buffer, eglGetError());
                img->native.yinvert     = 1;
                img->native.loose       = 0;
                img->native.data        = n;