[EGIT] [efl] 01/05: (GL thread R 1/5) Prepare commits (minor straightforward fixes)

[Enlightenment Git]

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch glth4
in repository efl.

View the commit online.

commit 98d85168203a0d9e29000928521c784bd6677bba
Author: jutty.lee <jutty....@samsung.com>
AuthorDate: Mon Sep 18 18:04:31 2017 +0900

    (GL thread R 1/5) Prepare commits (minor straightforward fixes)
    
    Reviewers: raster, sung, jpeg
    
    Subscribers: cedric, jpeg
    
    Differential Revision: https://phab.enlightenment.org/D5087
---
 configure.ac                                         |  2 +-
 src/modules/evas/engines/gl_common/evas_gl_common.h  | 20 --------------------
 src/modules/evas/engines/gl_common/evas_gl_texture.c | 16 ++++++++++++++++
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/configure.ac b/configure.ac
index 830e3620a9..8ab69b24e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2621,7 +2621,7 @@ fi
 # OpenGL common
 evas_engine_gl_common_cflags=""
 if test "x${have_egl}" = "xyes"; then
-   evas_engine_gl_common_libs="-lEGL"
+   evas_engine_gl_common_libs="-lEGL -lGLESv2"
 else
    evas_engine_gl_common_libs="-lGL"
 fi
diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h b/src/modules/evas/engines/gl_common/evas_gl_common.h
index d9deb990de..42e6ceacc1 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_common.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_common.h
@@ -948,26 +948,6 @@ __evas_gl_errdyn(int err, const char *file, const char *func, int line, const ch
 Eina_Bool evas_gl_common_module_open(void);
 void      evas_gl_common_module_close(void);
 
-#ifndef EVAS_GL_NO_HEADERS
-
-static inline void
-_tex_sub_2d(Evas_Engine_GL_Context *gc, int x, int y, int w, int h, int fmt, int type, const void *pix)
-{
-   if ((w > gc->shared->info.max_texture_size) ||
-       (h > gc->shared->info.max_texture_size)) return;
-   glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, w, h, fmt, type, pix);
-}
-
-static inline void
-_comp_tex_sub_2d(Evas_Engine_GL_Context *gc, int x, int y, int w, int h, int fmt, int imgsize, const void *pix)
-{
-   if ((w > gc->shared->info.max_texture_size) ||
-       (h > gc->shared->info.max_texture_size)) return;
-   glCompressedTexSubImage2D(GL_TEXTURE_2D, 0, x, y, w, h, fmt, imgsize, pix);
-}
-
-#endif
-
 #include "evas_gl_3d_common.h"
 
 #undef EAPI
diff --git a/src/modules/evas/engines/gl_common/evas_gl_texture.c b/src/modules/evas/engines/gl_common/evas_gl_texture.c
index 5d99e07be0..946c88a06c 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_texture.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_texture.c
@@ -98,6 +98,22 @@ static const struct {
   { MATCH_ANY, MATCH_ANY, EVAS_COLORSPACE_RGBA_S3TC_DXT5, &s3tc_rgba_dxt45_fmt, &s3tc_rgba_dxt45_fmt }
 };
 
+static void
+_tex_sub_2d(Evas_Engine_GL_Context *gc, int x, int y, int w, int h, int fmt, int type, const void *pix)
+{
+   if ((w > gc->shared->info.max_texture_size) ||
+       (h > gc->shared->info.max_texture_size)) return;
+   glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, w, h, fmt, type, pix);
+}
+
+static void
+_comp_tex_sub_2d(Evas_Engine_GL_Context *gc, int x, int y, int w, int h, int fmt, int imgsize, const void *pix)
+{
+   if ((w > gc->shared->info.max_texture_size) ||
+       (h > gc->shared->info.max_texture_size)) return;
+   glCompressedTexSubImage2D(GL_TEXTURE_2D, 0, x, y, w, h, fmt, imgsize, pix);
+}
+
 #ifdef GL_TEXTURE_INTERNAL_FORMAT
 # ifndef GL_GLES
 static const GLenum matching_rgb[] = { GL_RGB4, GL_RGB8, GL_RGB12, GL_RGB16, 0x0 };


-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.