[Title] <FINAL> Applied ES3.0 supports for normal path.

[Issue#]
[Problem]
[Cause]
[Solution]
- Now CoreGL version is 4
- Updated new symbols
- Refactored extension supports
- Fixed gerrit auto-merging issues

diff --git a/src/modules/coregl_module.h b/src/modules/coregl_module.h
index 45dead3..08ea30f 100644 (file)
--- a/src/modules/coregl_module.h
+++ b/src/modules/coregl_module.h
@@ -30,16 +30,16 @@ typedef enum
        } \
        else \
        { \
-               AST(ovr_##falias != NULL); \
-               COREGL_OVERRIDE_API(ovr_, falias, falias, orig_prefix); \
-               orig_prefix##falias = NULL; \
+               AST(ovr_##f != NULL); \
+               COREGL_OVERRIDE_API(ovr_, f, orig_prefix); \
+               orig_prefix##f = NULL; \
        } \
 }
 
-#define COREGL_OVERRIDE(prefix, f, falias) \
+#define COREGL_OVERRIDE(prefix, f) \
        if (enable == 1) \
        { \
-               COREGL_OVERRIDE_API(ovr_, f, falias, prefix); \
+               COREGL_OVERRIDE_API(ovr_, f, prefix); \
        }
 
 #endif // COREGL_MODULE_H

diff --git a/src/modules/tracepath/coregl_tracepath.c b/src/modules/tracepath/coregl_tracepath.c
index 2829574..653c628 100644 (file)
--- a/src/modules/tracepath/coregl_tracepath.c
+++ b/src/modules/tracepath/coregl_tracepath.c
@@ -286,11 +286,11 @@ tracepath_apply_overrides()
 void
 tracepath_apply_overrides_egl(int enable)
 {
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_INIT_ORIGINAL(_orig_tracepath_, FUNC_NAME, FUNC_NAME);
+#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_INIT_ORIGINAL(_orig_tracepath_, FUNC_NAME);
 # include "../../headers/sym_egl.h"
 #undef _COREGL_SYMBOL
 
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_OVERRIDE(tracepath_, FUNC_NAME, FUNC_NAME);
+#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_OVERRIDE(tracepath_, FUNC_NAME);
 # include "../../headers/sym_egl.h"
 #undef _COREGL_SYMBOL
 }
@@ -298,14 +298,11 @@ tracepath_apply_overrides_egl(int enable)
 void
 tracepath_apply_overrides_gl(int enable)
 {
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_INIT_ORIGINAL(_orig_tracepath_, FUNC_NAME, FUNC_NAME);
-#define _COREGL_EXT_SYMBOL_ALIAS(FUNC_NAME, ALIAS_NAME)                    COREGL_INIT_ORIGINAL(_orig_tracepath_, FUNC_NAME, ALIAS_NAME);
+#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_INIT_ORIGINAL(_orig_tracepath_, FUNC_NAME);
 # include "../../headers/sym_gl.h"
 #undef _COREGL_SYMBOL
-#undef _COREGL_EXT_SYMBOL_ALIAS
 
-#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_OVERRIDE(tracepath_, FUNC_NAME, FUNC_NAME);
-#define _COREGL_EXT_SYMBOL_ALIAS(FUNC_NAME, ALIAS_NAME)                    COREGL_OVERRIDE(tracepath_, FUNC_NAME, ALIAS_NAME);
+#define _COREGL_SYMBOL(IS_EXTENSION, RET_TYPE, FUNC_NAME, PARAM_LIST)     COREGL_OVERRIDE(tracepath_, FUNC_NAME);
 # include "../../headers/sym_gl.h"
 #undef _COREGL_SYMBOL
 }