summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2015-02-11 21:45:50 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2015-02-12 11:23:03 +0900
commit651f0ae2411cea5373bef091ac3b189adf98815a (patch)
tree5b135f4eb22c27e42162b92b9477640383bcdf6c /src
parent9eaadb2eb764d1a9fac0ebdabca5432d0b0edf7d (diff)
Evas GL common: Improve code readability (simplify macro)
The exact same ugly macro would appear hundreds of times in the GL code: GLERR(__FUNCTION__, __FILE__, __LINE__, ""); Instead, override the common GL functions iif GL_ERRORS is defined. This greatly simplifies code and removes tons of useless lines. Also, this will give better debugging output as the exact code line is printed, and the function name is also printed. Also, fix linking to the glerr function. This is a code cleanup. Hopefully I didn't break anything with this big operation of find & replace.
Diffstat (limited to 'src')
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_3d_shader.c10
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_api.c146
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_api_gles1.c148
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_common.h75
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_context.c184
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_core.c7
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_shader.c35
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_texture.c139
-rw-r--r--src/modules/evas/engines/gl_drm/evas_engine.c3
-rw-r--r--src/modules/evas/engines/gl_generic/evas_engine.c14
-rw-r--r--src/modules/evas/engines/gl_x11/evas_engine.c12
-rw-r--r--src/modules/evas/engines/wayland_egl/evas_engine.c2
12 files changed, 142 insertions, 633 deletions
diff --git a/src/modules/evas/engines/gl_common/evas_gl_3d_shader.c b/src/modules/evas/engines/gl_common/evas_gl_3d_shader.c
index e042c83b83..757b26553c 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_3d_shader.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_3d_shader.c
@@ -1169,13 +1169,8 @@ _shader_compile(GLuint shader, const char *src)
1169 GLint ok; 1169 GLint ok;
1170 1170
1171 glShaderSource(shader, 1, &src, NULL); 1171 glShaderSource(shader, 1, &src, NULL);
1172 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1173
1174 glCompileShader(shader); 1172 glCompileShader(shader);
1175 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1176
1177 glGetShaderiv(shader, GL_COMPILE_STATUS, &ok); 1173 glGetShaderiv(shader, GL_COMPILE_STATUS, &ok);
1178 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1179 1174
1180 if (!ok) 1175 if (!ok)
1181 { 1176 {
@@ -1223,18 +1218,13 @@ _program_build(E3D_Program *program, const char *vert_src, const char *frag_src)
1223 1218
1224 /* Attach shaders. */ 1219 /* Attach shaders. */
1225 glAttachShader(program->prog, program->vert); 1220 glAttachShader(program->prog, program->vert);
1226 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1227
1228 glAttachShader(program->prog, program->frag); 1221 glAttachShader(program->prog, program->frag);
1229 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1230 1222
1231 /* Link program. */ 1223 /* Link program. */
1232 glLinkProgram(program->prog); 1224 glLinkProgram(program->prog);
1233 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1234 1225
1235 /* Check link status. */ 1226 /* Check link status. */
1236 glGetProgramiv(program->prog, GL_LINK_STATUS, &ok); 1227 glGetProgramiv(program->prog, GL_LINK_STATUS, &ok);
1237 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1238 1228
1239 if (!ok) 1229 if (!ok)
1240 { 1230 {
diff --git a/src/modules/evas/engines/gl_common/evas_gl_api.c b/src/modules/evas/engines/gl_common/evas_gl_api.c
index 72d85ec8cc..2628aff0a6 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_api.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_api.c
@@ -1,3 +1,4 @@
1#define GL_ERRORS_NODEF 1
1#include "evas_gl_core_private.h" 2#include "evas_gl_core_private.h"
2#include "evas_gl_api_ext.h" 3#include "evas_gl_api_ext.h"
3 4
@@ -6,7 +7,7 @@
6 _func_begin_debug(__FUNCTION__); \ 7 _func_begin_debug(__FUNCTION__); \
7} 8}
8 9
9#define EVGL_FUNC_END() 10#define EVGL_FUNC_END() GLERRV(__FUNCTION__)
10#define _EVGL_INT_INIT_VALUE -3 11#define _EVGL_INT_INIT_VALUE -3
11 12
12//---------------------------------------// 13//---------------------------------------//
@@ -1002,7 +1003,6 @@ _evgld_glActiveTexture(GLenum texture)
1002{ 1003{
1003 EVGL_FUNC_BEGIN(); 1004 EVGL_FUNC_BEGIN();
1004 glActiveTexture(texture); 1005 glActiveTexture(texture);
1005 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1006 EVGL_FUNC_END(); 1006 EVGL_FUNC_END();
1007} 1007}
1008 1008
@@ -1011,7 +1011,6 @@ _evgld_glAttachShader(GLuint program, GLuint shader)
1011{ 1011{
1012 EVGL_FUNC_BEGIN(); 1012 EVGL_FUNC_BEGIN();
1013 glAttachShader(program, shader); 1013 glAttachShader(program, shader);
1014 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1015 EVGL_FUNC_END(); 1014 EVGL_FUNC_END();
1016} 1015}
1017 1016
@@ -1020,7 +1019,6 @@ _evgld_glBindAttribLocation(GLuint program, GLuint idx, const char* name)
1020{ 1019{
1021 EVGL_FUNC_BEGIN(); 1020 EVGL_FUNC_BEGIN();
1022 glBindAttribLocation(program, idx, name); 1021 glBindAttribLocation(program, idx, name);
1023 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1024 EVGL_FUNC_END(); 1022 EVGL_FUNC_END();
1025} 1023}
1026 1024
@@ -1029,7 +1027,6 @@ _evgld_glBindBuffer(GLenum target, GLuint buffer)
1029{ 1027{
1030 EVGL_FUNC_BEGIN(); 1028 EVGL_FUNC_BEGIN();
1031 glBindBuffer(target, buffer); 1029 glBindBuffer(target, buffer);
1032 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1033 EVGL_FUNC_END(); 1030 EVGL_FUNC_END();
1034} 1031}
1035 1032
@@ -1039,7 +1036,6 @@ _evgld_glBindFramebuffer(GLenum target, GLuint framebuffer)
1039 EVGL_FUNC_BEGIN(); 1036 EVGL_FUNC_BEGIN();
1040 1037
1041 _evgl_glBindFramebuffer(target, framebuffer); 1038 _evgl_glBindFramebuffer(target, framebuffer);
1042 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1043 EVGL_FUNC_END(); 1039 EVGL_FUNC_END();
1044} 1040}
1045 1041
@@ -1048,7 +1044,6 @@ _evgld_glBindRenderbuffer(GLenum target, GLuint renderbuffer)
1048{ 1044{
1049 EVGL_FUNC_BEGIN(); 1045 EVGL_FUNC_BEGIN();
1050 glBindRenderbuffer(target, renderbuffer); 1046 glBindRenderbuffer(target, renderbuffer);
1051 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1052 EVGL_FUNC_END(); 1047 EVGL_FUNC_END();
1053} 1048}
1054 1049
@@ -1057,7 +1052,6 @@ _evgld_glBindTexture(GLenum target, GLuint texture)
1057{ 1052{
1058 EVGL_FUNC_BEGIN(); 1053 EVGL_FUNC_BEGIN();
1059 glBindTexture(target, texture); 1054 glBindTexture(target, texture);
1060 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1061 EVGL_FUNC_END(); 1055 EVGL_FUNC_END();
1062} 1056}
1063 1057
@@ -1066,7 +1060,6 @@ _evgld_glBlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
1066{ 1060{
1067 EVGL_FUNC_BEGIN(); 1061 EVGL_FUNC_BEGIN();
1068 glBlendColor(red, green, blue, alpha); 1062 glBlendColor(red, green, blue, alpha);
1069 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1070 EVGL_FUNC_END(); 1063 EVGL_FUNC_END();
1071} 1064}
1072 1065
@@ -1075,7 +1068,6 @@ _evgld_glBlendEquation(GLenum mode)
1075{ 1068{
1076 EVGL_FUNC_BEGIN(); 1069 EVGL_FUNC_BEGIN();
1077 glBlendEquation(mode); 1070 glBlendEquation(mode);
1078 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1079 EVGL_FUNC_END(); 1071 EVGL_FUNC_END();
1080} 1072}
1081 1073
@@ -1084,7 +1076,6 @@ _evgld_glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
1084{ 1076{
1085 EVGL_FUNC_BEGIN(); 1077 EVGL_FUNC_BEGIN();
1086 glBlendEquationSeparate(modeRGB, modeAlpha); 1078 glBlendEquationSeparate(modeRGB, modeAlpha);
1087 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1088 EVGL_FUNC_END(); 1079 EVGL_FUNC_END();
1089} 1080}
1090 1081
@@ -1093,7 +1084,6 @@ _evgld_glBlendFunc(GLenum sfactor, GLenum dfactor)
1093{ 1084{
1094 EVGL_FUNC_BEGIN(); 1085 EVGL_FUNC_BEGIN();
1095 glBlendFunc(sfactor, dfactor); 1086 glBlendFunc(sfactor, dfactor);
1096 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1097 EVGL_FUNC_END(); 1087 EVGL_FUNC_END();
1098} 1088}
1099 1089
@@ -1102,7 +1092,6 @@ _evgld_glBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum
1102{ 1092{
1103 EVGL_FUNC_BEGIN(); 1093 EVGL_FUNC_BEGIN();
1104 glBlendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha); 1094 glBlendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha);
1105 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1106 EVGL_FUNC_END(); 1095 EVGL_FUNC_END();
1107} 1096}
1108 1097
@@ -1111,7 +1100,6 @@ _evgld_glBufferData(GLenum target, GLsizeiptr size, const void* data, GLenum usa
1111{ 1100{
1112 EVGL_FUNC_BEGIN(); 1101 EVGL_FUNC_BEGIN();
1113 glBufferData(target, size, data, usage); 1102 glBufferData(target, size, data, usage);
1114 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1115 EVGL_FUNC_END(); 1103 EVGL_FUNC_END();
1116} 1104}
1117 1105
@@ -1120,7 +1108,6 @@ _evgld_glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const vo
1120{ 1108{
1121 EVGL_FUNC_BEGIN(); 1109 EVGL_FUNC_BEGIN();
1122 glBufferSubData(target, offset, size, data); 1110 glBufferSubData(target, offset, size, data);
1123 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1124 EVGL_FUNC_END(); 1111 EVGL_FUNC_END();
1125} 1112}
1126 1113
@@ -1131,7 +1118,6 @@ _evgld_glCheckFramebufferStatus(GLenum target)
1131 1118
1132 EVGL_FUNC_BEGIN(); 1119 EVGL_FUNC_BEGIN();
1133 ret = glCheckFramebufferStatus(target); 1120 ret = glCheckFramebufferStatus(target);
1134 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1135 EVGL_FUNC_END(); 1121 EVGL_FUNC_END();
1136 return ret; 1122 return ret;
1137} 1123}
@@ -1141,7 +1127,6 @@ _evgld_glClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
1141{ 1127{
1142 EVGL_FUNC_BEGIN(); 1128 EVGL_FUNC_BEGIN();
1143 _evgl_glClearColor(red, green, blue, alpha); 1129 _evgl_glClearColor(red, green, blue, alpha);
1144 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1145 EVGL_FUNC_END(); 1130 EVGL_FUNC_END();
1146} 1131}
1147 1132
@@ -1151,7 +1136,6 @@ _evgld_glClearDepthf(GLclampf depth)
1151 EVGL_FUNC_BEGIN(); 1136 EVGL_FUNC_BEGIN();
1152 1137
1153 _evgl_glClearDepthf(depth); 1138 _evgl_glClearDepthf(depth);
1154 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1155 1139
1156 EVGL_FUNC_END(); 1140 EVGL_FUNC_END();
1157} 1141}
@@ -1161,7 +1145,6 @@ _evgld_glClearStencil(GLint s)
1161{ 1145{
1162 EVGL_FUNC_BEGIN(); 1146 EVGL_FUNC_BEGIN();
1163 glClearStencil(s); 1147 glClearStencil(s);
1164 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1165 EVGL_FUNC_END(); 1148 EVGL_FUNC_END();
1166} 1149}
1167 1150
@@ -1170,7 +1153,6 @@ _evgld_glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alp
1170{ 1153{
1171 EVGL_FUNC_BEGIN(); 1154 EVGL_FUNC_BEGIN();
1172 glColorMask(red, green, blue, alpha); 1155 glColorMask(red, green, blue, alpha);
1173 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1174 EVGL_FUNC_END(); 1156 EVGL_FUNC_END();
1175} 1157}
1176 1158
@@ -1179,7 +1161,6 @@ _evgld_glCompileShader(GLuint shader)
1179{ 1161{
1180 EVGL_FUNC_BEGIN(); 1162 EVGL_FUNC_BEGIN();
1181 glCompileShader(shader); 1163 glCompileShader(shader);
1182 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1183 EVGL_FUNC_END(); 1164 EVGL_FUNC_END();
1184} 1165}
1185 1166
@@ -1188,7 +1169,6 @@ _evgld_glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat,
1188{ 1169{
1189 EVGL_FUNC_BEGIN(); 1170 EVGL_FUNC_BEGIN();
1190 glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data); 1171 glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
1191 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1192 EVGL_FUNC_END(); 1172 EVGL_FUNC_END();
1193} 1173}
1194 1174
@@ -1197,7 +1177,6 @@ _evgld_glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLin
1197{ 1177{
1198 EVGL_FUNC_BEGIN(); 1178 EVGL_FUNC_BEGIN();
1199 glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data); 1179 glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
1200 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1201 EVGL_FUNC_END(); 1180 EVGL_FUNC_END();
1202} 1181}
1203 1182
@@ -1206,7 +1185,6 @@ _evgld_glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint
1206{ 1185{
1207 EVGL_FUNC_BEGIN(); 1186 EVGL_FUNC_BEGIN();
1208 glCopyTexImage2D(target, level, internalformat, x, y, width, height, border); 1187 glCopyTexImage2D(target, level, internalformat, x, y, width, height, border);
1209 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1210 EVGL_FUNC_END(); 1188 EVGL_FUNC_END();
1211} 1189}
1212 1190
@@ -1215,7 +1193,6 @@ _evgld_glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoff
1215{ 1193{
1216 EVGL_FUNC_BEGIN(); 1194 EVGL_FUNC_BEGIN();
1217 glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height); 1195 glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
1218 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1219 EVGL_FUNC_END(); 1196 EVGL_FUNC_END();
1220} 1197}
1221 1198
@@ -1226,7 +1203,6 @@ _evgld_glCreateProgram(void)
1226 1203
1227 EVGL_FUNC_BEGIN(); 1204 EVGL_FUNC_BEGIN();
1228 ret = glCreateProgram(); 1205 ret = glCreateProgram();
1229 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1230 EVGL_FUNC_END(); 1206 EVGL_FUNC_END();
1231 return ret; 1207 return ret;
1232} 1208}
@@ -1237,7 +1213,6 @@ _evgld_glCreateShader(GLenum type)
1237 GLuint ret = _EVGL_INT_INIT_VALUE; 1213 GLuint ret = _EVGL_INT_INIT_VALUE;
1238 EVGL_FUNC_BEGIN(); 1214 EVGL_FUNC_BEGIN();
1239 ret = glCreateShader(type); 1215 ret = glCreateShader(type);
1240 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1241 EVGL_FUNC_END(); 1216 EVGL_FUNC_END();
1242 return ret; 1217 return ret;
1243} 1218}
@@ -1247,7 +1222,6 @@ _evgld_glCullFace(GLenum mode)
1247{ 1222{
1248 EVGL_FUNC_BEGIN(); 1223 EVGL_FUNC_BEGIN();
1249 glCullFace(mode); 1224 glCullFace(mode);
1250 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1251 EVGL_FUNC_END(); 1225 EVGL_FUNC_END();
1252} 1226}
1253 1227
@@ -1256,7 +1230,6 @@ _evgld_glDeleteBuffers(GLsizei n, const GLuint* buffers)
1256{ 1230{
1257 EVGL_FUNC_BEGIN(); 1231 EVGL_FUNC_BEGIN();
1258 glDeleteBuffers(n, buffers); 1232 glDeleteBuffers(n, buffers);
1259 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1260 EVGL_FUNC_END(); 1233 EVGL_FUNC_END();
1261} 1234}
1262 1235
@@ -1265,7 +1238,6 @@ _evgld_glDeleteFramebuffers(GLsizei n, const GLuint* framebuffers)
1265{ 1238{
1266 EVGL_FUNC_BEGIN(); 1239 EVGL_FUNC_BEGIN();
1267 glDeleteFramebuffers(n, framebuffers); 1240 glDeleteFramebuffers(n, framebuffers);
1268 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1269 EVGL_FUNC_END(); 1241 EVGL_FUNC_END();
1270} 1242}
1271 1243
@@ -1274,7 +1246,6 @@ _evgld_glDeleteProgram(GLuint program)
1274{ 1246{
1275 EVGL_FUNC_BEGIN(); 1247 EVGL_FUNC_BEGIN();
1276 glDeleteProgram(program); 1248 glDeleteProgram(program);
1277 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1278 EVGL_FUNC_END(); 1249 EVGL_FUNC_END();
1279} 1250}
1280 1251
@@ -1283,7 +1254,6 @@ _evgld_glDeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers)
1283{ 1254{
1284 EVGL_FUNC_BEGIN(); 1255 EVGL_FUNC_BEGIN();
1285 glDeleteRenderbuffers(n, renderbuffers); 1256 glDeleteRenderbuffers(n, renderbuffers);
1286 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1287 EVGL_FUNC_END(); 1257 EVGL_FUNC_END();
1288} 1258}
1289 1259
@@ -1292,7 +1262,6 @@ _evgld_glDeleteShader(GLuint shader)
1292{ 1262{
1293 EVGL_FUNC_BEGIN(); 1263 EVGL_FUNC_BEGIN();
1294 glDeleteShader(shader); 1264 glDeleteShader(shader);
1295 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1296 EVGL_FUNC_END(); 1265 EVGL_FUNC_END();
1297} 1266}
1298 1267
@@ -1301,7 +1270,6 @@ _evgld_glDeleteTextures(GLsizei n, const GLuint* textures)
1301{ 1270{
1302 EVGL_FUNC_BEGIN(); 1271 EVGL_FUNC_BEGIN();
1303 glDeleteTextures(n, textures); 1272 glDeleteTextures(n, textures);
1304 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1305 EVGL_FUNC_END(); 1273 EVGL_FUNC_END();
1306} 1274}
1307 1275
@@ -1310,7 +1278,6 @@ _evgld_glDepthFunc(GLenum func)
1310{ 1278{
1311 EVGL_FUNC_BEGIN(); 1279 EVGL_FUNC_BEGIN();
1312 glDepthFunc(func); 1280 glDepthFunc(func);
1313 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1314 EVGL_FUNC_END(); 1281 EVGL_FUNC_END();
1315} 1282}
1316 1283
@@ -1319,7 +1286,6 @@ _evgld_glDepthMask(GLboolean flag)
1319{ 1286{
1320 EVGL_FUNC_BEGIN(); 1287 EVGL_FUNC_BEGIN();
1321 glDepthMask(flag); 1288 glDepthMask(flag);
1322 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1323 EVGL_FUNC_END(); 1289 EVGL_FUNC_END();
1324} 1290}
1325 1291
@@ -1329,7 +1295,6 @@ _evgld_glDepthRangef(GLclampf zNear, GLclampf zFar)
1329 EVGL_FUNC_BEGIN(); 1295 EVGL_FUNC_BEGIN();
1330 1296
1331 _evgl_glDepthRangef(zNear, zFar); 1297 _evgl_glDepthRangef(zNear, zFar);
1332 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1333 1298
1334 EVGL_FUNC_END(); 1299 EVGL_FUNC_END();
1335} 1300}
@@ -1339,7 +1304,6 @@ _evgld_glDetachShader(GLuint program, GLuint shader)
1339{ 1304{
1340 EVGL_FUNC_BEGIN(); 1305 EVGL_FUNC_BEGIN();
1341 glDetachShader(program, shader); 1306 glDetachShader(program, shader);
1342 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1343 EVGL_FUNC_END(); 1307 EVGL_FUNC_END();
1344} 1308}
1345 1309
@@ -1348,7 +1312,6 @@ _evgld_glDisableVertexAttribArray(GLuint idx)
1348{ 1312{
1349 EVGL_FUNC_BEGIN(); 1313 EVGL_FUNC_BEGIN();
1350 glDisableVertexAttribArray(idx); 1314 glDisableVertexAttribArray(idx);
1351 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1352 EVGL_FUNC_END(); 1315 EVGL_FUNC_END();
1353} 1316}
1354 1317
@@ -1357,7 +1320,6 @@ _evgld_glDrawArrays(GLenum mode, GLint first, GLsizei count)
1357{ 1320{
1358 EVGL_FUNC_BEGIN(); 1321 EVGL_FUNC_BEGIN();
1359 glDrawArrays(mode, first, count); 1322 glDrawArrays(mode, first, count);
1360 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1361 EVGL_FUNC_END(); 1323 EVGL_FUNC_END();
1362} 1324}
1363 1325
@@ -1366,7 +1328,6 @@ _evgld_glDrawElements(GLenum mode, GLsizei count, GLenum type, const void* indic
1366{ 1328{
1367 EVGL_FUNC_BEGIN(); 1329 EVGL_FUNC_BEGIN();
1368 glDrawElements(mode, count, type, indices); 1330 glDrawElements(mode, count, type, indices);
1369 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1370 EVGL_FUNC_END(); 1331 EVGL_FUNC_END();
1371} 1332}
1372 1333
@@ -1375,7 +1336,6 @@ _evgld_glEnableVertexAttribArray(GLuint idx)
1375{ 1336{
1376 EVGL_FUNC_BEGIN(); 1337 EVGL_FUNC_BEGIN();
1377 glEnableVertexAttribArray(idx); 1338 glEnableVertexAttribArray(idx);
1378 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1379 EVGL_FUNC_END(); 1339 EVGL_FUNC_END();
1380} 1340}
1381 1341
@@ -1384,7 +1344,6 @@ _evgld_glFinish(void)
1384{ 1344{
1385 EVGL_FUNC_BEGIN(); 1345 EVGL_FUNC_BEGIN();
1386 glFinish(); 1346 glFinish();
1387 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1388 EVGL_FUNC_END(); 1347 EVGL_FUNC_END();
1389} 1348}
1390 1349
@@ -1393,7 +1352,6 @@ _evgld_glFlush(void)
1393{ 1352{
1394 EVGL_FUNC_BEGIN(); 1353 EVGL_FUNC_BEGIN();
1395 glFlush(); 1354 glFlush();
1396 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1397 EVGL_FUNC_END(); 1355 EVGL_FUNC_END();
1398} 1356}
1399 1357
@@ -1402,7 +1360,6 @@ _evgld_glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum render
1402{ 1360{
1403 EVGL_FUNC_BEGIN(); 1361 EVGL_FUNC_BEGIN();
1404 glFramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer); 1362 glFramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
1405 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1406 EVGL_FUNC_END(); 1363 EVGL_FUNC_END();
1407} 1364}
1408 1365
@@ -1411,7 +1368,6 @@ _evgld_glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget
1411{ 1368{
1412 EVGL_FUNC_BEGIN(); 1369 EVGL_FUNC_BEGIN();
1413 glFramebufferTexture2D(target, attachment, textarget, texture, level); 1370 glFramebufferTexture2D(target, attachment, textarget, texture, level);
1414 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1415 EVGL_FUNC_END(); 1371 EVGL_FUNC_END();
1416} 1372}
1417 1373
@@ -1420,7 +1376,6 @@ _evgld_glFrontFace(GLenum mode)
1420{ 1376{
1421 EVGL_FUNC_BEGIN(); 1377 EVGL_FUNC_BEGIN();
1422 glFrontFace(mode); 1378 glFrontFace(mode);
1423 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1424 EVGL_FUNC_END(); 1379 EVGL_FUNC_END();
1425} 1380}
1426 1381
@@ -1430,7 +1385,6 @@ _evgld_glGetVertexAttribfv(GLuint idx, GLenum pname, GLfloat* params)
1430 EVGL_FUNC_BEGIN(); 1385 EVGL_FUNC_BEGIN();
1431 glGetVertexAttribfv(idx, pname, params); 1386 glGetVertexAttribfv(idx, pname, params);
1432 1387
1433 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1434 EVGL_FUNC_END(); 1388 EVGL_FUNC_END();
1435} 1389}
1436 1390
@@ -1440,7 +1394,6 @@ _evgld_glGetVertexAttribiv(GLuint idx, GLenum pname, GLint* params)
1440 EVGL_FUNC_BEGIN(); 1394 EVGL_FUNC_BEGIN();
1441 glGetVertexAttribiv(idx, pname, params); 1395 glGetVertexAttribiv(idx, pname, params);
1442 1396
1443 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1444 EVGL_FUNC_END(); 1397 EVGL_FUNC_END();
1445} 1398}
1446 1399
@@ -1450,7 +1403,6 @@ _evgld_glGetVertexAttribPointerv(GLuint idx, GLenum pname, void** pointer)
1450 EVGL_FUNC_BEGIN(); 1403 EVGL_FUNC_BEGIN();
1451 glGetVertexAttribPointerv(idx, pname, pointer); 1404 glGetVertexAttribPointerv(idx, pname, pointer);
1452 1405
1453 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1454 1406
1455 EVGL_FUNC_END(); 1407 EVGL_FUNC_END();
1456} 1408}
@@ -1460,7 +1412,6 @@ _evgld_glHint(GLenum target, GLenum mode)
1460{ 1412{
1461 EVGL_FUNC_BEGIN(); 1413 EVGL_FUNC_BEGIN();
1462 glHint(target, mode); 1414 glHint(target, mode);
1463 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1464 EVGL_FUNC_END(); 1415 EVGL_FUNC_END();
1465} 1416}
1466 1417
@@ -1469,7 +1420,6 @@ _evgld_glGenBuffers(GLsizei n, GLuint* buffers)
1469{ 1420{
1470 EVGL_FUNC_BEGIN(); 1421 EVGL_FUNC_BEGIN();
1471 glGenBuffers(n, buffers); 1422 glGenBuffers(n, buffers);
1472 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1473 EVGL_FUNC_END(); 1423 EVGL_FUNC_END();
1474} 1424}
1475 1425
@@ -1478,7 +1428,6 @@ _evgld_glGenerateMipmap(GLenum target)
1478{ 1428{
1479 EVGL_FUNC_BEGIN(); 1429 EVGL_FUNC_BEGIN();
1480 glGenerateMipmap(target); 1430 glGenerateMipmap(target);
1481 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1482 EVGL_FUNC_END(); 1431 EVGL_FUNC_END();
1483} 1432}
1484 1433
@@ -1487,7 +1436,6 @@ _evgld_glGenFramebuffers(GLsizei n, GLuint* framebuffers)
1487{ 1436{
1488 EVGL_FUNC_BEGIN(); 1437 EVGL_FUNC_BEGIN();
1489 glGenFramebuffers(n, framebuffers); 1438 glGenFramebuffers(n, framebuffers);
1490 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1491 EVGL_FUNC_END(); 1439 EVGL_FUNC_END();
1492} 1440}
1493 1441
@@ -1496,7 +1444,6 @@ _evgld_glGenRenderbuffers(GLsizei n, GLuint* renderbuffers)
1496{ 1444{
1497 EVGL_FUNC_BEGIN(); 1445 EVGL_FUNC_BEGIN();
1498 glGenRenderbuffers(n, renderbuffers); 1446 glGenRenderbuffers(n, renderbuffers);
1499 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1500 EVGL_FUNC_END(); 1447 EVGL_FUNC_END();
1501} 1448}
1502 1449
@@ -1505,7 +1452,6 @@ _evgld_glGenTextures(GLsizei n, GLuint* textures)
1505{ 1452{
1506 EVGL_FUNC_BEGIN(); 1453 EVGL_FUNC_BEGIN();
1507 glGenTextures(n, textures); 1454 glGenTextures(n, textures);
1508 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1509 EVGL_FUNC_END(); 1455 EVGL_FUNC_END();
1510} 1456}
1511 1457
@@ -1514,7 +1460,6 @@ _evgld_glGetActiveAttrib(GLuint program, GLuint idx, GLsizei bufsize, GLsizei* l
1514{ 1460{
1515 EVGL_FUNC_BEGIN(); 1461 EVGL_FUNC_BEGIN();
1516 glGetActiveAttrib(program, idx, bufsize, length, size, type, name); 1462 glGetActiveAttrib(program, idx, bufsize, length, size, type, name);
1517 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1518 EVGL_FUNC_END(); 1463 EVGL_FUNC_END();
1519} 1464}
1520 1465
@@ -1523,7 +1468,6 @@ _evgld_glGetActiveUniform(GLuint program, GLuint idx, GLsizei bufsize, GLsizei*
1523{ 1468{
1524 EVGL_FUNC_BEGIN(); 1469 EVGL_FUNC_BEGIN();
1525 glGetActiveUniform(program, idx, bufsize, length, size, type, name); 1470 glGetActiveUniform(program, idx, bufsize, length, size, type, name);
1526 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1527 EVGL_FUNC_END(); 1471 EVGL_FUNC_END();
1528} 1472}
1529 1473
@@ -1532,7 +1476,6 @@ _evgld_glGetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei* count, GL
1532{ 1476{
1533 EVGL_FUNC_BEGIN(); 1477 EVGL_FUNC_BEGIN();
1534 glGetAttachedShaders(program, maxcount, count, shaders); 1478 glGetAttachedShaders(program, maxcount, count, shaders);
1535 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1536 EVGL_FUNC_END(); 1479 EVGL_FUNC_END();
1537} 1480}
1538 1481
@@ -1542,7 +1485,6 @@ _evgld_glGetAttribLocation(GLuint program, const char* name)
1542 int ret = _EVGL_INT_INIT_VALUE; 1485 int ret = _EVGL_INT_INIT_VALUE;
1543 EVGL_FUNC_BEGIN(); 1486 EVGL_FUNC_BEGIN();
1544 ret = glGetAttribLocation(program, name); 1487 ret = glGetAttribLocation(program, name);
1545 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1546 EVGL_FUNC_END(); 1488 EVGL_FUNC_END();
1547 return ret; 1489 return ret;
1548} 1490}
@@ -1552,7 +1494,6 @@ _evgld_glGetBooleanv(GLenum pname, GLboolean* params)
1552{ 1494{
1553 EVGL_FUNC_BEGIN(); 1495 EVGL_FUNC_BEGIN();
1554 glGetBooleanv(pname, params); 1496 glGetBooleanv(pname, params);
1555 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1556 EVGL_FUNC_END(); 1497 EVGL_FUNC_END();
1557} 1498}
1558 1499
@@ -1561,7 +1502,6 @@ _evgld_glGetBufferParameteriv(GLenum target, GLenum pname, GLint* params)
1561{ 1502{
1562 EVGL_FUNC_BEGIN(); 1503 EVGL_FUNC_BEGIN();
1563 glGetBufferParameteriv(target, pname, params); 1504 glGetBufferParameteriv(target, pname, params);
1564 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1565 EVGL_FUNC_END(); 1505 EVGL_FUNC_END();
1566} 1506}
1567 1507
@@ -1581,7 +1521,6 @@ _evgld_glGetFloatv(GLenum pname, GLfloat* params)
1581{ 1521{
1582 EVGL_FUNC_BEGIN(); 1522 EVGL_FUNC_BEGIN();
1583 glGetFloatv(pname, params); 1523 glGetFloatv(pname, params);
1584 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1585 EVGL_FUNC_END(); 1524 EVGL_FUNC_END();
1586} 1525}
1587 1526
@@ -1590,7 +1529,6 @@ _evgld_glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, G
1590{ 1529{
1591 EVGL_FUNC_BEGIN(); 1530 EVGL_FUNC_BEGIN();
1592 glGetFramebufferAttachmentParameteriv(target, attachment, pname, params); 1531 glGetFramebufferAttachmentParameteriv(target, attachment, pname, params);
1593 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1594 EVGL_FUNC_END(); 1532 EVGL_FUNC_END();
1595} 1533}
1596 1534
@@ -1599,7 +1537,6 @@ _evgld_glGetProgramiv(GLuint program, GLenum pname, GLint* params)
1599{ 1537{
1600 EVGL_FUNC_BEGIN(); 1538 EVGL_FUNC_BEGIN();
1601 glGetProgramiv(program, pname, params); 1539 glGetProgramiv(program, pname, params);
1602 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1603 EVGL_FUNC_END(); 1540 EVGL_FUNC_END();
1604} 1541}
1605 1542
@@ -1608,7 +1545,6 @@ _evgld_glGetProgramInfoLog(GLuint program, GLsizei bufsize, GLsizei* length, cha
1608{ 1545{
1609 EVGL_FUNC_BEGIN(); 1546 EVGL_FUNC_BEGIN();
1610 glGetProgramInfoLog(program, bufsize, length, infolog); 1547 glGetProgramInfoLog(program, bufsize, length, infolog);
1611 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1612 EVGL_FUNC_END(); 1548 EVGL_FUNC_END();
1613} 1549}
1614 1550
@@ -1617,7 +1553,6 @@ _evgld_glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint* params)
1617{ 1553{
1618 EVGL_FUNC_BEGIN(); 1554 EVGL_FUNC_BEGIN();
1619 glGetRenderbufferParameteriv(target, pname, params); 1555 glGetRenderbufferParameteriv(target, pname, params);
1620 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1621 EVGL_FUNC_END(); 1556 EVGL_FUNC_END();
1622} 1557}
1623 1558
@@ -1626,7 +1561,6 @@ _evgld_glGetShaderiv(GLuint shader, GLenum pname, GLint* params)
1626{ 1561{
1627 EVGL_FUNC_BEGIN(); 1562 EVGL_FUNC_BEGIN();
1628 glGetShaderiv(shader, pname, params); 1563 glGetShaderiv(shader, pname, params);
1629 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1630 EVGL_FUNC_END(); 1564 EVGL_FUNC_END();
1631} 1565}
1632 1566
@@ -1635,7 +1569,6 @@ _evgld_glGetShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei* length, char*
1635{ 1569{
1636 EVGL_FUNC_BEGIN(); 1570 EVGL_FUNC_BEGIN();
1637 glGetShaderInfoLog(shader, bufsize, length, infolog); 1571 glGetShaderInfoLog(shader, bufsize, length, infolog);
1638 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1639 EVGL_FUNC_END(); 1572 EVGL_FUNC_END();
1640} 1573}
1641 1574
@@ -1645,7 +1578,6 @@ _evgld_glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint
1645 EVGL_FUNC_BEGIN(); 1578 EVGL_FUNC_BEGIN();
1646 1579
1647 _evgl_glGetShaderPrecisionFormat(shadertype, precisiontype, range, precision); 1580 _evgl_glGetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
1648 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1649 1581
1650 EVGL_FUNC_END(); 1582 EVGL_FUNC_END();
1651} 1583}
@@ -1655,7 +1587,6 @@ _evgld_glGetShaderSource(GLuint shader, GLsizei bufsize, GLsizei* length, char*
1655{ 1587{
1656 EVGL_FUNC_BEGIN(); 1588 EVGL_FUNC_BEGIN();
1657 glGetShaderSource(shader, bufsize, length, source); 1589 glGetShaderSource(shader, bufsize, length, source);
1658 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1659 EVGL_FUNC_END(); 1590 EVGL_FUNC_END();
1660} 1591}
1661 1592
@@ -1666,7 +1597,6 @@ _evgld_glGetString(GLenum name)
1666 1597
1667 EVGL_FUNC_BEGIN(); 1598 EVGL_FUNC_BEGIN();
1668 ret = _evgl_glGetString(name); 1599 ret = _evgl_glGetString(name);
1669 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1670 EVGL_FUNC_END(); 1600 EVGL_FUNC_END();
1671 return ret; 1601 return ret;
1672} 1602}
@@ -1676,7 +1606,6 @@ _evgld_glGetTexParameterfv(GLenum target, GLenum pname, GLfloat* params)
1676{ 1606{
1677 EVGL_FUNC_BEGIN(); 1607 EVGL_FUNC_BEGIN();
1678 glGetTexParameterfv(target, pname, params); 1608 glGetTexParameterfv(target, pname, params);
1679 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1680 EVGL_FUNC_END(); 1609 EVGL_FUNC_END();
1681} 1610}
1682 1611
@@ -1685,7 +1614,6 @@ _evgld_glGetTexParameteriv(GLenum target, GLenum pname, GLint* params)
1685{ 1614{
1686 EVGL_FUNC_BEGIN(); 1615 EVGL_FUNC_BEGIN();
1687 glGetTexParameteriv(target, pname, params); 1616 glGetTexParameteriv(target, pname, params);
1688 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1689 EVGL_FUNC_END(); 1617 EVGL_FUNC_END();
1690} 1618}
1691 1619
@@ -1694,7 +1622,6 @@ _evgld_glGetUniformfv(GLuint program, GLint location, GLfloat* params)
1694{ 1622{
1695 EVGL_FUNC_BEGIN(); 1623 EVGL_FUNC_BEGIN();
1696 glGetUniformfv(program, location, params); 1624 glGetUniformfv(program, location, params);
1697 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1698 EVGL_FUNC_END(); 1625 EVGL_FUNC_END();
1699} 1626}
1700 1627
@@ -1703,7 +1630,6 @@ _evgld_glGetUniformiv(GLuint program, GLint location, GLint* params)
1703{ 1630{
1704 EVGL_FUNC_BEGIN(); 1631 EVGL_FUNC_BEGIN();
1705 glGetUniformiv(program, location, params); 1632 glGetUniformiv(program, location, params);
1706 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1707 EVGL_FUNC_END(); 1633 EVGL_FUNC_END();
1708} 1634}
1709int 1635int
@@ -1713,7 +1639,6 @@ _evgld_glGetUniformLocation(GLuint program, const char* name)
1713 1639
1714 EVGL_FUNC_BEGIN(); 1640 EVGL_FUNC_BEGIN();
1715 ret = glGetUniformLocation(program, name); 1641 ret = glGetUniformLocation(program, name);
1716 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1717 EVGL_FUNC_END(); 1642 EVGL_FUNC_END();
1718 return ret; 1643 return ret;
1719} 1644}
@@ -1725,7 +1650,6 @@ _evgld_glIsBuffer(GLuint buffer)
1725 1650
1726 EVGL_FUNC_BEGIN(); 1651 EVGL_FUNC_BEGIN();
1727 ret = glIsBuffer(buffer); 1652 ret = glIsBuffer(buffer);
1728 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1729 EVGL_FUNC_END(); 1653 EVGL_FUNC_END();
1730 return ret; 1654 return ret;
1731} 1655}
@@ -1737,7 +1661,6 @@ _evgld_glIsEnabled(GLenum cap)
1737 1661
1738 EVGL_FUNC_BEGIN(); 1662 EVGL_FUNC_BEGIN();
1739 ret = glIsEnabled(cap); 1663 ret = glIsEnabled(cap);
1740 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1741 EVGL_FUNC_END(); 1664 EVGL_FUNC_END();
1742 return ret; 1665 return ret;
1743} 1666}
@@ -1749,7 +1672,6 @@ _evgld_glIsFramebuffer(GLuint framebuffer)
1749 1672
1750 EVGL_FUNC_BEGIN(); 1673 EVGL_FUNC_BEGIN();
1751 ret = glIsFramebuffer(framebuffer); 1674 ret = glIsFramebuffer(framebuffer);
1752 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1753 EVGL_FUNC_END(); 1675 EVGL_FUNC_END();
1754 return ret; 1676 return ret;
1755} 1677}
@@ -1760,7 +1682,6 @@ _evgld_glIsProgram(GLuint program)
1760 GLboolean ret; 1682 GLboolean ret;
1761 EVGL_FUNC_BEGIN(); 1683 EVGL_FUNC_BEGIN();
1762 ret = glIsProgram(program); 1684 ret = glIsProgram(program);
1763 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1764 EVGL_FUNC_END(); 1685 EVGL_FUNC_END();
1765 return ret; 1686 return ret;
1766} 1687}
@@ -1771,7 +1692,6 @@ _evgld_glIsRenderbuffer(GLuint renderbuffer)
1771 GLboolean ret; 1692 GLboolean ret;
1772 EVGL_FUNC_BEGIN(); 1693 EVGL_FUNC_BEGIN();
1773 ret = glIsRenderbuffer(renderbuffer); 1694 ret = glIsRenderbuffer(renderbuffer);
1774 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1775 EVGL_FUNC_END(); 1695 EVGL_FUNC_END();
1776 return ret; 1696 return ret;
1777} 1697}
@@ -1782,7 +1702,6 @@ _evgld_glIsShader(GLuint shader)
1782 GLboolean ret; 1702 GLboolean ret;
1783 EVGL_FUNC_BEGIN(); 1703 EVGL_FUNC_BEGIN();
1784 ret = glIsShader(shader); 1704 ret = glIsShader(shader);
1785 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1786 EVGL_FUNC_END(); 1705 EVGL_FUNC_END();
1787 return ret; 1706 return ret;
1788} 1707}
@@ -1793,7 +1712,6 @@ _evgld_glIsTexture(GLuint texture)
1793 GLboolean ret; 1712 GLboolean ret;
1794 EVGL_FUNC_BEGIN(); 1713 EVGL_FUNC_BEGIN();
1795 ret = glIsTexture(texture); 1714 ret = glIsTexture(texture);
1796 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1797 EVGL_FUNC_END(); 1715 EVGL_FUNC_END();
1798 return ret; 1716 return ret;
1799} 1717}
@@ -1803,7 +1721,6 @@ _evgld_glLineWidth(GLfloat width)
1803{ 1721{
1804 EVGL_FUNC_BEGIN(); 1722 EVGL_FUNC_BEGIN();
1805 glLineWidth(width); 1723 glLineWidth(width);
1806 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1807 EVGL_FUNC_END(); 1724 EVGL_FUNC_END();
1808} 1725}
1809 1726
@@ -1812,7 +1729,6 @@ _evgld_glLinkProgram(GLuint program)
1812{ 1729{
1813 EVGL_FUNC_BEGIN(); 1730 EVGL_FUNC_BEGIN();
1814 glLinkProgram(program); 1731 glLinkProgram(program);
1815 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1816 EVGL_FUNC_END(); 1732 EVGL_FUNC_END();
1817} 1733}
1818 1734
@@ -1821,7 +1737,6 @@ _evgld_glPixelStorei(GLenum pname, GLint param)
1821{ 1737{
1822 EVGL_FUNC_BEGIN(); 1738 EVGL_FUNC_BEGIN();
1823 glPixelStorei(pname, param); 1739 glPixelStorei(pname, param);
1824 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1825 EVGL_FUNC_END(); 1740 EVGL_FUNC_END();
1826} 1741}
1827 1742
@@ -1830,7 +1745,6 @@ _evgld_glPolygonOffset(GLfloat factor, GLfloat units)
1830{ 1745{
1831 EVGL_FUNC_BEGIN(); 1746 EVGL_FUNC_BEGIN();
1832 glPolygonOffset(factor, units); 1747 glPolygonOffset(factor, units);
1833 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1834 EVGL_FUNC_END(); 1748 EVGL_FUNC_END();
1835} 1749}
1836 1750
@@ -1840,7 +1754,6 @@ _evgld_glReleaseShaderCompiler(void)
1840 EVGL_FUNC_BEGIN(); 1754 EVGL_FUNC_BEGIN();
1841 1755
1842 _evgl_glReleaseShaderCompiler(); 1756 _evgl_glReleaseShaderCompiler();
1843 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1844 1757
1845 EVGL_FUNC_END(); 1758 EVGL_FUNC_END();
1846} 1759}
@@ -1850,7 +1763,6 @@ _evgld_glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width
1850{ 1763{
1851 EVGL_FUNC_BEGIN(); 1764 EVGL_FUNC_BEGIN();
1852 glRenderbufferStorage(target, internalformat, width, height); 1765 glRenderbufferStorage(target, internalformat, width, height);
1853 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1854 EVGL_FUNC_END(); 1766 EVGL_FUNC_END();
1855} 1767}
1856 1768
@@ -1859,7 +1771,6 @@ _evgld_glSampleCoverage(GLclampf value, GLboolean invert)
1859{ 1771{
1860 EVGL_FUNC_BEGIN(); 1772 EVGL_FUNC_BEGIN();
1861 glSampleCoverage(value, invert); 1773 glSampleCoverage(value, invert);
1862 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1863 EVGL_FUNC_END(); 1774 EVGL_FUNC_END();
1864} 1775}
1865 1776
@@ -1869,7 +1780,6 @@ _evgld_glShaderBinary(GLsizei n, const GLuint* shaders, GLenum binaryformat, con
1869 EVGL_FUNC_BEGIN(); 1780 EVGL_FUNC_BEGIN();
1870 1781
1871 _evgl_glShaderBinary(n, shaders, binaryformat, binary, length); 1782 _evgl_glShaderBinary(n, shaders, binaryformat, binary, length);
1872 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1873 1783
1874 EVGL_FUNC_END(); 1784 EVGL_FUNC_END();
1875} 1785}
@@ -1883,7 +1793,6 @@ _evgld_glShaderSource(GLuint shader, GLsizei count, const char* const * string,
1883#else 1793#else
1884 glShaderSource(shader, count, (const GLchar **) string, length); 1794 glShaderSource(shader, count, (const GLchar **) string, length);
1885#endif 1795#endif
1886 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1887 EVGL_FUNC_END(); 1796 EVGL_FUNC_END();
1888} 1797}
1889 1798
@@ -1892,7 +1801,6 @@ _evgld_glStencilFunc(GLenum func, GLint ref, GLuint mask)
1892{ 1801{
1893 EVGL_FUNC_BEGIN(); 1802 EVGL_FUNC_BEGIN();
1894 glStencilFunc(func, ref, mask); 1803 glStencilFunc(func, ref, mask);
1895 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1896 EVGL_FUNC_END(); 1804 EVGL_FUNC_END();
1897} 1805}
1898 1806
@@ -1901,7 +1809,6 @@ _evgld_glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
1901{ 1809{
1902 EVGL_FUNC_BEGIN(); 1810 EVGL_FUNC_BEGIN();
1903 glStencilFuncSeparate(face, func, ref, mask); 1811 glStencilFuncSeparate(face, func, ref, mask);
1904 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1905 EVGL_FUNC_END(); 1812 EVGL_FUNC_END();
1906} 1813}
1907 1814
@@ -1910,7 +1817,6 @@ _evgld_glStencilMask(GLuint mask)
1910{ 1817{
1911 EVGL_FUNC_BEGIN(); 1818 EVGL_FUNC_BEGIN();
1912 glStencilMask(mask); 1819 glStencilMask(mask);
1913 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1914 EVGL_FUNC_END(); 1820 EVGL_FUNC_END();
1915} 1821}
1916 1822
@@ -1919,7 +1825,6 @@ _evgld_glStencilMaskSeparate(GLenum face, GLuint mask)
1919{ 1825{
1920 EVGL_FUNC_BEGIN(); 1826 EVGL_FUNC_BEGIN();
1921 glStencilMaskSeparate(face, mask); 1827 glStencilMaskSeparate(face, mask);
1922 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1923 EVGL_FUNC_END(); 1828 EVGL_FUNC_END();
1924} 1829}
1925 1830
@@ -1928,7 +1833,6 @@ _evgld_glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
1928{ 1833{
1929 EVGL_FUNC_BEGIN(); 1834 EVGL_FUNC_BEGIN();
1930 glStencilOp(fail, zfail, zpass); 1835 glStencilOp(fail, zfail, zpass);
1931 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1932 EVGL_FUNC_END(); 1836 EVGL_FUNC_END();
1933} 1837}
1934 1838
@@ -1937,7 +1841,6 @@ _evgld_glStencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass)
1937{ 1841{
1938 EVGL_FUNC_BEGIN(); 1842 EVGL_FUNC_BEGIN();
1939 glStencilOpSeparate(face, fail, zfail, zpass); 1843 glStencilOpSeparate(face, fail, zfail, zpass);
1940 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1941 EVGL_FUNC_END(); 1844 EVGL_FUNC_END();
1942} 1845}
1943 1846
@@ -1946,7 +1849,6 @@ _evgld_glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei wi
1946{ 1849{
1947 EVGL_FUNC_BEGIN(); 1850 EVGL_FUNC_BEGIN();
1948 glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels); 1851 glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
1949 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1950 EVGL_FUNC_END(); 1852 EVGL_FUNC_END();
1951} 1853}
1952 1854
@@ -1955,7 +1857,6 @@ _evgld_glTexParameterf(GLenum target, GLenum pname, GLfloat param)
1955{ 1857{
1956 EVGL_FUNC_BEGIN(); 1858 EVGL_FUNC_BEGIN();
1957 glTexParameterf(target, pname, param); 1859 glTexParameterf(target, pname, param);
1958 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1959 EVGL_FUNC_END(); 1860 EVGL_FUNC_END();
1960} 1861}
1961 1862
@@ -1964,7 +1865,6 @@ _evgld_glTexParameterfv(GLenum target, GLenum pname, const GLfloat* params)
1964{ 1865{
1965 EVGL_FUNC_BEGIN(); 1866 EVGL_FUNC_BEGIN();
1966 glTexParameterfv(target, pname, params); 1867 glTexParameterfv(target, pname, params);
1967 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1968 EVGL_FUNC_END(); 1868 EVGL_FUNC_END();
1969} 1869}
1970 1870
@@ -1973,7 +1873,6 @@ _evgld_glTexParameteri(GLenum target, GLenum pname, GLint param)
1973{ 1873{
1974 EVGL_FUNC_BEGIN(); 1874 EVGL_FUNC_BEGIN();
1975 glTexParameteri(target, pname, param); 1875 glTexParameteri(target, pname, param);
1976 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1977 EVGL_FUNC_END(); 1876 EVGL_FUNC_END();
1978} 1877}
1979 1878
@@ -1982,7 +1881,6 @@ _evgld_glTexParameteriv(GLenum target, GLenum pname, const GLint* params)
1982{ 1881{
1983 EVGL_FUNC_BEGIN(); 1882 EVGL_FUNC_BEGIN();
1984 glTexParameteriv(target, pname, params); 1883 glTexParameteriv(target, pname, params);
1985 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1986 EVGL_FUNC_END(); 1884 EVGL_FUNC_END();
1987} 1885}
1988 1886
@@ -1991,7 +1889,6 @@ _evgld_glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
1991{ 1889{
1992 EVGL_FUNC_BEGIN(); 1890 EVGL_FUNC_BEGIN();
1993 glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels); 1891 glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
1994 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1995 EVGL_FUNC_END(); 1892 EVGL_FUNC_END();
1996} 1893}
1997 1894
@@ -2000,7 +1897,6 @@ _evgld_glUniform1f(GLint location, GLfloat x)
2000{ 1897{
2001 EVGL_FUNC_BEGIN(); 1898 EVGL_FUNC_BEGIN();
2002 glUniform1f(location, x); 1899 glUniform1f(location, x);
2003 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2004 EVGL_FUNC_END(); 1900 EVGL_FUNC_END();
2005} 1901}
2006 1902
@@ -2009,7 +1905,6 @@ _evgld_glUniform1fv(GLint location, GLsizei count, const GLfloat* v)
2009{ 1905{
2010 EVGL_FUNC_BEGIN(); 1906 EVGL_FUNC_BEGIN();
2011 glUniform1fv(location, count, v); 1907 glUniform1fv(location, count, v);
2012 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2013 EVGL_FUNC_END(); 1908 EVGL_FUNC_END();
2014} 1909}
2015 1910
@@ -2018,7 +1913,6 @@ _evgld_glUniform1i(GLint location, GLint x)
2018{ 1913{
2019 EVGL_FUNC_BEGIN(); 1914 EVGL_FUNC_BEGIN();
2020 glUniform1i(location, x); 1915 glUniform1i(location, x);
2021 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2022 EVGL_FUNC_END(); 1916 EVGL_FUNC_END();
2023} 1917}
2024 1918
@@ -2027,7 +1921,6 @@ _evgld_glUniform1iv(GLint location, GLsizei count, const GLint* v)
2027{ 1921{
2028 EVGL_FUNC_BEGIN(); 1922 EVGL_FUNC_BEGIN();
2029 glUniform1iv(location, count, v); 1923 glUniform1iv(location, count, v);
2030 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2031 EVGL_FUNC_END(); 1924 EVGL_FUNC_END();
2032} 1925}
2033 1926
@@ -2036,7 +1929,6 @@ _evgld_glUniform2f(GLint location, GLfloat x, GLfloat y)
2036{ 1929{
2037 EVGL_FUNC_BEGIN(); 1930 EVGL_FUNC_BEGIN();
2038 glUniform2f(location, x, y); 1931 glUniform2f(location, x, y);
2039 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2040 EVGL_FUNC_END(); 1932 EVGL_FUNC_END();
2041} 1933}
2042 1934
@@ -2045,7 +1937,6 @@ _evgld_glUniform2fv(GLint location, GLsizei count, const GLfloat* v)
2045{ 1937{
2046 EVGL_FUNC_BEGIN(); 1938 EVGL_FUNC_BEGIN();
2047 glUniform2fv(location, count, v); 1939 glUniform2fv(location, count, v);
2048 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2049 EVGL_FUNC_END(); 1940 EVGL_FUNC_END();
2050} 1941}
2051 1942
@@ -2054,7 +1945,6 @@ _evgld_glUniform2i(GLint location, GLint x, GLint y)
2054{ 1945{
2055 EVGL_FUNC_BEGIN(); 1946 EVGL_FUNC_BEGIN();
2056 glUniform2i(location, x, y); 1947 glUniform2i(location, x, y);
2057 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2058 EVGL_FUNC_END(); 1948 EVGL_FUNC_END();
2059} 1949}
2060 1950
@@ -2063,7 +1953,6 @@ _evgld_glUniform2iv(GLint location, GLsizei count, const GLint* v)
2063{ 1953{
2064 EVGL_FUNC_BEGIN(); 1954 EVGL_FUNC_BEGIN();
2065 glUniform2iv(location, count, v); 1955 glUniform2iv(location, count, v);
2066 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2067 EVGL_FUNC_END(); 1956 EVGL_FUNC_END();
2068} 1957}
2069 1958
@@ -2072,7 +1961,6 @@ _evgld_glUniform3f(GLint location, GLfloat x, GLfloat y, GLfloat z)
2072{ 1961{
2073 EVGL_FUNC_BEGIN(); 1962 EVGL_FUNC_BEGIN();
2074 glUniform3f(location, x, y, z); 1963 glUniform3f(location, x, y, z);
2075 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2076 EVGL_FUNC_END(); 1964 EVGL_FUNC_END();
2077} 1965}
2078 1966
@@ -2081,7 +1969,6 @@ _evgld_glUniform3fv(GLint location, GLsizei count, const GLfloat* v)
2081{ 1969{
2082 EVGL_FUNC_BEGIN(); 1970 EVGL_FUNC_BEGIN();
2083 glUniform3fv(location, count, v); 1971 glUniform3fv(location, count, v);
2084 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2085 EVGL_FUNC_END(); 1972 EVGL_FUNC_END();
2086} 1973}
2087 1974
@@ -2090,7 +1977,6 @@ _evgld_glUniform3i(GLint location, GLint x, GLint y, GLint z)
2090{ 1977{
2091 EVGL_FUNC_BEGIN(); 1978 EVGL_FUNC_BEGIN();
2092 glUniform3i(location, x, y, z); 1979 glUniform3i(location, x, y, z);
2093 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2094 EVGL_FUNC_END(); 1980 EVGL_FUNC_END();
2095} 1981}
2096 1982
@@ -2099,7 +1985,6 @@ _evgld_glUniform3iv(GLint location, GLsizei count, const GLint* v)
2099{ 1985{
2100 EVGL_FUNC_BEGIN(); 1986 EVGL_FUNC_BEGIN();
2101 glUniform3iv(location, count, v); 1987 glUniform3iv(location, count, v);
2102 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2103 EVGL_FUNC_END(); 1988 EVGL_FUNC_END();
2104} 1989}
2105 1990
@@ -2108,7 +1993,6 @@ _evgld_glUniform4f(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
2108{ 1993{
2109 EVGL_FUNC_BEGIN(); 1994 EVGL_FUNC_BEGIN();
2110 glUniform4f(location, x, y, z, w); 1995 glUniform4f(location, x, y, z, w);
2111 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2112 EVGL_FUNC_END(); 1996 EVGL_FUNC_END();
2113} 1997}
2114 1998
@@ -2117,7 +2001,6 @@ _evgld_glUniform4fv(GLint location, GLsizei count, const GLfloat* v)
2117{ 2001{
2118 EVGL_FUNC_BEGIN(); 2002 EVGL_FUNC_BEGIN();
2119 glUniform4fv(location, count, v); 2003 glUniform4fv(location, count, v);
2120 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2121 EVGL_FUNC_END(); 2004 EVGL_FUNC_END();
2122} 2005}
2123 2006
@@ -2126,7 +2009,6 @@ _evgld_glUniform4i(GLint location, GLint x, GLint y, GLint z, GLint w)
2126{ 2009{
2127 EVGL_FUNC_BEGIN(); 2010 EVGL_FUNC_BEGIN();
2128 glUniform4i(location, x, y, z, w); 2011 glUniform4i(location, x, y, z, w);
2129 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2130 EVGL_FUNC_END(); 2012 EVGL_FUNC_END();
2131} 2013}
2132 2014
@@ -2135,7 +2017,6 @@ _evgld_glUniform4iv(GLint location, GLsizei count, const GLint* v)
2135{ 2017{
2136 EVGL_FUNC_BEGIN(); 2018 EVGL_FUNC_BEGIN();
2137 glUniform4iv(location, count, v); 2019 glUniform4iv(location, count, v);
2138 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2139 EVGL_FUNC_END(); 2020 EVGL_FUNC_END();
2140} 2021}
2141 2022
@@ -2144,7 +2025,6 @@ _evgld_glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, co
2144{ 2025{
2145 EVGL_FUNC_BEGIN(); 2026 EVGL_FUNC_BEGIN();
2146 glUniformMatrix2fv(location, count, transpose, value); 2027 glUniformMatrix2fv(location, count, transpose, value);
2147 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2148 EVGL_FUNC_END(); 2028 EVGL_FUNC_END();
2149} 2029}
2150 2030
@@ -2153,7 +2033,6 @@ _evgld_glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, co
2153{ 2033{
2154 EVGL_FUNC_BEGIN(); 2034 EVGL_FUNC_BEGIN();
2155 glUniformMatrix3fv(location, count, transpose, value); 2035 glUniformMatrix3fv(location, count, transpose, value);
2156 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2157 EVGL_FUNC_END(); 2036 EVGL_FUNC_END();
2158} 2037}
2159 2038
@@ -2162,7 +2041,6 @@ _evgld_glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, co
2162{ 2041{
2163 EVGL_FUNC_BEGIN(); 2042 EVGL_FUNC_BEGIN();
2164 glUniformMatrix4fv(location, count, transpose, value); 2043 glUniformMatrix4fv(location, count, transpose, value);
2165 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2166 EVGL_FUNC_END(); 2044 EVGL_FUNC_END();
2167} 2045}
2168 2046
@@ -2171,7 +2049,6 @@ _evgld_glUseProgram(GLuint program)
2171{ 2049{
2172 EVGL_FUNC_BEGIN(); 2050 EVGL_FUNC_BEGIN();
2173 glUseProgram(program); 2051 glUseProgram(program);
2174 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2175 EVGL_FUNC_END(); 2052 EVGL_FUNC_END();
2176} 2053}
2177 2054
@@ -2180,7 +2057,6 @@ _evgld_glValidateProgram(GLuint program)
2180{ 2057{
2181 EVGL_FUNC_BEGIN(); 2058 EVGL_FUNC_BEGIN();
2182 glValidateProgram(program); 2059 glValidateProgram(program);
2183 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2184 EVGL_FUNC_END(); 2060 EVGL_FUNC_END();
2185} 2061}
2186 2062
@@ -2189,7 +2065,6 @@ _evgld_glVertexAttrib1f(GLuint indx, GLfloat x)
2189{ 2065{
2190 EVGL_FUNC_BEGIN(); 2066 EVGL_FUNC_BEGIN();
2191 glVertexAttrib1f(indx, x); 2067 glVertexAttrib1f(indx, x);
2192 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2193 EVGL_FUNC_END(); 2068 EVGL_FUNC_END();
2194} 2069}
2195 2070
@@ -2198,7 +2073,6 @@ _evgld_glVertexAttrib1fv(GLuint indx, const GLfloat* values)
2198{ 2073{
2199 EVGL_FUNC_BEGIN(); 2074 EVGL_FUNC_BEGIN();
2200 glVertexAttrib1fv(indx, values); 2075 glVertexAttrib1fv(indx, values);
2201 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2202 EVGL_FUNC_END(); 2076 EVGL_FUNC_END();
2203} 2077}
2204 2078
@@ -2207,7 +2081,6 @@ _evgld_glVertexAttrib2f(GLuint indx, GLfloat x, GLfloat y)
2207{ 2081{
2208 EVGL_FUNC_BEGIN(); 2082 EVGL_FUNC_BEGIN();
2209 glVertexAttrib2f(indx, x, y); 2083 glVertexAttrib2f(indx, x, y);
2210 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2211 EVGL_FUNC_END(); 2084 EVGL_FUNC_END();
2212} 2085}
2213 2086
@@ -2216,7 +2089,6 @@ _evgld_glVertexAttrib2fv(GLuint indx, const GLfloat* values)
2216{ 2089{
2217 EVGL_FUNC_BEGIN(); 2090 EVGL_FUNC_BEGIN();
2218 glVertexAttrib2fv(indx, values); 2091 glVertexAttrib2fv(indx, values);
2219 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2220 EVGL_FUNC_END(); 2092 EVGL_FUNC_END();
2221} 2093}
2222 2094
@@ -2225,7 +2097,6 @@ _evgld_glVertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z)
2225{ 2097{
2226 EVGL_FUNC_BEGIN(); 2098 EVGL_FUNC_BEGIN();
2227 glVertexAttrib3f(indx, x, y, z); 2099 glVertexAttrib3f(indx, x, y, z);
2228 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2229 EVGL_FUNC_END(); 2100 EVGL_FUNC_END();
2230} 2101}
2231 2102
@@ -2234,7 +2105,6 @@ _evgld_glVertexAttrib3fv(GLuint indx, const GLfloat* values)
2234{ 2105{
2235 EVGL_FUNC_BEGIN(); 2106 EVGL_FUNC_BEGIN();
2236 glVertexAttrib3fv(indx, values); 2107 glVertexAttrib3fv(indx, values);
2237 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2238 EVGL_FUNC_END(); 2108 EVGL_FUNC_END();
2239} 2109}
2240 2110
@@ -2243,7 +2113,6 @@ _evgld_glVertexAttrib4f(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
2243{ 2113{
2244 EVGL_FUNC_BEGIN(); 2114 EVGL_FUNC_BEGIN();
2245 glVertexAttrib4f(indx, x, y, z, w); 2115 glVertexAttrib4f(indx, x, y, z, w);
2246 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2247 EVGL_FUNC_END(); 2116 EVGL_FUNC_END();
2248} 2117}
2249 2118
@@ -2252,7 +2121,6 @@ _evgld_glVertexAttrib4fv(GLuint indx, const GLfloat* values)
2252{ 2121{
2253 EVGL_FUNC_BEGIN(); 2122 EVGL_FUNC_BEGIN();
2254 glVertexAttrib4fv(indx, values); 2123 glVertexAttrib4fv(indx, values);
2255 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2256 EVGL_FUNC_END(); 2124 EVGL_FUNC_END();
2257} 2125}
2258 2126
@@ -2261,7 +2129,6 @@ _evgld_glVertexAttribPointer(GLuint indx, GLint size, GLenum type, GLboolean nor
2261{ 2129{
2262 EVGL_FUNC_BEGIN(); 2130 EVGL_FUNC_BEGIN();
2263 glVertexAttribPointer(indx, size, type, normalized, stride, ptr); 2131 glVertexAttribPointer(indx, size, type, normalized, stride, ptr);
2264 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2265 EVGL_FUNC_END(); 2132 EVGL_FUNC_END();
2266} 2133}
2267 2134
@@ -2491,7 +2358,6 @@ _evgld_glShaderSource(GLuint shader, GLsizei count, const char* const* string, c
2491 2358
2492#ifdef GL_GLES 2359#ifdef GL_GLES
2493 glShaderSource(shader, count, string, length); 2360 glShaderSource(shader, count, string, length);
2494 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2495 goto finish; 2361 goto finish;
2496#else 2362#else
2497 //GET_EXT_PTR(void, glShaderSource, (int, int, char **, void *)); 2363 //GET_EXT_PTR(void, glShaderSource, (int, int, char **, void *));
@@ -2521,7 +2387,6 @@ _evgld_glShaderSource(GLuint shader, GLsizei count, const char* const* string, c
2521 ERR("Error allocating memory for shader string manipulation."); 2387 ERR("Error allocating memory for shader string manipulation.");
2522 2388
2523 glShaderSource(shader, count, tab_prog_new, tab_length_new); 2389 glShaderSource(shader, count, tab_prog_new, tab_length_new);
2524 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2525 2390
2526 for (i = 0; i < count; i++) 2391 for (i = 0; i < count; i++)
2527 free(tab_prog_new[i]); 2392 free(tab_prog_new[i]);
@@ -2548,7 +2413,6 @@ _evgld_glClear(GLbitfield mask)
2548 EVGL_FUNC_BEGIN(); 2413 EVGL_FUNC_BEGIN();
2549 2414
2550 _evgl_glClear(mask); 2415 _evgl_glClear(mask);
2551 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2552 EVGL_FUNC_END(); 2416 EVGL_FUNC_END();
2553} 2417}
2554 2418
@@ -2558,7 +2422,6 @@ _evgld_glEnable(GLenum cap)
2558 EVGL_FUNC_BEGIN(); 2422 EVGL_FUNC_BEGIN();
2559 2423
2560 _evgl_glEnable(cap); 2424 _evgl_glEnable(cap);
2561 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2562 EVGL_FUNC_END(); 2425 EVGL_FUNC_END();
2563} 2426}
2564 2427
@@ -2568,7 +2431,6 @@ _evgld_glDisable(GLenum cap)
2568 EVGL_FUNC_BEGIN(); 2431 EVGL_FUNC_BEGIN();
2569 2432
2570 _evgl_glDisable(cap); 2433 _evgl_glDisable(cap);
2571 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2572 EVGL_FUNC_END(); 2434 EVGL_FUNC_END();
2573} 2435}
2574 2436
@@ -2577,7 +2439,6 @@ _evgld_glGetIntegerv(GLenum pname, GLint* params)
2577{ 2439{
2578 EVGL_FUNC_BEGIN(); 2440 EVGL_FUNC_BEGIN();
2579 _evgl_glGetIntegerv(pname, params); 2441 _evgl_glGetIntegerv(pname, params);
2580 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2581 EVGL_FUNC_END(); 2442 EVGL_FUNC_END();
2582} 2443}
2583 2444
@@ -2587,7 +2448,6 @@ _evgld_glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum form
2587 EVGL_FUNC_BEGIN(); 2448 EVGL_FUNC_BEGIN();
2588 2449
2589 _evgl_glReadPixels(x, y, width, height, format, type, pixels); 2450 _evgl_glReadPixels(x, y, width, height, format, type, pixels);
2590 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2591 EVGL_FUNC_END(); 2451 EVGL_FUNC_END();
2592} 2452}
2593 2453
@@ -2597,7 +2457,6 @@ _evgld_glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
2597 EVGL_FUNC_BEGIN(); 2457 EVGL_FUNC_BEGIN();
2598 2458
2599 _evgl_glScissor(x, y, width, height); 2459 _evgl_glScissor(x, y, width, height);
2600 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2601 EVGL_FUNC_END(); 2460 EVGL_FUNC_END();
2602} 2461}
2603 2462
@@ -2607,7 +2466,6 @@ _evgld_glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
2607 EVGL_FUNC_BEGIN(); 2466 EVGL_FUNC_BEGIN();
2608 2467
2609 _evgl_glViewport(x, y, width, height); 2468 _evgl_glViewport(x, y, width, height);
2610 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2611 EVGL_FUNC_END(); 2469 EVGL_FUNC_END();
2612} 2470}
2613//-------------------------------------------------------------// 2471//-------------------------------------------------------------//
diff --git a/src/modules/evas/engines/gl_common/evas_gl_api_gles1.c b/src/modules/evas/engines/gl_common/evas_gl_api_gles1.c
index 99f793b12b..18f9689def 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_api_gles1.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_api_gles1.c
@@ -1,3 +1,4 @@
1#define GL_ERRORS_NODEF 1
1#include "evas_gl_core_private.h" 2#include "evas_gl_core_private.h"
2 3
3#include <dlfcn.h> 4#include <dlfcn.h>
@@ -7,7 +8,7 @@
7 _func_begin_debug(__FUNCTION__); \ 8 _func_begin_debug(__FUNCTION__); \
8} 9}
9 10
10#define EVGL_FUNC_END() 11#define EVGL_FUNC_END() GLERRV(__FUNCTION__)
11 12
12static void *_gles1_handle = NULL; 13static void *_gles1_handle = NULL;
13static Evas_GL_API _gles1_api; 14static Evas_GL_API _gles1_api;
@@ -1733,7 +1734,6 @@ _evgld_gles1_glAlphaFunc(GLenum func, GLclampf ref)
1733 } 1734 }
1734 EVGL_FUNC_BEGIN(); 1735 EVGL_FUNC_BEGIN();
1735 _evgl_gles1_glAlphaFunc(func, ref); 1736 _evgl_gles1_glAlphaFunc(func, ref);
1736 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1737 EVGL_FUNC_END(); 1737 EVGL_FUNC_END();
1738} 1738}
1739 1739
@@ -1747,7 +1747,6 @@ _evgld_gles1_glClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf
1747 } 1747 }
1748 EVGL_FUNC_BEGIN(); 1748 EVGL_FUNC_BEGIN();
1749 _evgl_gles1_glClearColor(red, green, blue, alpha); 1749 _evgl_gles1_glClearColor(red, green, blue, alpha);
1750 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1751 EVGL_FUNC_END(); 1750 EVGL_FUNC_END();
1752} 1751}
1753 1752
@@ -1761,7 +1760,6 @@ _evgld_gles1_glClearDepthf(GLclampf depth)
1761 } 1760 }
1762 EVGL_FUNC_BEGIN(); 1761 EVGL_FUNC_BEGIN();
1763 _evgl_gles1_glClearDepthf(depth); 1762 _evgl_gles1_glClearDepthf(depth);
1764 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1765 EVGL_FUNC_END(); 1763 EVGL_FUNC_END();
1766} 1764}
1767 1765
@@ -1775,7 +1773,6 @@ _evgld_gles1_glClipPlanef(GLenum plane, const GLfloat *equation)
1775 } 1773 }
1776 EVGL_FUNC_BEGIN(); 1774 EVGL_FUNC_BEGIN();
1777 _evgl_gles1_glClipPlanef(plane, equation); 1775 _evgl_gles1_glClipPlanef(plane, equation);
1778 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1779 EVGL_FUNC_END(); 1776 EVGL_FUNC_END();
1780} 1777}
1781 1778
@@ -1789,7 +1786,6 @@ _evgld_gles1_glColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
1789 } 1786 }
1790 EVGL_FUNC_BEGIN(); 1787 EVGL_FUNC_BEGIN();
1791 _evgl_gles1_glColor4f(red, green, blue, alpha); 1788 _evgl_gles1_glColor4f(red, green, blue, alpha);
1792 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1793 EVGL_FUNC_END(); 1789 EVGL_FUNC_END();
1794} 1790}
1795 1791
@@ -1803,7 +1799,6 @@ _evgld_gles1_glDepthRangef(GLclampf zNear, GLclampf zFar)
1803 } 1799 }
1804 EVGL_FUNC_BEGIN(); 1800 EVGL_FUNC_BEGIN();
1805 _evgl_gles1_glDepthRangef(zNear, zFar); 1801 _evgl_gles1_glDepthRangef(zNear, zFar);
1806 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1807 EVGL_FUNC_END(); 1802 EVGL_FUNC_END();
1808} 1803}
1809 1804
@@ -1817,7 +1812,6 @@ _evgld_gles1_glFogf(GLenum pname, GLfloat param)
1817 } 1812 }
1818 EVGL_FUNC_BEGIN(); 1813 EVGL_FUNC_BEGIN();
1819 _evgl_gles1_glFogf(pname, param); 1814 _evgl_gles1_glFogf(pname, param);
1820 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1821 EVGL_FUNC_END(); 1815 EVGL_FUNC_END();
1822} 1816}
1823 1817
@@ -1831,7 +1825,6 @@ _evgld_gles1_glFogfv(GLenum pname, const GLfloat *params)
1831 } 1825 }
1832 EVGL_FUNC_BEGIN(); 1826 EVGL_FUNC_BEGIN();
1833 _evgl_gles1_glFogfv(pname, params); 1827 _evgl_gles1_glFogfv(pname, params);
1834 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1835 EVGL_FUNC_END(); 1828 EVGL_FUNC_END();
1836} 1829}
1837 1830
@@ -1845,7 +1838,6 @@ _evgld_gles1_glFrustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top
1845 } 1838 }
1846 EVGL_FUNC_BEGIN(); 1839 EVGL_FUNC_BEGIN();
1847 _evgl_gles1_glFrustumf(left, right, bottom, top, zNear, zFar); 1840 _evgl_gles1_glFrustumf(left, right, bottom, top, zNear, zFar);
1848 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1849 EVGL_FUNC_END(); 1841 EVGL_FUNC_END();
1850} 1842}
1851 1843
@@ -1859,7 +1851,6 @@ _evgld_gles1_glGetClipPlanef(GLenum pname, GLfloat eqn[4])
1859 } 1851 }
1860 EVGL_FUNC_BEGIN(); 1852 EVGL_FUNC_BEGIN();
1861 _evgl_gles1_glGetClipPlanef(pname, eqn); 1853 _evgl_gles1_glGetClipPlanef(pname, eqn);
1862 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1863 EVGL_FUNC_END(); 1854 EVGL_FUNC_END();
1864} 1855}
1865 1856
@@ -1873,7 +1864,6 @@ _evgld_gles1_glGetFloatv(GLenum pname, GLfloat *params)
1873 } 1864 }
1874 EVGL_FUNC_BEGIN(); 1865 EVGL_FUNC_BEGIN();
1875 _evgl_gles1_glGetFloatv(pname, params); 1866 _evgl_gles1_glGetFloatv(pname, params);
1876 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1877 EVGL_FUNC_END(); 1867 EVGL_FUNC_END();
1878} 1868}
1879 1869
@@ -1887,7 +1877,6 @@ _evgld_gles1_glGetLightfv(GLenum light, GLenum pname, GLfloat *params)
1887 } 1877 }
1888 EVGL_FUNC_BEGIN(); 1878 EVGL_FUNC_BEGIN();
1889 _evgl_gles1_glGetLightfv(light, pname, params); 1879 _evgl_gles1_glGetLightfv(light, pname, params);
1890 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1891 EVGL_FUNC_END(); 1880 EVGL_FUNC_END();
1892} 1881}
1893 1882
@@ -1901,7 +1890,6 @@ _evgld_gles1_glGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
1901 } 1890 }
1902 EVGL_FUNC_BEGIN(); 1891 EVGL_FUNC_BEGIN();
1903 _evgl_gles1_glGetMaterialfv(face, pname, params); 1892 _evgl_gles1_glGetMaterialfv(face, pname, params);
1904 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1905 EVGL_FUNC_END(); 1893 EVGL_FUNC_END();
1906} 1894}
1907 1895
@@ -1915,7 +1903,6 @@ _evgld_gles1_glGetTexEnvfv(GLenum env, GLenum pname, GLfloat *params)
1915 } 1903 }
1916 EVGL_FUNC_BEGIN(); 1904 EVGL_FUNC_BEGIN();
1917 _evgl_gles1_glGetTexEnvfv(env, pname, params); 1905 _evgl_gles1_glGetTexEnvfv(env, pname, params);
1918 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1919 EVGL_FUNC_END(); 1906 EVGL_FUNC_END();
1920} 1907}
1921 1908
@@ -1929,7 +1916,6 @@ _evgld_gles1_glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
1929 } 1916 }
1930 EVGL_FUNC_BEGIN(); 1917 EVGL_FUNC_BEGIN();
1931 _evgl_gles1_glGetTexParameterfv(target, pname, params); 1918 _evgl_gles1_glGetTexParameterfv(target, pname, params);
1932 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1933 EVGL_FUNC_END(); 1919 EVGL_FUNC_END();
1934} 1920}
1935 1921
@@ -1943,7 +1929,6 @@ _evgld_gles1_glLightModelf(GLenum pname, GLfloat param)
1943 } 1929 }
1944 EVGL_FUNC_BEGIN(); 1930 EVGL_FUNC_BEGIN();
1945 _evgl_gles1_glLightModelf(pname, param); 1931 _evgl_gles1_glLightModelf(pname, param);
1946 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1947 EVGL_FUNC_END(); 1932 EVGL_FUNC_END();
1948} 1933}
1949 1934
@@ -1957,7 +1942,6 @@ _evgld_gles1_glLightModelfv(GLenum pname, const GLfloat *params)
1957 } 1942 }
1958 EVGL_FUNC_BEGIN(); 1943 EVGL_FUNC_BEGIN();
1959 _evgl_gles1_glLightModelfv(pname, params); 1944 _evgl_gles1_glLightModelfv(pname, params);
1960 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1961 EVGL_FUNC_END(); 1945 EVGL_FUNC_END();
1962} 1946}
1963 1947
@@ -1971,7 +1955,6 @@ _evgld_gles1_glLightf(GLenum light, GLenum pname, GLfloat param)
1971 } 1955 }
1972 EVGL_FUNC_BEGIN(); 1956 EVGL_FUNC_BEGIN();
1973 _evgl_gles1_glLightf(light, pname, param); 1957 _evgl_gles1_glLightf(light, pname, param);
1974 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1975 EVGL_FUNC_END(); 1958 EVGL_FUNC_END();
1976} 1959}
1977 1960
@@ -1985,7 +1968,6 @@ _evgld_gles1_glLightfv(GLenum light, GLenum pname, const GLfloat *params)
1985 } 1968 }
1986 EVGL_FUNC_BEGIN(); 1969 EVGL_FUNC_BEGIN();
1987 _evgl_gles1_glLightfv(light, pname, params); 1970 _evgl_gles1_glLightfv(light, pname, params);
1988 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1989 EVGL_FUNC_END(); 1971 EVGL_FUNC_END();
1990} 1972}
1991 1973
@@ -1999,7 +1981,6 @@ _evgld_gles1_glLineWidth(GLfloat width)
1999 } 1981 }
2000 EVGL_FUNC_BEGIN(); 1982 EVGL_FUNC_BEGIN();
2001 _evgl_gles1_glLineWidth(width); 1983 _evgl_gles1_glLineWidth(width);
2002 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2003 EVGL_FUNC_END(); 1984 EVGL_FUNC_END();
2004} 1985}
2005 1986
@@ -2013,7 +1994,6 @@ _evgld_gles1_glLoadMatrixf(const GLfloat *m)
2013 } 1994 }
2014 EVGL_FUNC_BEGIN(); 1995 EVGL_FUNC_BEGIN();
2015 _evgl_gles1_glLoadMatrixf(m); 1996 _evgl_gles1_glLoadMatrixf(m);
2016 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2017 EVGL_FUNC_END(); 1997 EVGL_FUNC_END();
2018} 1998}
2019 1999
@@ -2027,7 +2007,6 @@ _evgld_gles1_glMaterialf(GLenum face, GLenum pname, GLfloat param)
2027 } 2007 }
2028 EVGL_FUNC_BEGIN(); 2008 EVGL_FUNC_BEGIN();
2029 _evgl_gles1_glMaterialf(face, pname, param); 2009 _evgl_gles1_glMaterialf(face, pname, param);
2030 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2031 EVGL_FUNC_END(); 2010 EVGL_FUNC_END();
2032} 2011}
2033 2012
@@ -2041,7 +2020,6 @@ _evgld_gles1_glMaterialfv(GLenum face, GLenum pname, const GLfloat *params)
2041 } 2020 }
2042 EVGL_FUNC_BEGIN(); 2021 EVGL_FUNC_BEGIN();
2043 _evgl_gles1_glMaterialfv(face, pname, params); 2022 _evgl_gles1_glMaterialfv(face, pname, params);
2044 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2045 EVGL_FUNC_END(); 2023 EVGL_FUNC_END();
2046} 2024}
2047 2025
@@ -2055,7 +2033,6 @@ _evgld_gles1_glMultMatrixf(const GLfloat *m)
2055 } 2033 }
2056 EVGL_FUNC_BEGIN(); 2034 EVGL_FUNC_BEGIN();
2057 _evgl_gles1_glMultMatrixf(m); 2035 _evgl_gles1_glMultMatrixf(m);
2058 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2059 EVGL_FUNC_END(); 2036 EVGL_FUNC_END();
2060} 2037}
2061 2038
@@ -2069,7 +2046,6 @@ _evgld_gles1_glMultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, G
2069 } 2046 }
2070 EVGL_FUNC_BEGIN(); 2047 EVGL_FUNC_BEGIN();
2071 _evgl_gles1_glMultiTexCoord4f(target, s, t, r, q); 2048 _evgl_gles1_glMultiTexCoord4f(target, s, t, r, q);
2072 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2073 EVGL_FUNC_END(); 2049 EVGL_FUNC_END();
2074} 2050}
2075 2051
@@ -2083,7 +2059,6 @@ _evgld_gles1_glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz)
2083 } 2059 }
2084 EVGL_FUNC_BEGIN(); 2060 EVGL_FUNC_BEGIN();
2085 _evgl_gles1_glNormal3f(nx, ny, nz); 2061 _evgl_gles1_glNormal3f(nx, ny, nz);
2086 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2087 EVGL_FUNC_END(); 2062 EVGL_FUNC_END();
2088} 2063}
2089 2064
@@ -2097,7 +2072,6 @@ _evgld_gles1_glOrthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
2097 } 2072 }
2098 EVGL_FUNC_BEGIN(); 2073 EVGL_FUNC_BEGIN();
2099 _evgl_gles1_glOrthof(left, right, bottom, top, zNear, zFar); 2074 _evgl_gles1_glOrthof(left, right, bottom, top, zNear, zFar);
2100 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2101 EVGL_FUNC_END(); 2075 EVGL_FUNC_END();
2102} 2076}
2103 2077
@@ -2111,7 +2085,6 @@ _evgld_gles1_glPointParameterf(GLenum pname, GLfloat param)
2111 } 2085 }
2112 EVGL_FUNC_BEGIN(); 2086 EVGL_FUNC_BEGIN();
2113 _evgl_gles1_glPointParameterf(pname, param); 2087 _evgl_gles1_glPointParameterf(pname, param);
2114 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2115 EVGL_FUNC_END(); 2088 EVGL_FUNC_END();
2116} 2089}
2117 2090
@@ -2125,7 +2098,6 @@ _evgld_gles1_glPointParameterfv(GLenum pname, const GLfloat *params)
2125 } 2098 }
2126 EVGL_FUNC_BEGIN(); 2099 EVGL_FUNC_BEGIN();
2127 _evgl_gles1_glPointParameterfv(pname, params); 2100 _evgl_gles1_glPointParameterfv(pname, params);
2128 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2129 EVGL_FUNC_END(); 2101 EVGL_FUNC_END();
2130} 2102}
2131 2103
@@ -2139,7 +2111,6 @@ _evgld_gles1_glPointSize(GLfloat size)
2139 } 2111 }
2140 EVGL_FUNC_BEGIN(); 2112 EVGL_FUNC_BEGIN();
2141 _evgl_gles1_glPointSize(size); 2113 _evgl_gles1_glPointSize(size);
2142 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2143 EVGL_FUNC_END(); 2114 EVGL_FUNC_END();
2144} 2115}
2145 2116
@@ -2153,7 +2124,6 @@ _evgld_gles1_glPointSizePointerOES(GLenum type, GLsizei stride, const GLvoid *po
2153 } 2124 }
2154 EVGL_FUNC_BEGIN(); 2125 EVGL_FUNC_BEGIN();
2155 _evgl_gles1_glPointSizePointerOES(type, stride, pointer); 2126 _evgl_gles1_glPointSizePointerOES(type, stride, pointer);
2156 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2157 EVGL_FUNC_END(); 2127 EVGL_FUNC_END();
2158} 2128}
2159 2129
@@ -2167,7 +2137,6 @@ _evgld_gles1_glPolygonOffset(GLfloat factor, GLfloat units)
2167 } 2137 }
2168 EVGL_FUNC_BEGIN(); 2138 EVGL_FUNC_BEGIN();
2169 _evgl_gles1_glPolygonOffset(factor, units); 2139 _evgl_gles1_glPolygonOffset(factor, units);
2170 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2171 EVGL_FUNC_END(); 2140 EVGL_FUNC_END();
2172} 2141}
2173 2142
@@ -2181,7 +2150,6 @@ _evgld_gles1_glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
2181 } 2150 }
2182 EVGL_FUNC_BEGIN(); 2151 EVGL_FUNC_BEGIN();
2183 _evgl_gles1_glRotatef(angle, x, y, z); 2152 _evgl_gles1_glRotatef(angle, x, y, z);
2184 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2185 EVGL_FUNC_END(); 2153 EVGL_FUNC_END();
2186} 2154}
2187 2155
@@ -2195,7 +2163,6 @@ _evgld_gles1_glScalef(GLfloat x, GLfloat y, GLfloat z)
2195 } 2163 }
2196 EVGL_FUNC_BEGIN(); 2164 EVGL_FUNC_BEGIN();
2197 _evgl_gles1_glScalef(x, y, z); 2165 _evgl_gles1_glScalef(x, y, z);
2198 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2199 EVGL_FUNC_END(); 2166 EVGL_FUNC_END();
2200} 2167}
2201 2168
@@ -2209,7 +2176,6 @@ _evgld_gles1_glTexEnvf(GLenum target, GLenum pname, GLfloat param)
2209 } 2176 }
2210 EVGL_FUNC_BEGIN(); 2177 EVGL_FUNC_BEGIN();
2211 _evgl_gles1_glTexEnvf(target, pname, param); 2178 _evgl_gles1_glTexEnvf(target, pname, param);
2212 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2213 EVGL_FUNC_END(); 2179 EVGL_FUNC_END();
2214} 2180}
2215 2181
@@ -2223,7 +2189,6 @@ _evgld_gles1_glTexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
2223 } 2189 }
2224 EVGL_FUNC_BEGIN(); 2190 EVGL_FUNC_BEGIN();
2225 _evgl_gles1_glTexEnvfv(target, pname, params); 2191 _evgl_gles1_glTexEnvfv(target, pname, params);
2226 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2227 EVGL_FUNC_END(); 2192 EVGL_FUNC_END();
2228} 2193}
2229 2194
@@ -2237,7 +2202,6 @@ _evgld_gles1_glTexParameterf(GLenum target, GLenum pname, GLfloat param)
2237 } 2202 }
2238 EVGL_FUNC_BEGIN(); 2203 EVGL_FUNC_BEGIN();
2239 _evgl_gles1_glTexParameterf(target, pname, param); 2204 _evgl_gles1_glTexParameterf(target, pname, param);
2240 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2241 EVGL_FUNC_END(); 2205 EVGL_FUNC_END();
2242} 2206}
2243 2207
@@ -2251,7 +2215,6 @@ _evgld_gles1_glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params
2251 } 2215 }
2252 EVGL_FUNC_BEGIN(); 2216 EVGL_FUNC_BEGIN();
2253 _evgl_gles1_glTexParameterfv(target, pname, params); 2217 _evgl_gles1_glTexParameterfv(target, pname, params);
2254 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2255 EVGL_FUNC_END(); 2218 EVGL_FUNC_END();
2256} 2219}
2257 2220
@@ -2265,7 +2228,6 @@ _evgld_gles1_glTranslatef(GLfloat x, GLfloat y, GLfloat z)
2265 } 2228 }
2266 EVGL_FUNC_BEGIN(); 2229 EVGL_FUNC_BEGIN();
2267 _evgl_gles1_glTranslatef(x, y, z); 2230 _evgl_gles1_glTranslatef(x, y, z);
2268 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2269 EVGL_FUNC_END(); 2231 EVGL_FUNC_END();
2270} 2232}
2271 2233
@@ -2279,7 +2241,6 @@ _evgld_gles1_glActiveTexture(GLenum texture)
2279 } 2241 }
2280 EVGL_FUNC_BEGIN(); 2242 EVGL_FUNC_BEGIN();
2281 _evgl_gles1_glActiveTexture(texture); 2243 _evgl_gles1_glActiveTexture(texture);
2282 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2283 EVGL_FUNC_END(); 2244 EVGL_FUNC_END();
2284} 2245}
2285 2246
@@ -2293,7 +2254,6 @@ _evgld_gles1_glAlphaFuncx(GLenum func, GLclampx ref)
2293 } 2254 }
2294 EVGL_FUNC_BEGIN(); 2255 EVGL_FUNC_BEGIN();
2295 _evgl_gles1_glAlphaFuncx(func, ref); 2256 _evgl_gles1_glAlphaFuncx(func, ref);
2296 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2297 EVGL_FUNC_END(); 2257 EVGL_FUNC_END();
2298} 2258}
2299 2259
@@ -2307,7 +2267,6 @@ _evgld_gles1_glBindBuffer(GLenum target, GLuint buffer)
2307 } 2267 }
2308 EVGL_FUNC_BEGIN(); 2268 EVGL_FUNC_BEGIN();
2309 _evgl_gles1_glBindBuffer(target, buffer); 2269 _evgl_gles1_glBindBuffer(target, buffer);
2310 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2311 EVGL_FUNC_END(); 2270 EVGL_FUNC_END();
2312} 2271}
2313 2272
@@ -2321,7 +2280,6 @@ _evgld_gles1_glBindTexture(GLenum target, GLuint texture)
2321 } 2280 }
2322 EVGL_FUNC_BEGIN(); 2281 EVGL_FUNC_BEGIN();
2323 _evgl_gles1_glBindTexture(target, texture); 2282 _evgl_gles1_glBindTexture(target, texture);
2324 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2325 EVGL_FUNC_END(); 2283 EVGL_FUNC_END();
2326} 2284}
2327 2285
@@ -2335,7 +2293,6 @@ _evgld_gles1_glBlendFunc(GLenum sfactor, GLenum dfactor)
2335 } 2293 }
2336 EVGL_FUNC_BEGIN(); 2294 EVGL_FUNC_BEGIN();
2337 _evgl_gles1_glBlendFunc(sfactor, dfactor); 2295 _evgl_gles1_glBlendFunc(sfactor, dfactor);
2338 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2339 EVGL_FUNC_END(); 2296 EVGL_FUNC_END();
2340} 2297}
2341 2298
@@ -2349,7 +2306,6 @@ _evgld_gles1_glBufferData(GLenum target, GLsizeiptr size, const GLvoid *data, GL
2349 } 2306 }
2350 EVGL_FUNC_BEGIN(); 2307 EVGL_FUNC_BEGIN();
2351 _evgl_gles1_glBufferData(target, size, data, usage); 2308 _evgl_gles1_glBufferData(target, size, data, usage);
2352 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2353 EVGL_FUNC_END(); 2309 EVGL_FUNC_END();
2354} 2310}
2355 2311
@@ -2363,7 +2319,6 @@ _evgld_gles1_glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, co
2363 } 2319 }
2364 EVGL_FUNC_BEGIN(); 2320 EVGL_FUNC_BEGIN();
2365 _evgl_gles1_glBufferSubData(target, offset, size, data); 2321 _evgl_gles1_glBufferSubData(target, offset, size, data);
2366 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2367 EVGL_FUNC_END(); 2322 EVGL_FUNC_END();
2368} 2323}
2369 2324
@@ -2377,7 +2332,6 @@ _evgld_gles1_glClear(GLbitfield mask)
2377 } 2332 }
2378 EVGL_FUNC_BEGIN(); 2333 EVGL_FUNC_BEGIN();
2379 _evgl_gles1_glClear(mask); 2334 _evgl_gles1_glClear(mask);
2380 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2381 EVGL_FUNC_END(); 2335 EVGL_FUNC_END();
2382} 2336}
2383 2337
@@ -2391,7 +2345,6 @@ _evgld_gles1_glClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx
2391 } 2345 }
2392 EVGL_FUNC_BEGIN(); 2346 EVGL_FUNC_BEGIN();
2393 _evgl_gles1_glClearColorx(red, green, blue, alpha); 2347 _evgl_gles1_glClearColorx(red, green, blue, alpha);
2394 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2395 EVGL_FUNC_END(); 2348 EVGL_FUNC_END();
2396} 2349}
2397 2350
@@ -2405,7 +2358,6 @@ _evgld_gles1_glClearDepthx(GLclampx depth)
2405 } 2358 }
2406 EVGL_FUNC_BEGIN(); 2359 EVGL_FUNC_BEGIN();
2407 _evgl_gles1_glClearDepthx(depth); 2360 _evgl_gles1_glClearDepthx(depth);
2408 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2409 EVGL_FUNC_END(); 2361 EVGL_FUNC_END();
2410} 2362}
2411 2363
@@ -2419,7 +2371,6 @@ _evgld_gles1_glClearStencil(GLint s)
2419 } 2371 }
2420 EVGL_FUNC_BEGIN(); 2372 EVGL_FUNC_BEGIN();
2421 _evgl_gles1_glClearStencil(s); 2373 _evgl_gles1_glClearStencil(s);
2422 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2423 EVGL_FUNC_END(); 2374 EVGL_FUNC_END();
2424} 2375}
2425 2376
@@ -2433,7 +2384,6 @@ _evgld_gles1_glClientActiveTexture(GLenum texture)
2433 } 2384 }
2434 EVGL_FUNC_BEGIN(); 2385 EVGL_FUNC_BEGIN();
2435 _evgl_gles1_glClientActiveTexture(texture); 2386 _evgl_gles1_glClientActiveTexture(texture);
2436 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2437 EVGL_FUNC_END(); 2387 EVGL_FUNC_END();
2438} 2388}
2439 2389
@@ -2447,7 +2397,6 @@ _evgld_gles1_glClipPlanex(GLenum plane, const GLfixed *equation)
2447 } 2397 }
2448 EVGL_FUNC_BEGIN(); 2398 EVGL_FUNC_BEGIN();
2449 _evgl_gles1_glClipPlanex(plane, equation); 2399 _evgl_gles1_glClipPlanex(plane, equation);
2450 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2451 EVGL_FUNC_END(); 2400 EVGL_FUNC_END();
2452} 2401}
2453 2402
@@ -2461,7 +2410,6 @@ _evgld_gles1_glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
2461 } 2410 }
2462 EVGL_FUNC_BEGIN(); 2411 EVGL_FUNC_BEGIN();
2463 _evgl_gles1_glColor4ub(red, green, blue, alpha); 2412 _evgl_gles1_glColor4ub(red, green, blue, alpha);
2464 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2465 EVGL_FUNC_END(); 2413 EVGL_FUNC_END();
2466} 2414}
2467 2415
@@ -2475,7 +2423,6 @@ _evgld_gles1_glColor4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
2475 } 2423 }
2476 EVGL_FUNC_BEGIN(); 2424 EVGL_FUNC_BEGIN();
2477 _evgl_gles1_glColor4x(red, green, blue, alpha); 2425 _evgl_gles1_glColor4x(red, green, blue, alpha);
2478 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2479 EVGL_FUNC_END(); 2426 EVGL_FUNC_END();
2480} 2427}
2481 2428
@@ -2489,7 +2436,6 @@ _evgld_gles1_glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboole
2489 } 2436 }
2490 EVGL_FUNC_BEGIN(); 2437 EVGL_FUNC_BEGIN();
2491 _evgl_gles1_glColorMask(red, green, blue, alpha); 2438 _evgl_gles1_glColorMask(red, green, blue, alpha);
2492 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2493 EVGL_FUNC_END(); 2439 EVGL_FUNC_END();
2494} 2440}
2495 2441
@@ -2503,7 +2449,6 @@ _evgld_gles1_glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoi
2503 } 2449 }
2504 EVGL_FUNC_BEGIN(); 2450 EVGL_FUNC_BEGIN();
2505 _evgl_gles1_glColorPointer(size, type, stride, pointer); 2451 _evgl_gles1_glColorPointer(size, type, stride, pointer);
2506 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2507 EVGL_FUNC_END(); 2452 EVGL_FUNC_END();
2508} 2453}
2509 2454
@@ -2517,7 +2462,6 @@ _evgld_gles1_glCompressedTexImage2D(GLenum target, GLint level, GLenum internalf
2517 } 2462 }
2518 EVGL_FUNC_BEGIN(); 2463 EVGL_FUNC_BEGIN();
2519 _evgl_gles1_glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data); 2464 _evgl_gles1_glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
2520 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2521 EVGL_FUNC_END(); 2465 EVGL_FUNC_END();
2522} 2466}
2523 2467
@@ -2531,7 +2475,6 @@ _evgld_gles1_glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset
2531 } 2475 }
2532 EVGL_FUNC_BEGIN(); 2476 EVGL_FUNC_BEGIN();
2533 _evgl_gles1_glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data); 2477 _evgl_gles1_glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
2534 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2535 EVGL_FUNC_END(); 2478 EVGL_FUNC_END();
2536} 2479}
2537 2480
@@ -2545,7 +2488,6 @@ _evgld_gles1_glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat,
2545 } 2488 }
2546 EVGL_FUNC_BEGIN(); 2489 EVGL_FUNC_BEGIN();
2547 _evgl_gles1_glCopyTexImage2D(target, level, internalformat, x, y, width, height, border); 2490 _evgl_gles1_glCopyTexImage2D(target, level, internalformat, x, y, width, height, border);
2548 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2549 EVGL_FUNC_END(); 2491 EVGL_FUNC_END();
2550} 2492}
2551 2493
@@ -2559,7 +2501,6 @@ _evgld_gles1_glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLin
2559 } 2501 }
2560 EVGL_FUNC_BEGIN(); 2502 EVGL_FUNC_BEGIN();
2561 _evgl_gles1_glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height); 2503 _evgl_gles1_glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
2562 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2563 EVGL_FUNC_END(); 2504 EVGL_FUNC_END();
2564} 2505}
2565 2506
@@ -2573,7 +2514,6 @@ _evgld_gles1_glCullFace(GLenum mode)
2573 } 2514 }
2574 EVGL_FUNC_BEGIN(); 2515 EVGL_FUNC_BEGIN();
2575 _evgl_gles1_glCullFace(mode); 2516 _evgl_gles1_glCullFace(mode);
2576 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2577 EVGL_FUNC_END(); 2517 EVGL_FUNC_END();
2578} 2518}
2579 2519
@@ -2587,7 +2527,6 @@ _evgld_gles1_glDeleteBuffers(GLsizei n, const GLuint *buffers)
2587 } 2527 }
2588 EVGL_FUNC_BEGIN(); 2528 EVGL_FUNC_BEGIN();
2589 _evgl_gles1_glDeleteBuffers(n, buffers); 2529 _evgl_gles1_glDeleteBuffers(n, buffers);
2590 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2591 EVGL_FUNC_END(); 2530 EVGL_FUNC_END();
2592} 2531}
2593 2532
@@ -2601,7 +2540,6 @@ _evgld_gles1_glDeleteTextures(GLsizei n, const GLuint *textures)
2601 } 2540 }
2602 EVGL_FUNC_BEGIN(); 2541 EVGL_FUNC_BEGIN();
2603 _evgl_gles1_glDeleteTextures(n, textures); 2542 _evgl_gles1_glDeleteTextures(n, textures);
2604 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2605 EVGL_FUNC_END(); 2543 EVGL_FUNC_END();
2606} 2544}
2607 2545
@@ -2615,7 +2553,6 @@ _evgld_gles1_glDepthFunc(GLenum func)
2615 } 2553 }
2616 EVGL_FUNC_BEGIN(); 2554 EVGL_FUNC_BEGIN();
2617 _evgl_gles1_glDepthFunc(func); 2555 _evgl_gles1_glDepthFunc(func);
2618 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2619 EVGL_FUNC_END(); 2556 EVGL_FUNC_END();
2620} 2557}
2621 2558
@@ -2629,7 +2566,6 @@ _evgld_gles1_glDepthMask(GLboolean flag)
2629 } 2566 }
2630 EVGL_FUNC_BEGIN(); 2567 EVGL_FUNC_BEGIN();
2631 _evgl_gles1_glDepthMask(flag); 2568 _evgl_gles1_glDepthMask(flag);
2632 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2633 EVGL_FUNC_END(); 2569 EVGL_FUNC_END();
2634} 2570}
2635 2571
@@ -2643,7 +2579,6 @@ _evgld_gles1_glDepthRangex(GLclampx zNear, GLclampx zFar)
2643 } 2579 }
2644 EVGL_FUNC_BEGIN(); 2580 EVGL_FUNC_BEGIN();
2645 _evgl_gles1_glDepthRangex(zNear, zFar); 2581 _evgl_gles1_glDepthRangex(zNear, zFar);
2646 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2647 EVGL_FUNC_END(); 2582 EVGL_FUNC_END();
2648} 2583}
2649 2584
@@ -2657,7 +2592,6 @@ _evgld_gles1_glDisable(GLenum cap)
2657 } 2592 }
2658 EVGL_FUNC_BEGIN(); 2593 EVGL_FUNC_BEGIN();
2659 _evgl_gles1_glDisable(cap); 2594 _evgl_gles1_glDisable(cap);
2660 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2661 EVGL_FUNC_END(); 2595 EVGL_FUNC_END();
2662} 2596}
2663 2597
@@ -2671,7 +2605,6 @@ _evgld_gles1_glDisableClientState(GLenum array)
2671 } 2605 }
2672 EVGL_FUNC_BEGIN(); 2606 EVGL_FUNC_BEGIN();
2673 _evgl_gles1_glDisableClientState(array); 2607 _evgl_gles1_glDisableClientState(array);
2674 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2675 EVGL_FUNC_END(); 2608 EVGL_FUNC_END();
2676} 2609}
2677 2610
@@ -2685,7 +2618,6 @@ _evgld_gles1_glDrawArrays(GLenum mode, GLint first, GLsizei count)
2685 } 2618 }
2686 EVGL_FUNC_BEGIN(); 2619 EVGL_FUNC_BEGIN();
2687 _evgl_gles1_glDrawArrays(mode, first, count); 2620 _evgl_gles1_glDrawArrays(mode, first, count);
2688 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2689 EVGL_FUNC_END(); 2621 EVGL_FUNC_END();
2690} 2622}
2691 2623
@@ -2699,7 +2631,6 @@ _evgld_gles1_glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoi
2699 } 2631 }
2700 EVGL_FUNC_BEGIN(); 2632 EVGL_FUNC_BEGIN();
2701 _evgl_gles1_glDrawElements(mode, count, type, indices); 2633 _evgl_gles1_glDrawElements(mode, count, type, indices);
2702 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2703 EVGL_FUNC_END(); 2634 EVGL_FUNC_END();
2704} 2635}
2705 2636
@@ -2713,7 +2644,6 @@ _evgld_gles1_glEnable(GLenum cap)
2713 } 2644 }
2714 EVGL_FUNC_BEGIN(); 2645 EVGL_FUNC_BEGIN();
2715 _evgl_gles1_glEnable(cap); 2646 _evgl_gles1_glEnable(cap);
2716 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2717 EVGL_FUNC_END(); 2647 EVGL_FUNC_END();
2718} 2648}
2719 2649
@@ -2727,7 +2657,6 @@ _evgld_gles1_glEnableClientState(GLenum array)
2727 } 2657 }
2728 EVGL_FUNC_BEGIN(); 2658 EVGL_FUNC_BEGIN();
2729 _evgl_gles1_glEnableClientState(array); 2659 _evgl_gles1_glEnableClientState(array);
2730 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2731 EVGL_FUNC_END(); 2660 EVGL_FUNC_END();
2732} 2661}
2733 2662
@@ -2741,7 +2670,6 @@ _evgld_gles1_glFinish(void)
2741 } 2670 }
2742 EVGL_FUNC_BEGIN(); 2671 EVGL_FUNC_BEGIN();
2743 _evgl_gles1_glFinish(); 2672 _evgl_gles1_glFinish();
2744 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2745 EVGL_FUNC_END(); 2673 EVGL_FUNC_END();
2746} 2674}
2747 2675
@@ -2755,7 +2683,6 @@ _evgld_gles1_glFlush(void)
2755 } 2683 }
2756 EVGL_FUNC_BEGIN(); 2684 EVGL_FUNC_BEGIN();
2757 _evgl_gles1_glFlush(); 2685 _evgl_gles1_glFlush();
2758 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2759 EVGL_FUNC_END(); 2686 EVGL_FUNC_END();
2760} 2687}
2761 2688
@@ -2769,7 +2696,6 @@ _evgld_gles1_glFogx(GLenum pname, GLfixed param)
2769 } 2696 }
2770 EVGL_FUNC_BEGIN(); 2697 EVGL_FUNC_BEGIN();
2771 _evgl_gles1_glFogx(pname, param); 2698 _evgl_gles1_glFogx(pname, param);
2772 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2773 EVGL_FUNC_END(); 2699 EVGL_FUNC_END();
2774} 2700}
2775 2701
@@ -2783,7 +2709,6 @@ _evgld_gles1_glFogxv(GLenum pname, const GLfixed *params)
2783 } 2709 }
2784 EVGL_FUNC_BEGIN(); 2710 EVGL_FUNC_BEGIN();
2785 _evgl_gles1_glFogxv(pname, params); 2711 _evgl_gles1_glFogxv(pname, params);
2786 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2787 EVGL_FUNC_END(); 2712 EVGL_FUNC_END();
2788} 2713}
2789 2714
@@ -2797,7 +2722,6 @@ _evgld_gles1_glFrontFace(GLenum mode)
2797 } 2722 }
2798 EVGL_FUNC_BEGIN(); 2723 EVGL_FUNC_BEGIN();
2799 _evgl_gles1_glFrontFace(mode); 2724 _evgl_gles1_glFrontFace(mode);
2800 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2801 EVGL_FUNC_END(); 2725 EVGL_FUNC_END();
2802} 2726}
2803 2727
@@ -2811,7 +2735,6 @@ _evgld_gles1_glFrustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top
2811 } 2735 }
2812 EVGL_FUNC_BEGIN(); 2736 EVGL_FUNC_BEGIN();
2813 _evgl_gles1_glFrustumx(left, right, bottom, top, zNear, zFar); 2737 _evgl_gles1_glFrustumx(left, right, bottom, top, zNear, zFar);
2814 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2815 EVGL_FUNC_END(); 2738 EVGL_FUNC_END();
2816} 2739}
2817 2740
@@ -2825,7 +2748,6 @@ _evgld_gles1_glGetBooleanv(GLenum pname, GLboolean *params)
2825 } 2748 }
2826 EVGL_FUNC_BEGIN(); 2749 EVGL_FUNC_BEGIN();
2827 _evgl_gles1_glGetBooleanv(pname, params); 2750 _evgl_gles1_glGetBooleanv(pname, params);
2828 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2829 EVGL_FUNC_END(); 2751 EVGL_FUNC_END();
2830} 2752}
2831 2753
@@ -2839,7 +2761,6 @@ _evgld_gles1_glGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
2839 } 2761 }
2840 EVGL_FUNC_BEGIN(); 2762 EVGL_FUNC_BEGIN();
2841 _evgl_gles1_glGetBufferParameteriv(target, pname, params); 2763 _evgl_gles1_glGetBufferParameteriv(target, pname, params);
2842 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2843 EVGL_FUNC_END(); 2764 EVGL_FUNC_END();
2844} 2765}
2845 2766
@@ -2853,7 +2774,6 @@ _evgld_gles1_glGetClipPlanex(GLenum pname, GLfixed eqn[4])
2853 } 2774 }
2854 EVGL_FUNC_BEGIN(); 2775 EVGL_FUNC_BEGIN();
2855 _evgl_gles1_glGetClipPlanex(pname, eqn); 2776 _evgl_gles1_glGetClipPlanex(pname, eqn);
2856 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2857 EVGL_FUNC_END(); 2777 EVGL_FUNC_END();
2858} 2778}
2859 2779
@@ -2867,7 +2787,6 @@ _evgld_gles1_glGenBuffers(GLsizei n, GLuint *buffers)
2867 } 2787 }
2868 EVGL_FUNC_BEGIN(); 2788 EVGL_FUNC_BEGIN();
2869 _evgl_gles1_glGenBuffers(n, buffers); 2789 _evgl_gles1_glGenBuffers(n, buffers);
2870 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2871 EVGL_FUNC_END(); 2790 EVGL_FUNC_END();
2872} 2791}
2873 2792
@@ -2881,7 +2800,6 @@ _evgld_gles1_glGenTextures(GLsizei n, GLuint *textures)
2881 } 2800 }
2882 EVGL_FUNC_BEGIN(); 2801 EVGL_FUNC_BEGIN();
2883 _evgl_gles1_glGenTextures(n, textures); 2802 _evgl_gles1_glGenTextures(n, textures);
2884 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2885 EVGL_FUNC_END(); 2803 EVGL_FUNC_END();
2886} 2804}
2887 2805
@@ -2896,7 +2814,6 @@ _evgld_gles1_glGetError(void)
2896 } 2814 }
2897 EVGL_FUNC_BEGIN(); 2815 EVGL_FUNC_BEGIN();
2898 ret = _evgl_gles1_glGetError(); 2816 ret = _evgl_gles1_glGetError();
2899 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2900 EVGL_FUNC_END(); 2817 EVGL_FUNC_END();
2901 return ret; 2818 return ret;
2902} 2819}
@@ -2911,7 +2828,6 @@ _evgld_gles1_glGetFixedv(GLenum pname, GLfixed *params)
2911 } 2828 }
2912 EVGL_FUNC_BEGIN(); 2829 EVGL_FUNC_BEGIN();
2913 _evgl_gles1_glGetFixedv(pname, params); 2830 _evgl_gles1_glGetFixedv(pname, params);
2914 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2915 EVGL_FUNC_END(); 2831 EVGL_FUNC_END();
2916} 2832}
2917 2833
@@ -2925,7 +2841,6 @@ _evgld_gles1_glGetIntegerv(GLenum pname, GLint *params)
2925 } 2841 }
2926 EVGL_FUNC_BEGIN(); 2842 EVGL_FUNC_BEGIN();
2927 _evgl_gles1_glGetIntegerv(pname, params); 2843 _evgl_gles1_glGetIntegerv(pname, params);
2928 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2929 EVGL_FUNC_END(); 2844 EVGL_FUNC_END();
2930} 2845}
2931 2846
@@ -2939,7 +2854,6 @@ _evgld_gles1_glGetLightxv(GLenum light, GLenum pname, GLfixed *params)
2939 } 2854 }
2940 EVGL_FUNC_BEGIN(); 2855 EVGL_FUNC_BEGIN();
2941 _evgl_gles1_glGetLightxv(light, pname, params); 2856 _evgl_gles1_glGetLightxv(light, pname, params);
2942 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2943 EVGL_FUNC_END(); 2857 EVGL_FUNC_END();
2944} 2858}
2945 2859
@@ -2953,7 +2867,6 @@ _evgld_gles1_glGetMaterialxv(GLenum face, GLenum pname, GLfixed *params)
2953 } 2867 }
2954 EVGL_FUNC_BEGIN(); 2868 EVGL_FUNC_BEGIN();
2955 _evgl_gles1_glGetMaterialxv(face, pname, params); 2869 _evgl_gles1_glGetMaterialxv(face, pname, params);
2956 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2957 EVGL_FUNC_END(); 2870 EVGL_FUNC_END();
2958} 2871}
2959 2872
@@ -2967,7 +2880,6 @@ _evgld_gles1_glGetPointerv(GLenum pname, GLvoid **params)
2967 } 2880 }
2968 EVGL_FUNC_BEGIN(); 2881 EVGL_FUNC_BEGIN();
2969 _evgl_gles1_glGetPointerv(pname, params); 2882 _evgl_gles1_glGetPointerv(pname, params);
2970 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2971 EVGL_FUNC_END(); 2883 EVGL_FUNC_END();
2972} 2884}
2973 2885
@@ -2982,7 +2894,6 @@ _evgld_gles1_glGetString(GLenum name)
2982 } 2894 }
2983 EVGL_FUNC_BEGIN(); 2895 EVGL_FUNC_BEGIN();
2984 ret = _evgl_gles1_glGetString(name); 2896 ret = _evgl_gles1_glGetString(name);
2985 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
2986 EVGL_FUNC_END(); 2897 EVGL_FUNC_END();
2987 return ret; 2898 return ret;
2988} 2899}
@@ -2997,7 +2908,6 @@ _evgld_gles1_glGetTexEnviv(GLenum env, GLenum pname, GLint *params)
2997 } 2908 }
2998 EVGL_FUNC_BEGIN(); 2909 EVGL_FUNC_BEGIN();
2999 _evgl_gles1_glGetTexEnviv(env, pname, params); 2910 _evgl_gles1_glGetTexEnviv(env, pname, params);
3000 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3001 EVGL_FUNC_END(); 2911 EVGL_FUNC_END();
3002} 2912}
3003 2913
@@ -3011,7 +2921,6 @@ _evgld_gles1_glGetTexEnvxv(GLenum env, GLenum pname, GLfixed *params)
3011 } 2921 }
3012 EVGL_FUNC_BEGIN(); 2922 EVGL_FUNC_BEGIN();
3013 _evgl_gles1_glGetTexEnvxv(env, pname, params); 2923 _evgl_gles1_glGetTexEnvxv(env, pname, params);
3014 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3015 EVGL_FUNC_END(); 2924 EVGL_FUNC_END();
3016} 2925}
3017 2926
@@ -3025,7 +2934,6 @@ _evgld_gles1_glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
3025 } 2934 }
3026 EVGL_FUNC_BEGIN(); 2935 EVGL_FUNC_BEGIN();
3027 _evgl_gles1_glGetTexParameteriv(target, pname, params); 2936 _evgl_gles1_glGetTexParameteriv(target, pname, params);
3028 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3029 EVGL_FUNC_END(); 2937 EVGL_FUNC_END();
3030} 2938}
3031 2939
@@ -3039,7 +2947,6 @@ _evgld_gles1_glGetTexParameterxv(GLenum target, GLenum pname, GLfixed *params)
3039 } 2947 }
3040 EVGL_FUNC_BEGIN(); 2948 EVGL_FUNC_BEGIN();
3041 _evgl_gles1_glGetTexParameterxv(target, pname, params); 2949 _evgl_gles1_glGetTexParameterxv(target, pname, params);
3042 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3043 EVGL_FUNC_END(); 2950 EVGL_FUNC_END();
3044} 2951}
3045 2952
@@ -3053,7 +2960,6 @@ _evgld_gles1_glHint(GLenum target, GLenum mode)
3053 } 2960 }
3054 EVGL_FUNC_BEGIN(); 2961 EVGL_FUNC_BEGIN();
3055 _evgl_gles1_glHint(target, mode); 2962 _evgl_gles1_glHint(target, mode);
3056 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3057 EVGL_FUNC_END(); 2963 EVGL_FUNC_END();
3058} 2964}
3059 2965
@@ -3068,7 +2974,6 @@ _evgld_gles1_glIsBuffer(GLuint buffer)
3068 } 2974 }
3069 EVGL_FUNC_BEGIN(); 2975 EVGL_FUNC_BEGIN();
3070 ret = _evgl_gles1_glIsBuffer(buffer); 2976 ret = _evgl_gles1_glIsBuffer(buffer);
3071 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3072 EVGL_FUNC_END(); 2977 EVGL_FUNC_END();
3073 return ret; 2978 return ret;
3074} 2979}
@@ -3084,7 +2989,6 @@ _evgld_gles1_glIsEnabled(GLenum cap)
3084 } 2989 }
3085 EVGL_FUNC_BEGIN(); 2990 EVGL_FUNC_BEGIN();
3086 ret = _evgl_gles1_glIsEnabled(cap); 2991 ret = _evgl_gles1_glIsEnabled(cap);
3087 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3088 EVGL_FUNC_END(); 2992 EVGL_FUNC_END();
3089 return ret; 2993 return ret;
3090} 2994}
@@ -3100,7 +3004,6 @@ _evgld_gles1_glIsTexture(GLuint texture)
3100 } 3004 }
3101 EVGL_FUNC_BEGIN(); 3005 EVGL_FUNC_BEGIN();
3102 ret = _evgl_gles1_glIsTexture(texture); 3006 ret = _evgl_gles1_glIsTexture(texture);
3103 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3104 EVGL_FUNC_END(); 3007 EVGL_FUNC_END();
3105 return ret; 3008 return ret;
3106} 3009}
@@ -3115,7 +3018,6 @@ _evgld_gles1_glLightModelx(GLenum pname, GLfixed param)
3115 } 3018 }
3116 EVGL_FUNC_BEGIN(); 3019 EVGL_FUNC_BEGIN();
3117 _evgl_gles1_glLightModelx(pname, param); 3020 _evgl_gles1_glLightModelx(pname, param);
3118 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3119 EVGL_FUNC_END(); 3021 EVGL_FUNC_END();
3120} 3022}
3121 3023
@@ -3129,7 +3031,6 @@ _evgld_gles1_glLightModelxv(GLenum pname, const GLfixed *params)
3129 } 3031 }
3130 EVGL_FUNC_BEGIN(); 3032 EVGL_FUNC_BEGIN();
3131 _evgl_gles1_glLightModelxv(pname, params); 3033 _evgl_gles1_glLightModelxv(pname, params);
3132 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3133 EVGL_FUNC_END(); 3034 EVGL_FUNC_END();
3134} 3035}
3135 3036
@@ -3143,7 +3044,6 @@ _evgld_gles1_glLightx(GLenum light, GLenum pname, GLfixed param)
3143 } 3044 }
3144 EVGL_FUNC_BEGIN(); 3045 EVGL_FUNC_BEGIN();
3145 _evgl_gles1_glLightx(light, pname, param); 3046 _evgl_gles1_glLightx(light, pname, param);
3146 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3147 EVGL_FUNC_END(); 3047 EVGL_FUNC_END();
3148} 3048}
3149 3049
@@ -3157,7 +3057,6 @@ _evgld_gles1_glLightxv(GLenum light, GLenum pname, const GLfixed *params)
3157 } 3057 }
3158 EVGL_FUNC_BEGIN(); 3058 EVGL_FUNC_BEGIN();
3159 _evgl_gles1_glLightxv(light, pname, params); 3059 _evgl_gles1_glLightxv(light, pname, params);
3160 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3161 EVGL_FUNC_END(); 3060 EVGL_FUNC_END();
3162} 3061}
3163 3062
@@ -3171,7 +3070,6 @@ _evgld_gles1_glLineWidthx(GLfixed width)
3171 } 3070 }
3172 EVGL_FUNC_BEGIN(); 3071 EVGL_FUNC_BEGIN();
3173 _evgl_gles1_glLineWidthx(width); 3072 _evgl_gles1_glLineWidthx(width);
3174 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3175 EVGL_FUNC_END(); 3073 EVGL_FUNC_END();
3176} 3074}
3177 3075
@@ -3185,7 +3083,6 @@ _evgld_gles1_glLoadIdentity(void)
3185 } 3083 }
3186 EVGL_FUNC_BEGIN(); 3084 EVGL_FUNC_BEGIN();
3187 _evgl_gles1_glLoadIdentity(); 3085 _evgl_gles1_glLoadIdentity();
3188 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3189 EVGL_FUNC_END(); 3086 EVGL_FUNC_END();
3190} 3087}
3191 3088
@@ -3199,7 +3096,6 @@ _evgld_gles1_glLoadMatrixx(const GLfixed *m)
3199 } 3096 }
3200 EVGL_FUNC_BEGIN(); 3097 EVGL_FUNC_BEGIN();
3201 _evgl_gles1_glLoadMatrixx(m); 3098 _evgl_gles1_glLoadMatrixx(m);
3202 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3203 EVGL_FUNC_END(); 3099 EVGL_FUNC_END();
3204} 3100}
3205 3101
@@ -3213,7 +3109,6 @@ _evgld_gles1_glLogicOp(GLenum opcode)
3213 } 3109 }
3214 EVGL_FUNC_BEGIN(); 3110 EVGL_FUNC_BEGIN();
3215 _evgl_gles1_glLogicOp(opcode); 3111 _evgl_gles1_glLogicOp(opcode);
3216 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3217 EVGL_FUNC_END(); 3112 EVGL_FUNC_END();
3218} 3113}
3219 3114
@@ -3227,7 +3122,6 @@ _evgld_gles1_glMaterialx(GLenum face, GLenum pname, GLfixed param)
3227 } 3122 }
3228 EVGL_FUNC_BEGIN(); 3123 EVGL_FUNC_BEGIN();
3229 _evgl_gles1_glMaterialx(face, pname, param); 3124 _evgl_gles1_glMaterialx(face, pname, param);
3230 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3231 EVGL_FUNC_END(); 3125 EVGL_FUNC_END();
3232} 3126}
3233 3127
@@ -3241,7 +3135,6 @@ _evgld_gles1_glMaterialxv(GLenum face, GLenum pname, const GLfixed *params)
3241 } 3135 }
3242 EVGL_FUNC_BEGIN(); 3136 EVGL_FUNC_BEGIN();
3243 _evgl_gles1_glMaterialxv(face, pname, params); 3137 _evgl_gles1_glMaterialxv(face, pname, params);
3244 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3245 EVGL_FUNC_END(); 3138 EVGL_FUNC_END();
3246} 3139}
3247 3140
@@ -3255,7 +3148,6 @@ _evgld_gles1_glMatrixMode(GLenum mode)
3255 } 3148 }
3256 EVGL_FUNC_BEGIN(); 3149 EVGL_FUNC_BEGIN();
3257 _evgl_gles1_glMatrixMode(mode); 3150 _evgl_gles1_glMatrixMode(mode);
3258 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3259 EVGL_FUNC_END(); 3151 EVGL_FUNC_END();
3260} 3152}
3261 3153
@@ -3269,7 +3161,6 @@ _evgld_gles1_glMultMatrixx(const GLfixed *m)
3269 } 3161 }
3270 EVGL_FUNC_BEGIN(); 3162 EVGL_FUNC_BEGIN();
3271 _evgl_gles1_glMultMatrixx(m); 3163 _evgl_gles1_glMultMatrixx(m);
3272 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3273 EVGL_FUNC_END(); 3164 EVGL_FUNC_END();
3274} 3165}
3275 3166
@@ -3283,7 +3174,6 @@ _evgld_gles1_glMultiTexCoord4x(GLenum target, GLfixed s, GLfixed t, GLfixed r, G
3283 } 3174 }
3284 EVGL_FUNC_BEGIN(); 3175 EVGL_FUNC_BEGIN();
3285 _evgl_gles1_glMultiTexCoord4x(target, s, t, r, q); 3176 _evgl_gles1_glMultiTexCoord4x(target, s, t, r, q);
3286 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3287 EVGL_FUNC_END(); 3177 EVGL_FUNC_END();
3288} 3178}
3289 3179
@@ -3297,7 +3187,6 @@ _evgld_gles1_glNormal3x(GLfixed nx, GLfixed ny, GLfixed nz)
3297 } 3187 }
3298 EVGL_FUNC_BEGIN(); 3188 EVGL_FUNC_BEGIN();
3299 _evgl_gles1_glNormal3x(nx, ny, nz); 3189 _evgl_gles1_glNormal3x(nx, ny, nz);
3300 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3301 EVGL_FUNC_END(); 3190 EVGL_FUNC_END();
3302} 3191}
3303 3192
@@ -3311,7 +3200,6 @@ _evgld_gles1_glNormalPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
3311 } 3200 }
3312 EVGL_FUNC_BEGIN(); 3201 EVGL_FUNC_BEGIN();
3313 _evgl_gles1_glNormalPointer(type, stride, pointer); 3202 _evgl_gles1_glNormalPointer(type, stride, pointer);
3314 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3315 EVGL_FUNC_END(); 3203 EVGL_FUNC_END();
3316} 3204}
3317 3205
@@ -3325,7 +3213,6 @@ _evgld_gles1_glOrthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
3325 } 3213 }
3326 EVGL_FUNC_BEGIN(); 3214 EVGL_FUNC_BEGIN();
3327 _evgl_gles1_glOrthox(left, right, bottom, top, zNear, zFar); 3215 _evgl_gles1_glOrthox(left, right, bottom, top, zNear, zFar);
3328 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3329 EVGL_FUNC_END(); 3216 EVGL_FUNC_END();
3330} 3217}
3331 3218
@@ -3339,7 +3226,6 @@ _evgld_gles1_glPixelStorei(GLenum pname, GLint param)
3339 } 3226 }
3340 EVGL_FUNC_BEGIN(); 3227 EVGL_FUNC_BEGIN();
3341 _evgl_gles1_glPixelStorei(pname, param); 3228 _evgl_gles1_glPixelStorei(pname, param);
3342 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3343 EVGL_FUNC_END(); 3229 EVGL_FUNC_END();
3344} 3230}
3345 3231
@@ -3353,7 +3239,6 @@ _evgld_gles1_glPointParameterx(GLenum pname, GLfixed param)
3353 } 3239 }
3354 EVGL_FUNC_BEGIN(); 3240 EVGL_FUNC_BEGIN();
3355 _evgl_gles1_glPointParameterx(pname, param); 3241 _evgl_gles1_glPointParameterx(pname, param);
3356 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3357 EVGL_FUNC_END(); 3242 EVGL_FUNC_END();
3358} 3243}
3359 3244
@@ -3367,7 +3252,6 @@ _evgld_gles1_glPointParameterxv(GLenum pname, const GLfixed *params)
3367 } 3252 }
3368 EVGL_FUNC_BEGIN(); 3253 EVGL_FUNC_BEGIN();
3369 _evgl_gles1_glPointParameterxv(pname, params); 3254 _evgl_gles1_glPointParameterxv(pname, params);
3370 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3371 EVGL_FUNC_END(); 3255 EVGL_FUNC_END();
3372} 3256}
3373 3257
@@ -3381,7 +3265,6 @@ _evgld_gles1_glPointSizex(GLfixed size)
3381 } 3265 }
3382 EVGL_FUNC_BEGIN(); 3266 EVGL_FUNC_BEGIN();
3383 _evgl_gles1_glPointSizex(size); 3267 _evgl_gles1_glPointSizex(size);
3384 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3385 EVGL_FUNC_END(); 3268 EVGL_FUNC_END();
3386} 3269}
3387 3270
@@ -3395,7 +3278,6 @@ _evgld_gles1_glPolygonOffsetx(GLfixed factor, GLfixed units)
3395 } 3278 }
3396 EVGL_FUNC_BEGIN(); 3279 EVGL_FUNC_BEGIN();
3397 _evgl_gles1_glPolygonOffsetx(factor, units); 3280 _evgl_gles1_glPolygonOffsetx(factor, units);
3398 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3399 EVGL_FUNC_END(); 3281 EVGL_FUNC_END();
3400} 3282}
3401 3283
@@ -3409,7 +3291,6 @@ _evgld_gles1_glPopMatrix(void)
3409 } 3291 }
3410 EVGL_FUNC_BEGIN(); 3292 EVGL_FUNC_BEGIN();
3411 _evgl_gles1_glPopMatrix(); 3293 _evgl_gles1_glPopMatrix();
3412 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3413 EVGL_FUNC_END(); 3294 EVGL_FUNC_END();
3414} 3295}
3415 3296
@@ -3423,7 +3304,6 @@ _evgld_gles1_glPushMatrix(void)
3423 } 3304 }
3424 EVGL_FUNC_BEGIN(); 3305 EVGL_FUNC_BEGIN();
3425 _evgl_gles1_glPushMatrix(); 3306 _evgl_gles1_glPushMatrix();
3426 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3427 EVGL_FUNC_END(); 3307 EVGL_FUNC_END();
3428} 3308}
3429 3309
@@ -3437,7 +3317,6 @@ _evgld_gles1_glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenu
3437 } 3317 }
3438 EVGL_FUNC_BEGIN(); 3318 EVGL_FUNC_BEGIN();
3439 _evgl_gles1_glReadPixels(x, y, width, height, format, type, pixels); 3319 _evgl_gles1_glReadPixels(x, y, width, height, format, type, pixels);
3440 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3441 EVGL_FUNC_END(); 3320 EVGL_FUNC_END();
3442} 3321}
3443 3322
@@ -3451,7 +3330,6 @@ _evgld_gles1_glRotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z)
3451 } 3330 }
3452 EVGL_FUNC_BEGIN(); 3331 EVGL_FUNC_BEGIN();
3453 _evgl_gles1_glRotatex(angle, x, y, z); 3332 _evgl_gles1_glRotatex(angle, x, y, z);
3454 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3455 EVGL_FUNC_END(); 3333 EVGL_FUNC_END();
3456} 3334}
3457 3335
@@ -3465,7 +3343,6 @@ _evgld_gles1_glSampleCoverage(GLclampf value, GLboolean invert)
3465 } 3343 }
3466 EVGL_FUNC_BEGIN(); 3344 EVGL_FUNC_BEGIN();
3467 _evgl_gles1_glSampleCoverage(value, invert); 3345 _evgl_gles1_glSampleCoverage(value, invert);
3468 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3469 EVGL_FUNC_END(); 3346 EVGL_FUNC_END();
3470} 3347}
3471 3348
@@ -3479,7 +3356,6 @@ _evgld_gles1_glSampleCoveragex(GLclampx value, GLboolean invert)
3479 } 3356 }
3480 EVGL_FUNC_BEGIN(); 3357 EVGL_FUNC_BEGIN();
3481 _evgl_gles1_glSampleCoveragex(value, invert); 3358 _evgl_gles1_glSampleCoveragex(value, invert);
3482 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3483 EVGL_FUNC_END(); 3359 EVGL_FUNC_END();
3484} 3360}
3485 3361
@@ -3493,7 +3369,6 @@ _evgld_gles1_glScalex(GLfixed x, GLfixed y, GLfixed z)
3493 } 3369 }
3494 EVGL_FUNC_BEGIN(); 3370 EVGL_FUNC_BEGIN();
3495 _evgl_gles1_glScalex(x, y, z); 3371 _evgl_gles1_glScalex(x, y, z);
3496 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3497 EVGL_FUNC_END(); 3372 EVGL_FUNC_END();
3498} 3373}
3499 3374
@@ -3507,7 +3382,6 @@ _evgld_gles1_glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
3507 } 3382 }
3508 EVGL_FUNC_BEGIN(); 3383 EVGL_FUNC_BEGIN();
3509 _evgl_gles1_glScissor(x, y, width, height); 3384 _evgl_gles1_glScissor(x, y, width, height);
3510 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3511 EVGL_FUNC_END(); 3385 EVGL_FUNC_END();
3512} 3386}
3513 3387
@@ -3521,7 +3395,6 @@ _evgld_gles1_glShadeModel(GLenum mode)
3521 } 3395 }
3522 EVGL_FUNC_BEGIN(); 3396 EVGL_FUNC_BEGIN();
3523 _evgl_gles1_glShadeModel(mode); 3397 _evgl_gles1_glShadeModel(mode);
3524 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3525 EVGL_FUNC_END(); 3398 EVGL_FUNC_END();
3526} 3399}
3527 3400
@@ -3535,7 +3408,6 @@ _evgld_gles1_glStencilFunc(GLenum func, GLint ref, GLuint mask)
3535 } 3408 }
3536 EVGL_FUNC_BEGIN(); 3409 EVGL_FUNC_BEGIN();
3537 _evgl_gles1_glStencilFunc(func, ref, mask); 3410 _evgl_gles1_glStencilFunc(func, ref, mask);
3538 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3539 EVGL_FUNC_END(); 3411 EVGL_FUNC_END();
3540} 3412}
3541 3413
@@ -3549,7 +3421,6 @@ _evgld_gles1_glStencilMask(GLuint mask)
3549 } 3421 }
3550 EVGL_FUNC_BEGIN(); 3422 EVGL_FUNC_BEGIN();
3551 _evgl_gles1_glStencilMask(mask); 3423 _evgl_gles1_glStencilMask(mask);
3552 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3553 EVGL_FUNC_END(); 3424 EVGL_FUNC_END();
3554} 3425}
3555 3426
@@ -3563,7 +3434,6 @@ _evgld_gles1_glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
3563 } 3434 }
3564 EVGL_FUNC_BEGIN(); 3435 EVGL_FUNC_BEGIN();
3565 _evgl_gles1_glStencilOp(fail, zfail, zpass); 3436 _evgl_gles1_glStencilOp(fail, zfail, zpass);
3566 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3567 EVGL_FUNC_END(); 3437 EVGL_FUNC_END();
3568} 3438}
3569 3439
@@ -3577,7 +3447,6 @@ _evgld_gles1_glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GL
3577 } 3447 }
3578 EVGL_FUNC_BEGIN(); 3448 EVGL_FUNC_BEGIN();
3579 _evgl_gles1_glTexCoordPointer(size, type, stride, pointer); 3449 _evgl_gles1_glTexCoordPointer(size, type, stride, pointer);
3580 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3581 EVGL_FUNC_END(); 3450 EVGL_FUNC_END();
3582} 3451}
3583 3452
@@ -3591,7 +3460,6 @@ _evgld_gles1_glTexEnvi(GLenum target, GLenum pname, GLint param)
3591 } 3460 }
3592 EVGL_FUNC_BEGIN(); 3461 EVGL_FUNC_BEGIN();
3593 _evgl_gles1_glTexEnvi(target, pname, param); 3462 _evgl_gles1_glTexEnvi(target, pname, param);
3594 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3595 EVGL_FUNC_END(); 3463 EVGL_FUNC_END();
3596} 3464}
3597 3465
@@ -3605,7 +3473,6 @@ _evgld_gles1_glTexEnvx(GLenum target, GLenum pname, GLfixed param)
3605 } 3473 }
3606 EVGL_FUNC_BEGIN(); 3474 EVGL_FUNC_BEGIN();
3607 _evgl_gles1_glTexEnvx(target, pname, param); 3475 _evgl_gles1_glTexEnvx(target, pname, param);
3608 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3609 EVGL_FUNC_END(); 3476 EVGL_FUNC_END();
3610} 3477}
3611 3478
@@ -3619,7 +3486,6 @@ _evgld_gles1_glTexEnviv(GLenum target, GLenum pname, const GLint *params)
3619 } 3486 }
3620 EVGL_FUNC_BEGIN(); 3487 EVGL_FUNC_BEGIN();
3621 _evgl_gles1_glTexEnviv(target, pname, params); 3488 _evgl_gles1_glTexEnviv(target, pname, params);
3622 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3623 EVGL_FUNC_END(); 3489 EVGL_FUNC_END();
3624} 3490}
3625 3491
@@ -3633,7 +3499,6 @@ _evgld_gles1_glTexEnvxv(GLenum target, GLenum pname, const GLfixed *params)
3633 } 3499 }
3634 EVGL_FUNC_BEGIN(); 3500 EVGL_FUNC_BEGIN();
3635 _evgl_gles1_glTexEnvxv(target, pname, params); 3501 _evgl_gles1_glTexEnvxv(target, pname, params);
3636 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3637 EVGL_FUNC_END(); 3502 EVGL_FUNC_END();
3638} 3503}
3639 3504
@@ -3647,7 +3512,6 @@ _evgld_gles1_glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsi
3647 } 3512 }
3648 EVGL_FUNC_BEGIN(); 3513 EVGL_FUNC_BEGIN();
3649 _evgl_gles1_glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels); 3514 _evgl_gles1_glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
3650 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3651 EVGL_FUNC_END(); 3515 EVGL_FUNC_END();
3652} 3516}
3653 3517
@@ -3661,7 +3525,6 @@ _evgld_gles1_glTexParameteri(GLenum target, GLenum pname, GLint param)
3661 } 3525 }
3662 EVGL_FUNC_BEGIN(); 3526 EVGL_FUNC_BEGIN();
3663 _evgl_gles1_glTexParameteri(target, pname, param); 3527 _evgl_gles1_glTexParameteri(target, pname, param);
3664 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3665 EVGL_FUNC_END(); 3528 EVGL_FUNC_END();
3666} 3529}
3667 3530
@@ -3675,7 +3538,6 @@ _evgld_gles1_glTexParameterx(GLenum target, GLenum pname, GLfixed param)
3675 } 3538 }
3676 EVGL_FUNC_BEGIN(); 3539 EVGL_FUNC_BEGIN();
3677 _evgl_gles1_glTexParameterx(target, pname, param); 3540 _evgl_gles1_glTexParameterx(target, pname, param);
3678 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3679 EVGL_FUNC_END(); 3541 EVGL_FUNC_END();
3680} 3542}
3681 3543
@@ -3689,7 +3551,6 @@ _evgld_gles1_glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
3689 } 3551 }
3690 EVGL_FUNC_BEGIN(); 3552 EVGL_FUNC_BEGIN();
3691 _evgl_gles1_glTexParameteriv(target, pname, params); 3553 _evgl_gles1_glTexParameteriv(target, pname, params);
3692 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3693 EVGL_FUNC_END(); 3554 EVGL_FUNC_END();
3694} 3555}
3695 3556
@@ -3703,7 +3564,6 @@ _evgld_gles1_glTexParameterxv(GLenum target, GLenum pname, const GLfixed *params
3703 } 3564 }
3704 EVGL_FUNC_BEGIN(); 3565 EVGL_FUNC_BEGIN();
3705 _evgl_gles1_glTexParameterxv(target, pname, params); 3566 _evgl_gles1_glTexParameterxv(target, pname, params);
3706 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3707 EVGL_FUNC_END(); 3567 EVGL_FUNC_END();
3708} 3568}
3709 3569
@@ -3717,7 +3577,6 @@ _evgld_gles1_glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yo
3717 } 3577 }
3718 EVGL_FUNC_BEGIN(); 3578 EVGL_FUNC_BEGIN();
3719 _evgl_gles1_glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels); 3579 _evgl_gles1_glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
3720 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3721 EVGL_FUNC_END(); 3580 EVGL_FUNC_END();
3722} 3581}
3723 3582
@@ -3731,7 +3590,6 @@ _evgld_gles1_glTranslatex(GLfixed x, GLfixed y, GLfixed z)
3731 } 3590 }
3732 EVGL_FUNC_BEGIN(); 3591 EVGL_FUNC_BEGIN();
3733 _evgl_gles1_glTranslatex(x, y, z); 3592 _evgl_gles1_glTranslatex(x, y, z);
3734 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3735 EVGL_FUNC_END(); 3593 EVGL_FUNC_END();
3736} 3594}
3737 3595
@@ -3745,7 +3603,6 @@ _evgld_gles1_glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvo
3745 } 3603 }
3746 EVGL_FUNC_BEGIN(); 3604 EVGL_FUNC_BEGIN();
3747 _evgl_gles1_glVertexPointer(size, type, stride, pointer); 3605 _evgl_gles1_glVertexPointer(size, type, stride, pointer);
3748 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3749 EVGL_FUNC_END(); 3606 EVGL_FUNC_END();
3750} 3607}
3751 3608
@@ -3759,7 +3616,6 @@ _evgld_gles1_glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
3759 } 3616 }
3760 EVGL_FUNC_BEGIN(); 3617 EVGL_FUNC_BEGIN();
3761 _evgl_gles1_glViewport(x, y, width, height); 3618 _evgl_gles1_glViewport(x, y, width, height);
3762 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3763 EVGL_FUNC_END(); 3619 EVGL_FUNC_END();
3764} 3620}
3765 3621
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 f431b20fc9..c8c21973bf 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_common.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_common.h
@@ -682,7 +682,7 @@ typedef void (*Evas_GL_Common_Context_Resize_Call)(Evas_Engine_GL_Context *gc, i
682typedef int (*Evas_GL_Common_Buffer_Dump_Call)(Evas_Engine_GL_Context *gc,const char* dname, const char* fname, int frame, const char* suffix); 682typedef int (*Evas_GL_Common_Buffer_Dump_Call)(Evas_Engine_GL_Context *gc,const char* dname, const char* fname, int frame, const char* suffix);
683typedef void (*Evas_Gl_Symbols)(void *(*GetProcAddress)(const char *sym)); 683typedef void (*Evas_Gl_Symbols)(void *(*GetProcAddress)(const char *sym));
684 684
685void glerr(int err, const char *file, const char *func, int line, const char *op); 685EAPI void __evas_gl_err(int err, const char *file, const char *func, int line, const char *op);
686 686
687void evas_gl_common_tiling_start(Evas_Engine_GL_Context *gc, 687void evas_gl_common_tiling_start(Evas_Engine_GL_Context *gc,
688 int rot, int gw, int gh, 688 int rot, int gw, int gh,
@@ -842,15 +842,76 @@ void pt_unref(Evas_GL_Texture_Pool *pt);
842//#define GL_ERRORS 1 842//#define GL_ERRORS 1
843 843
844#ifdef GL_ERRORS 844#ifdef GL_ERRORS
845# define GLERR(fn, fl, ln, op) \ 845#include <dlfcn.h>
846 { \ 846static inline void
847__evas_gl_errdyn(int err, const char *file, const char *func, int line, const char *op)
848{
849 static void (*sym)(int,const char*,const char*,int,const char*) = NULL;
850 if (!sym) sym = dlsym(RTLD_DEFAULT, "__evas_gl_err");
851 sym(err, file, func, line, op);
852}
853# define GLERRV(op) \
854 { \
847 int __gl_err = glGetError(); \ 855 int __gl_err = glGetError(); \
848 if (__gl_err != GL_NO_ERROR) glerr(__gl_err, fl, fn, ln, op); \ 856 if (__gl_err != GL_NO_ERROR) \
857 __evas_gl_errdyn(__gl_err, __FILE__, __FUNCTION__, __LINE__, op); \
849 } 858 }
859/* Redefine common gl funcs */
860# ifndef GL_ERRORS_NODEF
861# define glActiveTexture(...) do { glActiveTexture(__VA_ARGS__); GLERRV("glActiveTexture"); } while(0)
862# define glBindAttribLocation(...) do { glBindAttribLocation(__VA_ARGS__); GLERRV("glBindAttribLocation"); } while(0)
863# define glBindBuffer(...) do { glBindBuffer(__VA_ARGS__); GLERRV("glBindBuffer"); } while(0)
864# define glBindTexture(...) do { glBindTexture(__VA_ARGS__); GLERRV("glBindTexture"); } while(0)
865# define glBlendFunc(...) do { glBlendFunc(__VA_ARGS__); GLERRV("glBlendFunc"); } while(0)
866# define glBufferData(...) do { glBufferData(__VA_ARGS__); GLERRV("glBufferData"); } while(0)
867# define glCompressedTexSubImage2D(...) do { glCompressedTexSubImage2D(__VA_ARGS__); GLERRV("glCompressedTexSubImage2D"); } while(0)
868# define glDeleteBuffers(...) do { glDeleteBuffers(__VA_ARGS__); GLERRV("glDeleteBuffers"); } while(0)
869# define glDepthMask(...) do { glDepthMask(__VA_ARGS__); GLERRV("glDepthMask"); } while(0)
870# define glDisable(...) do { glDisable(__VA_ARGS__); GLERRV("glDisable"); } while(0)
871# define glDisableVertexAttribArray(...) do { glDisableVertexAttribArray(__VA_ARGS__); GLERRV("glDisableVertexAttribArray"); } while(0)
872# define glDrawArrays(...) do { glDrawArrays(__VA_ARGS__); GLERRV("glDrawArrays"); } while(0)
873# define glEnable(...) do { glEnable(__VA_ARGS__); GLERRV("glEnable"); } while(0)
874# define glEnableVertexAttribArray(...) do { glEnableVertexAttribArray(__VA_ARGS__); GLERRV("glEnableVertexAttribArray"); } while(0)
875# define glGenBuffers(...) do { glGenBuffers(__VA_ARGS__); GLERRV("glGenBuffers"); } while(0)
876# define glGetFloatv(...) do { glGetFloatv(__VA_ARGS__); GLERRV("glGetFloatv"); } while(0)
877# define glGetIntegerv(...) do { glGetIntegerv(__VA_ARGS__); GLERRV("glGetIntegerv"); } while(0)
878# define glGetUniformLocation(...) ({ GLint _x = glGetUniformLocation(__VA_ARGS__); GLERRV("glGetUniformLocation"); _x; })
879# define glHint(...) do { glHint(__VA_ARGS__); GLERRV("glHint"); } while(0)
880# define glReadPixels(...) do { glReadPixels(__VA_ARGS__); GLERRV("glReadPixels"); } while(0)
881# define glScissor(...) do { glScissor(__VA_ARGS__); GLERRV("glScissor"); } while(0)
882# define glGenFramebuffers(...) do { glGenFramebuffers(__VA_ARGS__); GLERRV("glGenFramebuffers"); } while(0)
883# define glBindFramebuffer(...) do { glBindFramebuffer(__VA_ARGS__); GLERRV("glBindFramebuffer"); } while(0)
884# define glEndTiling(...) do { glEndTiling(__VA_ARGS__); GLERRV("glEndTiling"); } while(0)
885# define glGetProgramBinary(...) do { glGetProgramBinary(__VA_ARGS__); GLERRV("glGetProgramBinary"); } while(0)
886# define glMapBuffer(...) ({ void *_x = glMapBuffer(__VA_ARGS__); GLERRV("glMapBuffer"); _x; })
887# define glStartTiling(...) do { glStartTiling(__VA_ARGS__); GLERRV("glStartTiling"); } while(0)
888# define glUnmapBuffer(...) do { glUnmapBuffer(__VA_ARGS__); GLERRV("glUnmapBuffer"); } while(0)
889# define glTexParameterf(...) do { glTexParameterf(__VA_ARGS__); GLERRV("glTexParameterf"); } while(0)
890# define glTexParameteri(...) do { glTexParameteri(__VA_ARGS__); GLERRV("glTexParameteri"); } while(0)
891# define glTexSubImage2D(...) do { glTexSubImage2D(__VA_ARGS__); GLERRV("glTexSubImage2D"); } while(0)
892# define glUniform1f(...) do { glUniform1f(__VA_ARGS__); GLERRV("glUniform1f"); } while(0)
893# define glUniform1i(...) do { glUniform1i(__VA_ARGS__); GLERRV("glUniform1i"); } while(0)
894# define glUniform2fv(...) do { glUniform2fv(__VA_ARGS__); GLERRV("glUniform2fv"); } while(0)
895# define glUniform4fv(...) do { glUniform4fv(__VA_ARGS__); GLERRV("glUniform4fv"); } while(0)
896# define glUniformMatrix4fv(...) do { glUniformMatrix4fv(__VA_ARGS__); GLERRV("glUniformMatrix4fv"); } while(0)
897# define glUseProgram(...) do { glUseProgram(__VA_ARGS__); GLERRV("glUseProgram"); } while(0)
898# define glVertexAttribPointer(...) do { glVertexAttribPointer(__VA_ARGS__); GLERRV("glVertexAttribPointer"); } while(0)
899# define glViewport(...) do { glViewport(__VA_ARGS__); GLERRV("glViewport"); } while(0)
900# define glPixelStorei(...) do { glPixelStorei(__VA_ARGS__); GLERRV("glPixelStorei"); } while(0)
901# define glCompressedTexImage2D(...) do { glCompressedTexImage2D(__VA_ARGS__); GLERRV("glCompressedTexImage2D"); } while(0)
902# define glCreateShader(...) ({ GLuint _x = glCreateShader(__VA_ARGS__); GLERRV("glCreateShader"); _x; })
903# define glCreateProgram(...) ({ GLuint _x = glCreateProgram(__VA_ARGS__); GLERRV("glCreateProgram"); _x; })
904# define glAttachShader(...) do { glAttachShader(__VA_ARGS__); GLERRV("glAttachShader"); } while(0)
905# define glLinkProgram(...) do { glLinkProgram(__VA_ARGS__); GLERRV("glLinkProgram"); } while(0)
906# define glGetProgramiv(...) do { glGetProgramiv(__VA_ARGS__); GLERRV("glGetProgramiv"); } while(0)
907# define glGetProgramInfoLog(...) do { glGetProgramInfoLog(__VA_ARGS__); GLERRV("glGetProgramInfoLog"); } while(0)
908# define glGetShaderiv(...) do { glGetShaderiv(__VA_ARGS__); GLERRV("glGetShaderiv"); } while(0)
909# define glShaderSource(...) do { glShaderSource(__VA_ARGS__); GLERRV("glShaderSource"); } while(0)
910# define glCompileShader(...) do { glCompileShader(__VA_ARGS__); GLERRV("glCompileShader"); } while(0)
911# endif
850#else 912#else
851# define GLERR(fn, fl, ln, op) 913# define GLERRV(op)
852#endif 914#endif
853#define GLERRLOG() GLERR(__FUNCTION__, __FILE__, __LINE__, "")
854 915
855Eina_Bool evas_gl_common_module_open(void); 916Eina_Bool evas_gl_common_module_open(void);
856void evas_gl_common_module_close(void); 917void evas_gl_common_module_close(void);
@@ -861,7 +922,6 @@ _tex_sub_2d(Evas_Engine_GL_Context *gc, int x, int y, int w, int h, int fmt, int
861 if ((w > gc->shared->info.max_texture_size) || 922 if ((w > gc->shared->info.max_texture_size) ||
862 (h > gc->shared->info.max_texture_size)) return; 923 (h > gc->shared->info.max_texture_size)) return;
863 glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, w, h, fmt, type, pix); 924 glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, w, h, fmt, type, pix);
864 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
865} 925}
866 926
867static inline void 927static inline void
@@ -870,7 +930,6 @@ _comp_tex_sub_2d(Evas_Engine_GL_Context *gc, int x, int y, int w, int h, int fmt
870 if ((w > gc->shared->info.max_texture_size) || 930 if ((w > gc->shared->info.max_texture_size) ||
871 (h > gc->shared->info.max_texture_size)) return; 931 (h > gc->shared->info.max_texture_size)) return;
872 glCompressedTexSubImage2D(GL_TEXTURE_2D, 0, x, y, w, h, fmt, imgsize, pix); 932 glCompressedTexSubImage2D(GL_TEXTURE_2D, 0, x, y, w, h, fmt, imgsize, pix);
873 GLERR(__FUNCTION__, __FILE__, __LINE__, "glCompressedTexSubImage2D");
874} 933}
875 934
876#include "evas_gl_3d_common.h" 935#include "evas_gl_3d_common.h"
diff --git a/src/modules/evas/engines/gl_common/evas_gl_context.c b/src/modules/evas/engines/gl_common/evas_gl_context.c
index 1a8df2f442..c7b0bcda58 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -201,8 +201,8 @@ static void shader_array_flush(Evas_Engine_GL_Context *gc);
201static Evas_Engine_GL_Context *_evas_gl_common_context = NULL; 201static Evas_Engine_GL_Context *_evas_gl_common_context = NULL;
202static Evas_GL_Shared *shared = NULL; 202static Evas_GL_Shared *shared = NULL;
203 203
204void 204EAPI void
205glerr(int err, const char *file, const char *func, int line, const char *op) 205__evas_gl_err(int err, const char *file, const char *func, int line, const char *op)
206{ 206{
207 const char *errmsg; 207 const char *errmsg;
208 char buf[32]; 208 char buf[32];
@@ -436,7 +436,6 @@ _evas_gl_common_viewport_set(Evas_Engine_GL_Context *gc)
436 glViewport(0, 0, w, h); 436 glViewport(0, 0, w, h);
437 else 437 else
438 glViewport(0, 0, h, w); 438 glViewport(0, 0, h, w);
439 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
440 // std matrix 439 // std matrix
441 if (m == 1) 440 if (m == 1)
442 matrix_ortho(proj, 441 matrix_ortho(proj,
@@ -518,15 +517,12 @@ _evas_gl_common_viewport_set(Evas_Engine_GL_Context *gc)
518 for (i = 0; i < SHADER_LAST; ++i) 517 for (i = 0; i < SHADER_LAST; ++i)
519 { 518 {
520 glUseProgram(gc->shared->shader[i].prog); 519 glUseProgram(gc->shared->shader[i].prog);
521 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
522 glUniformMatrix4fv(glGetUniformLocation(gc->shared->shader[i].prog, "mvp"), 1, GL_FALSE, proj); 520 glUniformMatrix4fv(glGetUniformLocation(gc->shared->shader[i].prog, "mvp"), 1, GL_FALSE, proj);
523 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
524 } 521 }
525 522
526 if (gc->state.current.cur_prog == PRG_INVALID) 523 if (gc->state.current.cur_prog == PRG_INVALID)
527 glUseProgram(gc->shared->shader[0].prog); 524 glUseProgram(gc->shared->shader[0].prog);
528 else glUseProgram(gc->state.current.cur_prog); 525 else glUseProgram(gc->state.current.cur_prog);
529 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
530} 526}
531 527
532EAPI Evas_Engine_GL_Context * 528EAPI Evas_Engine_GL_Context *
@@ -784,47 +780,31 @@ evas_gl_common_context_new(void)
784 ); 780 );
785 781
786 glDisable(GL_DEPTH_TEST); 782 glDisable(GL_DEPTH_TEST);
787 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
788 glEnable(GL_DITHER); 783 glEnable(GL_DITHER);
789 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
790 glDisable(GL_BLEND); 784 glDisable(GL_BLEND);
791 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
792 glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 785 glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
793 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
794 // no dest alpha 786 // no dest alpha
795// glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // dest alpha 787// glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // dest alpha
796// glBlendFunc(GL_SRC_ALPHA, GL_ONE); // ??? 788// glBlendFunc(GL_SRC_ALPHA, GL_ONE); // ???
797 glDepthMask(GL_FALSE); 789 glDepthMask(GL_FALSE);
798 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
799 790
800 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 791 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
801 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
802 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); 792 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
803 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
804 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); 793 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
805 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
806 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 794 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
807 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
808#ifdef GL_TEXTURE_MAX_ANISOTROPY_EXT 795#ifdef GL_TEXTURE_MAX_ANISOTROPY_EXT
809 if (shared->info.anisotropic > 0.0) 796 if (shared->info.anisotropic > 0.0)
810 { 797 glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.0);
811 glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.0);
812 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
813 }
814#endif 798#endif
815 799
816 glEnableVertexAttribArray(SHAD_VERTEX); 800 glEnableVertexAttribArray(SHAD_VERTEX);
817 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
818 glEnableVertexAttribArray(SHAD_COLOR); 801 glEnableVertexAttribArray(SHAD_COLOR);
819 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
820 802
821 if (!evas_gl_common_shader_program_init(shared)) goto error; 803 if (!evas_gl_common_shader_program_init(shared)) goto error;
822 804
823#define SHADER_TEXTURE_ADD(Shared, Shader, Name) \ 805#define SHADER_TEXTURE_ADD(Shared, Shader, Name) \
824 glUseProgram(Shared->shader[SHADER_##Shader].prog); \ 806 glUseProgram(Shared->shader[SHADER_##Shader].prog); \
825 GLERR(__FUNCTION__, __FILE__, __LINE__, ""); \ 807 glUniform1i(glGetUniformLocation(Shared->shader[SHADER_##Shader].prog, #Name), Shared->shader[SHADER_##Shader].tex_count++);
826 glUniform1i(glGetUniformLocation(Shared->shader[SHADER_##Shader].prog, #Name), Shared->shader[SHADER_##Shader].tex_count++); \
827 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
828 808
829 SHADER_TEXTURE_ADD(shared, YUV, tex); 809 SHADER_TEXTURE_ADD(shared, YUV, tex);
830 SHADER_TEXTURE_ADD(shared, YUV, texu); 810 SHADER_TEXTURE_ADD(shared, YUV, texu);
@@ -893,7 +873,6 @@ evas_gl_common_context_new(void)
893 if (gc->state.current.cur_prog == PRG_INVALID) 873 if (gc->state.current.cur_prog == PRG_INVALID)
894 glUseProgram(shared->shader[0].prog); 874 glUseProgram(shared->shader[0].prog);
895 else glUseProgram(gc->state.current.cur_prog); 875 else glUseProgram(gc->state.current.cur_prog);
896 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
897 876
898 evas_gl_common_shader_program_init_done(); 877 evas_gl_common_shader_program_init_done();
899 // in shader: 878 // in shader:
@@ -1069,53 +1048,34 @@ evas_gl_common_context_newframe(Evas_Engine_GL_Context *gc)
1069 gc->change.size = 1; 1048 gc->change.size = 1;
1070 1049
1071 glDisable(GL_SCISSOR_TEST); 1050 glDisable(GL_SCISSOR_TEST);
1072 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1073 glScissor(0, 0, 0, 0); 1051 glScissor(0, 0, 0, 0);
1074 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1075 1052
1076 glDisable(GL_DEPTH_TEST); 1053 glDisable(GL_DEPTH_TEST);
1077 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1078 glEnable(GL_DITHER); 1054 glEnable(GL_DITHER);
1079 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1080 glDisable(GL_BLEND); 1055 glDisable(GL_BLEND);
1081 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1082 glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1056 glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1083 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1084 // no dest alpha 1057 // no dest alpha
1085// glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // dest alpha 1058// glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // dest alpha
1086// glBlendFunc(GL_SRC_ALPHA, GL_ONE); // ??? 1059// glBlendFunc(GL_SRC_ALPHA, GL_ONE); // ???
1087 glDepthMask(GL_FALSE); 1060 glDepthMask(GL_FALSE);
1088 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1089 1061
1090 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1062 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1091 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1092 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); 1063 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
1093 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1094 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); 1064 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1095 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1096 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1065 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1097 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1098#ifdef GL_TEXTURE_MAX_ANISOTROPY_EXT 1066#ifdef GL_TEXTURE_MAX_ANISOTROPY_EXT
1099 if (shared->info.anisotropic > 0.0) 1067 if (shared->info.anisotropic > 0.0)
1100 { 1068 glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.0);
1101 glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.0);
1102 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1103 }
1104#endif 1069#endif
1105 1070
1106 glEnableVertexAttribArray(SHAD_VERTEX); 1071 glEnableVertexAttribArray(SHAD_VERTEX);
1107 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1108 glEnableVertexAttribArray(SHAD_COLOR); 1072 glEnableVertexAttribArray(SHAD_COLOR);
1109 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1110 if (gc->state.current.cur_prog == PRG_INVALID) 1073 if (gc->state.current.cur_prog == PRG_INVALID)
1111 glUseProgram(gc->shared->shader[0].prog); 1074 glUseProgram(gc->shared->shader[0].prog);
1112 else glUseProgram(gc->state.current.cur_prog); 1075 else glUseProgram(gc->state.current.cur_prog);
1113 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1114 1076
1115 glActiveTexture(GL_TEXTURE0); 1077 glActiveTexture(GL_TEXTURE0);
1116 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1117 glBindTexture(GL_TEXTURE_2D, gc->pipe[0].shader.cur_tex); 1078 glBindTexture(GL_TEXTURE_2D, gc->pipe[0].shader.cur_tex);
1118 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
1119 1079
1120 _evas_gl_common_viewport_set(gc); 1080 _evas_gl_common_viewport_set(gc);
1121} 1081}
@@ -1157,6 +1117,7 @@ evas_gl_common_tiling_start(Evas_Engine_GL_Context *gc EINA_UNUSED,
1157 glsym_glStartTiling(cx, cy, cw, ch, bitmask); 1117 glsym_glStartTiling(cx, cy, cw, ch, bitmask);
1158 break; 1118 break;
1159 } 1119 }
1120 GLERRV("glsym_glStartTiling");
1160} 1121}
1161 1122
1162void 1123void
@@ -1165,6 +1126,7 @@ evas_gl_common_tiling_done(Evas_Engine_GL_Context *gc EINA_UNUSED)
1165 if (glsym_glEndTiling) 1126 if (glsym_glEndTiling)
1166 { 1127 {
1167 glsym_glEndTiling(GL_COLOR_BUFFER_BIT0_QCOM); 1128 glsym_glEndTiling(GL_COLOR_BUFFER_BIT0_QCOM);
1129 GLERRV("glsym_glEndTiling");
1168 } 1130 }
1169} 1131}
1170 1132
@@ -1174,7 +1136,11 @@ evas_gl_common_context_done(Evas_Engine_GL_Context *gc)
1174{ 1136{
1175 if (gc->master_clip.used) 1137 if (gc->master_clip.used)
1176 { 1138 {