Fix runtime warning for GLES3.2 08/78508/1
authorxuelian.bai <xuelian.bai@samsung.com>
Wed, 6 Jul 2016 09:25:48 +0000 (17:25 +0800)
committerxuelian.bai <xuelian.bai@samsung.com>
Wed, 6 Jul 2016 09:27:21 +0000 (17:27 +0800)
Change-Id: I0d4a1455a3b90a726c3ec66f705ebd7c94dc0b92
Signed-off-by: xuelian.bai <xuelian.bai@samsung.com>
src/headers/gl.h
src/modules/fastpath/coregl_fastpath.c
src/modules/fastpath/coregl_fastpath_gl.c

index 3e0fb9b..a56ac06 100644 (file)
@@ -770,6 +770,7 @@ typedef struct __GLsync *GLsync;
 #define GL_MAX_ELEMENT_INDEX                             0x8D6B
 #define GL_NUM_SAMPLE_COUNTS                             0x9380
 #define GL_TEXTURE_IMMUTABLE_LEVELS                      0x82DF
+#define GL_CLIENT_ACTIVE_TEXTURE                                                0x84E1
 
 /* GLES 3.1 */
 #define GL_COMPUTE_SHADER                 0x91B9
index 585642d..995102b 100644 (file)
@@ -6,7 +6,6 @@
 
 #include <sys/types.h>
 #include <unistd.h>
-#include <GLES/gl.h>
 
 
 #define _COREGL_SYMBOL(RET_TYPE, FUNC_NAME, PARAM_LIST)     RET_TYPE (*_orig_fastpath_##FUNC_NAME) PARAM_LIST = NULL;
index 772ecd0..ed050fd 100644 (file)
@@ -245,10 +245,10 @@ fastpath_release_gl_context(GLGlueContext *gctx)
 }
 
 
-static float
+static double
 _get_gl_version()
 {
-       float GLver = 0.0;
+       double GLver = 0.0;
        const char *vret;
        int vlen = _COREGL_INT_INIT_VALUE;
        int i = _COREGL_INT_INIT_VALUE;
@@ -368,7 +368,7 @@ fastpath_glGetString(GLenum name)
        case GL_VERSION:
                IF_GL_SUCCESS(ret = (const char *)_orig_fastpath_glGetString(name)) {
                        double GLver = _get_gl_version();
-                       if (GLver > 3.1) {
+                       if (GLver > 3.2) {
                                COREGL_WRN("\E[40;31;1mFastpath can't support %s (Fixed to %s)\E[0m\n", ret,
                                           string_gles30);
                                ret = string_gles30;