summaryrefslogtreecommitdiff
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
parent9eaadb2eb764d1a9fac0ebdabca5432d0b0edf7d (diff)
downloadefl-651f0ae2411cea5373bef091ac3b189adf98815a.tar.gz
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
-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)
GLint ok;
glShaderSource(shader, 1, &src, NULL);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-
glCompileShader(shader);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-
glGetShaderiv(shader, GL_COMPILE_STATUS, &ok);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (!ok)
{
@@ -1223,18 +1218,13 @@ _program_build(E3D_Program *program, const char *vert_src, const char *frag_src)
/* Attach shaders. */
glAttachShader(program->prog, program->vert);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-
glAttachShader(program->prog, program->frag);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
/* Link program. */
glLinkProgram(program->prog);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
/* Check link status. */
glGetProgramiv(program->prog, GL_LINK_STATUS, &ok);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (!ok)
{
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 @@
+#define GL_ERRORS_NODEF 1
#include "evas_gl_core_private.h"
#include "evas_gl_api_ext.h"
@@ -6,7 +7,7 @@
_func_begin_debug(__FUNCTION__); \
}
-#define EVGL_FUNC_END()
+#define EVGL_FUNC_END() GLERRV(__FUNCTION__)
#define _EVGL_INT_INIT_VALUE -3
//---------------------------------------//
@@ -1002,7 +1003,6 @@ _evgld_glActiveTexture(GLenum texture)
{
EVGL_FUNC_BEGIN();
glActiveTexture(texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1011,7 +1011,6 @@ _evgld_glAttachShader(GLuint program, GLuint shader)
{
EVGL_FUNC_BEGIN();
glAttachShader(program, shader);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1020,7 +1019,6 @@ _evgld_glBindAttribLocation(GLuint program, GLuint idx, const char* name)
{
EVGL_FUNC_BEGIN();
glBindAttribLocation(program, idx, name);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1029,7 +1027,6 @@ _evgld_glBindBuffer(GLenum target, GLuint buffer)
{
EVGL_FUNC_BEGIN();
glBindBuffer(target, buffer);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1039,7 +1036,6 @@ _evgld_glBindFramebuffer(GLenum target, GLuint framebuffer)
EVGL_FUNC_BEGIN();
_evgl_glBindFramebuffer(target, framebuffer);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1048,7 +1044,6 @@ _evgld_glBindRenderbuffer(GLenum target, GLuint renderbuffer)
{
EVGL_FUNC_BEGIN();
glBindRenderbuffer(target, renderbuffer);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1057,7 +1052,6 @@ _evgld_glBindTexture(GLenum target, GLuint texture)
{
EVGL_FUNC_BEGIN();
glBindTexture(target, texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1066,7 +1060,6 @@ _evgld_glBlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
{
EVGL_FUNC_BEGIN();
glBlendColor(red, green, blue, alpha);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1075,7 +1068,6 @@ _evgld_glBlendEquation(GLenum mode)
{
EVGL_FUNC_BEGIN();
glBlendEquation(mode);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1084,7 +1076,6 @@ _evgld_glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
{
EVGL_FUNC_BEGIN();
glBlendEquationSeparate(modeRGB, modeAlpha);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1093,7 +1084,6 @@ _evgld_glBlendFunc(GLenum sfactor, GLenum dfactor)
{
EVGL_FUNC_BEGIN();
glBlendFunc(sfactor, dfactor);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1102,7 +1092,6 @@ _evgld_glBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum
{
EVGL_FUNC_BEGIN();
glBlendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1111,7 +1100,6 @@ _evgld_glBufferData(GLenum target, GLsizeiptr size, const void* data, GLenum usa
{
EVGL_FUNC_BEGIN();
glBufferData(target, size, data, usage);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1120,7 +1108,6 @@ _evgld_glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const vo
{
EVGL_FUNC_BEGIN();
glBufferSubData(target, offset, size, data);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1131,7 +1118,6 @@ _evgld_glCheckFramebufferStatus(GLenum target)
EVGL_FUNC_BEGIN();
ret = glCheckFramebufferStatus(target);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
return ret;
}
@@ -1141,7 +1127,6 @@ _evgld_glClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
{
EVGL_FUNC_BEGIN();
_evgl_glClearColor(red, green, blue, alpha);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1151,7 +1136,6 @@ _evgld_glClearDepthf(GLclampf depth)
EVGL_FUNC_BEGIN();
_evgl_glClearDepthf(depth);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1161,7 +1145,6 @@ _evgld_glClearStencil(GLint s)
{
EVGL_FUNC_BEGIN();
glClearStencil(s);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1170,7 +1153,6 @@ _evgld_glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alp
{
EVGL_FUNC_BEGIN();
glColorMask(red, green, blue, alpha);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1179,7 +1161,6 @@ _evgld_glCompileShader(GLuint shader)
{
EVGL_FUNC_BEGIN();
glCompileShader(shader);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1188,7 +1169,6 @@ _evgld_glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat,
{
EVGL_FUNC_BEGIN();
glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1197,7 +1177,6 @@ _evgld_glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLin
{
EVGL_FUNC_BEGIN();
glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1206,7 +1185,6 @@ _evgld_glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint
{
EVGL_FUNC_BEGIN();
glCopyTexImage2D(target, level, internalformat, x, y, width, height, border);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1215,7 +1193,6 @@ _evgld_glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoff
{
EVGL_FUNC_BEGIN();
glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1226,7 +1203,6 @@ _evgld_glCreateProgram(void)
EVGL_FUNC_BEGIN();
ret = glCreateProgram();
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
return ret;
}
@@ -1237,7 +1213,6 @@ _evgld_glCreateShader(GLenum type)
GLuint ret = _EVGL_INT_INIT_VALUE;
EVGL_FUNC_BEGIN();
ret = glCreateShader(type);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
return ret;
}
@@ -1247,7 +1222,6 @@ _evgld_glCullFace(GLenum mode)
{
EVGL_FUNC_BEGIN();
glCullFace(mode);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1256,7 +1230,6 @@ _evgld_glDeleteBuffers(GLsizei n, const GLuint* buffers)
{
EVGL_FUNC_BEGIN();
glDeleteBuffers(n, buffers);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1265,7 +1238,6 @@ _evgld_glDeleteFramebuffers(GLsizei n, const GLuint* framebuffers)
{
EVGL_FUNC_BEGIN();
glDeleteFramebuffers(n, framebuffers);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1274,7 +1246,6 @@ _evgld_glDeleteProgram(GLuint program)
{
EVGL_FUNC_BEGIN();
glDeleteProgram(program);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1283,7 +1254,6 @@ _evgld_glDeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers)
{
EVGL_FUNC_BEGIN();
glDeleteRenderbuffers(n, renderbuffers);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1292,7 +1262,6 @@ _evgld_glDeleteShader(GLuint shader)
{
EVGL_FUNC_BEGIN();
glDeleteShader(shader);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1301,7 +1270,6 @@ _evgld_glDeleteTextures(GLsizei n, const GLuint* textures)
{
EVGL_FUNC_BEGIN();
glDeleteTextures(n, textures);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1310,7 +1278,6 @@ _evgld_glDepthFunc(GLenum func)
{
EVGL_FUNC_BEGIN();
glDepthFunc(func);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1319,7 +1286,6 @@ _evgld_glDepthMask(GLboolean flag)
{
EVGL_FUNC_BEGIN();
glDepthMask(flag);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1329,7 +1295,6 @@ _evgld_glDepthRangef(GLclampf zNear, GLclampf zFar)
EVGL_FUNC_BEGIN();
_evgl_glDepthRangef(zNear, zFar);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1339,7 +1304,6 @@ _evgld_glDetachShader(GLuint program, GLuint shader)
{
EVGL_FUNC_BEGIN();
glDetachShader(program, shader);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1348,7 +1312,6 @@ _evgld_glDisableVertexAttribArray(GLuint idx)
{
EVGL_FUNC_BEGIN();
glDisableVertexAttribArray(idx);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1357,7 +1320,6 @@ _evgld_glDrawArrays(GLenum mode, GLint first, GLsizei count)
{
EVGL_FUNC_BEGIN();
glDrawArrays(mode, first, count);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1366,7 +1328,6 @@ _evgld_glDrawElements(GLenum mode, GLsizei count, GLenum type, const void* indic
{
EVGL_FUNC_BEGIN();
glDrawElements(mode, count, type, indices);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1375,7 +1336,6 @@ _evgld_glEnableVertexAttribArray(GLuint idx)
{
EVGL_FUNC_BEGIN();
glEnableVertexAttribArray(idx);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1384,7 +1344,6 @@ _evgld_glFinish(void)
{
EVGL_FUNC_BEGIN();
glFinish();
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1393,7 +1352,6 @@ _evgld_glFlush(void)
{
EVGL_FUNC_BEGIN();
glFlush();
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1402,7 +1360,6 @@ _evgld_glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum render
{
EVGL_FUNC_BEGIN();
glFramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1411,7 +1368,6 @@ _evgld_glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget
{
EVGL_FUNC_BEGIN();
glFramebufferTexture2D(target, attachment, textarget, texture, level);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1420,7 +1376,6 @@ _evgld_glFrontFace(GLenum mode)
{
EVGL_FUNC_BEGIN();
glFrontFace(mode);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1430,7 +1385,6 @@ _evgld_glGetVertexAttribfv(GLuint idx, GLenum pname, GLfloat* params)
EVGL_FUNC_BEGIN();
glGetVertexAttribfv(idx, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1440,7 +1394,6 @@ _evgld_glGetVertexAttribiv(GLuint idx, GLenum pname, GLint* params)
EVGL_FUNC_BEGIN();
glGetVertexAttribiv(idx, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1450,7 +1403,6 @@ _evgld_glGetVertexAttribPointerv(GLuint idx, GLenum pname, void** pointer)
EVGL_FUNC_BEGIN();
glGetVertexAttribPointerv(idx, pname, pointer);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1460,7 +1412,6 @@ _evgld_glHint(GLenum target, GLenum mode)
{
EVGL_FUNC_BEGIN();
glHint(target, mode);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1469,7 +1420,6 @@ _evgld_glGenBuffers(GLsizei n, GLuint* buffers)
{
EVGL_FUNC_BEGIN();
glGenBuffers(n, buffers);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1478,7 +1428,6 @@ _evgld_glGenerateMipmap(GLenum target)
{
EVGL_FUNC_BEGIN();
glGenerateMipmap(target);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1487,7 +1436,6 @@ _evgld_glGenFramebuffers(GLsizei n, GLuint* framebuffers)
{
EVGL_FUNC_BEGIN();
glGenFramebuffers(n, framebuffers);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1496,7 +1444,6 @@ _evgld_glGenRenderbuffers(GLsizei n, GLuint* renderbuffers)
{
EVGL_FUNC_BEGIN();
glGenRenderbuffers(n, renderbuffers);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1505,7 +1452,6 @@ _evgld_glGenTextures(GLsizei n, GLuint* textures)
{
EVGL_FUNC_BEGIN();
glGenTextures(n, textures);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1514,7 +1460,6 @@ _evgld_glGetActiveAttrib(GLuint program, GLuint idx, GLsizei bufsize, GLsizei* l
{
EVGL_FUNC_BEGIN();
glGetActiveAttrib(program, idx, bufsize, length, size, type, name);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1523,7 +1468,6 @@ _evgld_glGetActiveUniform(GLuint program, GLuint idx, GLsizei bufsize, GLsizei*
{
EVGL_FUNC_BEGIN();
glGetActiveUniform(program, idx, bufsize, length, size, type, name);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1532,7 +1476,6 @@ _evgld_glGetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei* count, GL
{
EVGL_FUNC_BEGIN();
glGetAttachedShaders(program, maxcount, count, shaders);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1542,7 +1485,6 @@ _evgld_glGetAttribLocation(GLuint program, const char* name)
int ret = _EVGL_INT_INIT_VALUE;
EVGL_FUNC_BEGIN();
ret = glGetAttribLocation(program, name);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
return ret;
}
@@ -1552,7 +1494,6 @@ _evgld_glGetBooleanv(GLenum pname, GLboolean* params)
{
EVGL_FUNC_BEGIN();
glGetBooleanv(pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1561,7 +1502,6 @@ _evgld_glGetBufferParameteriv(GLenum target, GLenum pname, GLint* params)
{
EVGL_FUNC_BEGIN();
glGetBufferParameteriv(target, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1581,7 +1521,6 @@ _evgld_glGetFloatv(GLenum pname, GLfloat* params)
{
EVGL_FUNC_BEGIN();
glGetFloatv(pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1590,7 +1529,6 @@ _evgld_glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, G
{
EVGL_FUNC_BEGIN();
glGetFramebufferAttachmentParameteriv(target, attachment, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1599,7 +1537,6 @@ _evgld_glGetProgramiv(GLuint program, GLenum pname, GLint* params)
{
EVGL_FUNC_BEGIN();
glGetProgramiv(program, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1608,7 +1545,6 @@ _evgld_glGetProgramInfoLog(GLuint program, GLsizei bufsize, GLsizei* length, cha
{
EVGL_FUNC_BEGIN();
glGetProgramInfoLog(program, bufsize, length, infolog);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1617,7 +1553,6 @@ _evgld_glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint* params)
{
EVGL_FUNC_BEGIN();
glGetRenderbufferParameteriv(target, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1626,7 +1561,6 @@ _evgld_glGetShaderiv(GLuint shader, GLenum pname, GLint* params)
{
EVGL_FUNC_BEGIN();
glGetShaderiv(shader, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1635,7 +1569,6 @@ _evgld_glGetShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei* length, char*
{
EVGL_FUNC_BEGIN();
glGetShaderInfoLog(shader, bufsize, length, infolog);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1645,7 +1578,6 @@ _evgld_glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint
EVGL_FUNC_BEGIN();
_evgl_glGetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1655,7 +1587,6 @@ _evgld_glGetShaderSource(GLuint shader, GLsizei bufsize, GLsizei* length, char*
{
EVGL_FUNC_BEGIN();
glGetShaderSource(shader, bufsize, length, source);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1666,7 +1597,6 @@ _evgld_glGetString(GLenum name)
EVGL_FUNC_BEGIN();
ret = _evgl_glGetString(name);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
return ret;
}
@@ -1676,7 +1606,6 @@ _evgld_glGetTexParameterfv(GLenum target, GLenum pname, GLfloat* params)
{
EVGL_FUNC_BEGIN();
glGetTexParameterfv(target, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1685,7 +1614,6 @@ _evgld_glGetTexParameteriv(GLenum target, GLenum pname, GLint* params)
{
EVGL_FUNC_BEGIN();
glGetTexParameteriv(target, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1694,7 +1622,6 @@ _evgld_glGetUniformfv(GLuint program, GLint location, GLfloat* params)
{
EVGL_FUNC_BEGIN();
glGetUniformfv(program, location, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1703,7 +1630,6 @@ _evgld_glGetUniformiv(GLuint program, GLint location, GLint* params)
{
EVGL_FUNC_BEGIN();
glGetUniformiv(program, location, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
int
@@ -1713,7 +1639,6 @@ _evgld_glGetUniformLocation(GLuint program, const char* name)
EVGL_FUNC_BEGIN();
ret = glGetUniformLocation(program, name);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
return ret;
}
@@ -1725,7 +1650,6 @@ _evgld_glIsBuffer(GLuint buffer)
EVGL_FUNC_BEGIN();
ret = glIsBuffer(buffer);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
return ret;
}
@@ -1737,7 +1661,6 @@ _evgld_glIsEnabled(GLenum cap)
EVGL_FUNC_BEGIN();
ret = glIsEnabled(cap);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
return ret;
}
@@ -1749,7 +1672,6 @@ _evgld_glIsFramebuffer(GLuint framebuffer)
EVGL_FUNC_BEGIN();
ret = glIsFramebuffer(framebuffer);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
return ret;
}
@@ -1760,7 +1682,6 @@ _evgld_glIsProgram(GLuint program)
GLboolean ret;
EVGL_FUNC_BEGIN();
ret = glIsProgram(program);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
return ret;
}
@@ -1771,7 +1692,6 @@ _evgld_glIsRenderbuffer(GLuint renderbuffer)
GLboolean ret;
EVGL_FUNC_BEGIN();
ret = glIsRenderbuffer(renderbuffer);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
return ret;
}
@@ -1782,7 +1702,6 @@ _evgld_glIsShader(GLuint shader)
GLboolean ret;
EVGL_FUNC_BEGIN();
ret = glIsShader(shader);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
return ret;
}
@@ -1793,7 +1712,6 @@ _evgld_glIsTexture(GLuint texture)
GLboolean ret;
EVGL_FUNC_BEGIN();
ret = glIsTexture(texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
return ret;
}
@@ -1803,7 +1721,6 @@ _evgld_glLineWidth(GLfloat width)
{
EVGL_FUNC_BEGIN();
glLineWidth(width);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1812,7 +1729,6 @@ _evgld_glLinkProgram(GLuint program)
{
EVGL_FUNC_BEGIN();
glLinkProgram(program);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1821,7 +1737,6 @@ _evgld_glPixelStorei(GLenum pname, GLint param)
{
EVGL_FUNC_BEGIN();
glPixelStorei(pname, param);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1830,7 +1745,6 @@ _evgld_glPolygonOffset(GLfloat factor, GLfloat units)
{
EVGL_FUNC_BEGIN();
glPolygonOffset(factor, units);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1840,7 +1754,6 @@ _evgld_glReleaseShaderCompiler(void)
EVGL_FUNC_BEGIN();
_evgl_glReleaseShaderCompiler();
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1850,7 +1763,6 @@ _evgld_glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width
{
EVGL_FUNC_BEGIN();
glRenderbufferStorage(target, internalformat, width, height);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1859,7 +1771,6 @@ _evgld_glSampleCoverage(GLclampf value, GLboolean invert)
{
EVGL_FUNC_BEGIN();
glSampleCoverage(value, invert);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1869,7 +1780,6 @@ _evgld_glShaderBinary(GLsizei n, const GLuint* shaders, GLenum binaryformat, con
EVGL_FUNC_BEGIN();
_evgl_glShaderBinary(n, shaders, binaryformat, binary, length);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1883,7 +1793,6 @@ _evgld_glShaderSource(GLuint shader, GLsizei count, const char* const * string,
#else
glShaderSource(shader, count, (const GLchar **) string, length);
#endif
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1892,7 +1801,6 @@ _evgld_glStencilFunc(GLenum func, GLint ref, GLuint mask)
{
EVGL_FUNC_BEGIN();
glStencilFunc(func, ref, mask);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1901,7 +1809,6 @@ _evgld_glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
{
EVGL_FUNC_BEGIN();
glStencilFuncSeparate(face, func, ref, mask);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1910,7 +1817,6 @@ _evgld_glStencilMask(GLuint mask)
{
EVGL_FUNC_BEGIN();
glStencilMask(mask);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1919,7 +1825,6 @@ _evgld_glStencilMaskSeparate(GLenum face, GLuint mask)
{
EVGL_FUNC_BEGIN();
glStencilMaskSeparate(face, mask);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1928,7 +1833,6 @@ _evgld_glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
{
EVGL_FUNC_BEGIN();
glStencilOp(fail, zfail, zpass);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1937,7 +1841,6 @@ _evgld_glStencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass)
{
EVGL_FUNC_BEGIN();
glStencilOpSeparate(face, fail, zfail, zpass);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1946,7 +1849,6 @@ _evgld_glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei wi
{
EVGL_FUNC_BEGIN();
glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1955,7 +1857,6 @@ _evgld_glTexParameterf(GLenum target, GLenum pname, GLfloat param)
{
EVGL_FUNC_BEGIN();
glTexParameterf(target, pname, param);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1964,7 +1865,6 @@ _evgld_glTexParameterfv(GLenum target, GLenum pname, const GLfloat* params)
{
EVGL_FUNC_BEGIN();
glTexParameterfv(target, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1973,7 +1873,6 @@ _evgld_glTexParameteri(GLenum target, GLenum pname, GLint param)
{
EVGL_FUNC_BEGIN();
glTexParameteri(target, pname, param);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1982,7 +1881,6 @@ _evgld_glTexParameteriv(GLenum target, GLenum pname, const GLint* params)
{
EVGL_FUNC_BEGIN();
glTexParameteriv(target, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1991,7 +1889,6 @@ _evgld_glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
{
EVGL_FUNC_BEGIN();
glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2000,7 +1897,6 @@ _evgld_glUniform1f(GLint location, GLfloat x)
{
EVGL_FUNC_BEGIN();
glUniform1f(location, x);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2009,7 +1905,6 @@ _evgld_glUniform1fv(GLint location, GLsizei count, const GLfloat* v)
{
EVGL_FUNC_BEGIN();
glUniform1fv(location, count, v);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2018,7 +1913,6 @@ _evgld_glUniform1i(GLint location, GLint x)
{
EVGL_FUNC_BEGIN();
glUniform1i(location, x);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2027,7 +1921,6 @@ _evgld_glUniform1iv(GLint location, GLsizei count, const GLint* v)
{
EVGL_FUNC_BEGIN();
glUniform1iv(location, count, v);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2036,7 +1929,6 @@ _evgld_glUniform2f(GLint location, GLfloat x, GLfloat y)
{
EVGL_FUNC_BEGIN();
glUniform2f(location, x, y);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2045,7 +1937,6 @@ _evgld_glUniform2fv(GLint location, GLsizei count, const GLfloat* v)
{
EVGL_FUNC_BEGIN();
glUniform2fv(location, count, v);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2054,7 +1945,6 @@ _evgld_glUniform2i(GLint location, GLint x, GLint y)
{
EVGL_FUNC_BEGIN();
glUniform2i(location, x, y);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2063,7 +1953,6 @@ _evgld_glUniform2iv(GLint location, GLsizei count, const GLint* v)
{
EVGL_FUNC_BEGIN();
glUniform2iv(location, count, v);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2072,7 +1961,6 @@ _evgld_glUniform3f(GLint location, GLfloat x, GLfloat y, GLfloat z)
{
EVGL_FUNC_BEGIN();
glUniform3f(location, x, y, z);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2081,7 +1969,6 @@ _evgld_glUniform3fv(GLint location, GLsizei count, const GLfloat* v)
{
EVGL_FUNC_BEGIN();
glUniform3fv(location, count, v);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2090,7 +1977,6 @@ _evgld_glUniform3i(GLint location, GLint x, GLint y, GLint z)
{
EVGL_FUNC_BEGIN();
glUniform3i(location, x, y, z);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2099,7 +1985,6 @@ _evgld_glUniform3iv(GLint location, GLsizei count, const GLint* v)
{
EVGL_FUNC_BEGIN();
glUniform3iv(location, count, v);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2108,7 +1993,6 @@ _evgld_glUniform4f(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
{
EVGL_FUNC_BEGIN();
glUniform4f(location, x, y, z, w);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2117,7 +2001,6 @@ _evgld_glUniform4fv(GLint location, GLsizei count, const GLfloat* v)
{
EVGL_FUNC_BEGIN();
glUniform4fv(location, count, v);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2126,7 +2009,6 @@ _evgld_glUniform4i(GLint location, GLint x, GLint y, GLint z, GLint w)
{
EVGL_FUNC_BEGIN();
glUniform4i(location, x, y, z, w);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2135,7 +2017,6 @@ _evgld_glUniform4iv(GLint location, GLsizei count, const GLint* v)
{
EVGL_FUNC_BEGIN();
glUniform4iv(location, count, v);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2144,7 +2025,6 @@ _evgld_glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, co
{
EVGL_FUNC_BEGIN();
glUniformMatrix2fv(location, count, transpose, value);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2153,7 +2033,6 @@ _evgld_glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, co
{
EVGL_FUNC_BEGIN();
glUniformMatrix3fv(location, count, transpose, value);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2162,7 +2041,6 @@ _evgld_glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, co
{
EVGL_FUNC_BEGIN();
glUniformMatrix4fv(location, count, transpose, value);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2171,7 +2049,6 @@ _evgld_glUseProgram(GLuint program)
{
EVGL_FUNC_BEGIN();
glUseProgram(program);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2180,7 +2057,6 @@ _evgld_glValidateProgram(GLuint program)
{
EVGL_FUNC_BEGIN();
glValidateProgram(program);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2189,7 +2065,6 @@ _evgld_glVertexAttrib1f(GLuint indx, GLfloat x)
{
EVGL_FUNC_BEGIN();
glVertexAttrib1f(indx, x);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2198,7 +2073,6 @@ _evgld_glVertexAttrib1fv(GLuint indx, const GLfloat* values)
{
EVGL_FUNC_BEGIN();
glVertexAttrib1fv(indx, values);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2207,7 +2081,6 @@ _evgld_glVertexAttrib2f(GLuint indx, GLfloat x, GLfloat y)
{
EVGL_FUNC_BEGIN();
glVertexAttrib2f(indx, x, y);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2216,7 +2089,6 @@ _evgld_glVertexAttrib2fv(GLuint indx, const GLfloat* values)
{
EVGL_FUNC_BEGIN();
glVertexAttrib2fv(indx, values);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2225,7 +2097,6 @@ _evgld_glVertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z)
{
EVGL_FUNC_BEGIN();
glVertexAttrib3f(indx, x, y, z);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2234,7 +2105,6 @@ _evgld_glVertexAttrib3fv(GLuint indx, const GLfloat* values)
{
EVGL_FUNC_BEGIN();
glVertexAttrib3fv(indx, values);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2243,7 +2113,6 @@ _evgld_glVertexAttrib4f(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
{
EVGL_FUNC_BEGIN();
glVertexAttrib4f(indx, x, y, z, w);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2252,7 +2121,6 @@ _evgld_glVertexAttrib4fv(GLuint indx, const GLfloat* values)
{
EVGL_FUNC_BEGIN();
glVertexAttrib4fv(indx, values);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2261,7 +2129,6 @@ _evgld_glVertexAttribPointer(GLuint indx, GLint size, GLenum type, GLboolean nor
{
EVGL_FUNC_BEGIN();
glVertexAttribPointer(indx, size, type, normalized, stride, ptr);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2491,7 +2358,6 @@ _evgld_glShaderSource(GLuint shader, GLsizei count, const char* const* string, c
#ifdef GL_GLES
glShaderSource(shader, count, string, length);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
goto finish;
#else
//GET_EXT_PTR(void, glShaderSource, (int, int, char **, void *));
@@ -2521,7 +2387,6 @@ _evgld_glShaderSource(GLuint shader, GLsizei count, const char* const* string, c
ERR("Error allocating memory for shader string manipulation.");
glShaderSource(shader, count, tab_prog_new, tab_length_new);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
for (i = 0; i < count; i++)
free(tab_prog_new[i]);
@@ -2548,7 +2413,6 @@ _evgld_glClear(GLbitfield mask)
EVGL_FUNC_BEGIN();
_evgl_glClear(mask);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2558,7 +2422,6 @@ _evgld_glEnable(GLenum cap)
EVGL_FUNC_BEGIN();
_evgl_glEnable(cap);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2568,7 +2431,6 @@ _evgld_glDisable(GLenum cap)
EVGL_FUNC_BEGIN();
_evgl_glDisable(cap);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2577,7 +2439,6 @@ _evgld_glGetIntegerv(GLenum pname, GLint* params)
{
EVGL_FUNC_BEGIN();
_evgl_glGetIntegerv(pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2587,7 +2448,6 @@ _evgld_glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum form
EVGL_FUNC_BEGIN();
_evgl_glReadPixels(x, y, width, height, format, type, pixels);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2597,7 +2457,6 @@ _evgld_glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
EVGL_FUNC_BEGIN();
_evgl_glScissor(x, y, width, height);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2607,7 +2466,6 @@ _evgld_glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
EVGL_FUNC_BEGIN();
_evgl_glViewport(x, y, width, height);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
//-------------------------------------------------------------//
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 @@
+#define GL_ERRORS_NODEF 1
#include "evas_gl_core_private.h"
#include <dlfcn.h>
@@ -7,7 +8,7 @@
_func_begin_debug(__FUNCTION__); \
}
-#define EVGL_FUNC_END()
+#define EVGL_FUNC_END() GLERRV(__FUNCTION__)
static void *_gles1_handle = NULL;
static Evas_GL_API _gles1_api;
@@ -1733,7 +1734,6 @@ _evgld_gles1_glAlphaFunc(GLenum func, GLclampf ref)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glAlphaFunc(func, ref);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1747,7 +1747,6 @@ _evgld_gles1_glClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glClearColor(red, green, blue, alpha);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1761,7 +1760,6 @@ _evgld_gles1_glClearDepthf(GLclampf depth)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glClearDepthf(depth);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1775,7 +1773,6 @@ _evgld_gles1_glClipPlanef(GLenum plane, const GLfloat *equation)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glClipPlanef(plane, equation);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1789,7 +1786,6 @@ _evgld_gles1_glColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glColor4f(red, green, blue, alpha);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1803,7 +1799,6 @@ _evgld_gles1_glDepthRangef(GLclampf zNear, GLclampf zFar)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glDepthRangef(zNear, zFar);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1817,7 +1812,6 @@ _evgld_gles1_glFogf(GLenum pname, GLfloat param)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glFogf(pname, param);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1831,7 +1825,6 @@ _evgld_gles1_glFogfv(GLenum pname, const GLfloat *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glFogfv(pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1845,7 +1838,6 @@ _evgld_gles1_glFrustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glFrustumf(left, right, bottom, top, zNear, zFar);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1859,7 +1851,6 @@ _evgld_gles1_glGetClipPlanef(GLenum pname, GLfloat eqn[4])
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glGetClipPlanef(pname, eqn);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1873,7 +1864,6 @@ _evgld_gles1_glGetFloatv(GLenum pname, GLfloat *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glGetFloatv(pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1887,7 +1877,6 @@ _evgld_gles1_glGetLightfv(GLenum light, GLenum pname, GLfloat *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glGetLightfv(light, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1901,7 +1890,6 @@ _evgld_gles1_glGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glGetMaterialfv(face, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1915,7 +1903,6 @@ _evgld_gles1_glGetTexEnvfv(GLenum env, GLenum pname, GLfloat *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glGetTexEnvfv(env, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1929,7 +1916,6 @@ _evgld_gles1_glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glGetTexParameterfv(target, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1943,7 +1929,6 @@ _evgld_gles1_glLightModelf(GLenum pname, GLfloat param)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glLightModelf(pname, param);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1957,7 +1942,6 @@ _evgld_gles1_glLightModelfv(GLenum pname, const GLfloat *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glLightModelfv(pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1971,7 +1955,6 @@ _evgld_gles1_glLightf(GLenum light, GLenum pname, GLfloat param)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glLightf(light, pname, param);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1985,7 +1968,6 @@ _evgld_gles1_glLightfv(GLenum light, GLenum pname, const GLfloat *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glLightfv(light, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -1999,7 +1981,6 @@ _evgld_gles1_glLineWidth(GLfloat width)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glLineWidth(width);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2013,7 +1994,6 @@ _evgld_gles1_glLoadMatrixf(const GLfloat *m)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glLoadMatrixf(m);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2027,7 +2007,6 @@ _evgld_gles1_glMaterialf(GLenum face, GLenum pname, GLfloat param)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glMaterialf(face, pname, param);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2041,7 +2020,6 @@ _evgld_gles1_glMaterialfv(GLenum face, GLenum pname, const GLfloat *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glMaterialfv(face, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2055,7 +2033,6 @@ _evgld_gles1_glMultMatrixf(const GLfloat *m)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glMultMatrixf(m);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2069,7 +2046,6 @@ _evgld_gles1_glMultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, G
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glMultiTexCoord4f(target, s, t, r, q);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2083,7 +2059,6 @@ _evgld_gles1_glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glNormal3f(nx, ny, nz);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2097,7 +2072,6 @@ _evgld_gles1_glOrthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glOrthof(left, right, bottom, top, zNear, zFar);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2111,7 +2085,6 @@ _evgld_gles1_glPointParameterf(GLenum pname, GLfloat param)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glPointParameterf(pname, param);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2125,7 +2098,6 @@ _evgld_gles1_glPointParameterfv(GLenum pname, const GLfloat *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glPointParameterfv(pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2139,7 +2111,6 @@ _evgld_gles1_glPointSize(GLfloat size)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glPointSize(size);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2153,7 +2124,6 @@ _evgld_gles1_glPointSizePointerOES(GLenum type, GLsizei stride, const GLvoid *po
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glPointSizePointerOES(type, stride, pointer);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2167,7 +2137,6 @@ _evgld_gles1_glPolygonOffset(GLfloat factor, GLfloat units)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glPolygonOffset(factor, units);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2181,7 +2150,6 @@ _evgld_gles1_glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glRotatef(angle, x, y, z);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2195,7 +2163,6 @@ _evgld_gles1_glScalef(GLfloat x, GLfloat y, GLfloat z)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glScalef(x, y, z);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2209,7 +2176,6 @@ _evgld_gles1_glTexEnvf(GLenum target, GLenum pname, GLfloat param)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glTexEnvf(target, pname, param);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2223,7 +2189,6 @@ _evgld_gles1_glTexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glTexEnvfv(target, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2237,7 +2202,6 @@ _evgld_gles1_glTexParameterf(GLenum target, GLenum pname, GLfloat param)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glTexParameterf(target, pname, param);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2251,7 +2215,6 @@ _evgld_gles1_glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glTexParameterfv(target, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2265,7 +2228,6 @@ _evgld_gles1_glTranslatef(GLfloat x, GLfloat y, GLfloat z)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glTranslatef(x, y, z);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2279,7 +2241,6 @@ _evgld_gles1_glActiveTexture(GLenum texture)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glActiveTexture(texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2293,7 +2254,6 @@ _evgld_gles1_glAlphaFuncx(GLenum func, GLclampx ref)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glAlphaFuncx(func, ref);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2307,7 +2267,6 @@ _evgld_gles1_glBindBuffer(GLenum target, GLuint buffer)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glBindBuffer(target, buffer);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2321,7 +2280,6 @@ _evgld_gles1_glBindTexture(GLenum target, GLuint texture)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glBindTexture(target, texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2335,7 +2293,6 @@ _evgld_gles1_glBlendFunc(GLenum sfactor, GLenum dfactor)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glBlendFunc(sfactor, dfactor);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2349,7 +2306,6 @@ _evgld_gles1_glBufferData(GLenum target, GLsizeiptr size, const GLvoid *data, GL
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glBufferData(target, size, data, usage);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2363,7 +2319,6 @@ _evgld_gles1_glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, co
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glBufferSubData(target, offset, size, data);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2377,7 +2332,6 @@ _evgld_gles1_glClear(GLbitfield mask)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glClear(mask);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2391,7 +2345,6 @@ _evgld_gles1_glClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glClearColorx(red, green, blue, alpha);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2405,7 +2358,6 @@ _evgld_gles1_glClearDepthx(GLclampx depth)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glClearDepthx(depth);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2419,7 +2371,6 @@ _evgld_gles1_glClearStencil(GLint s)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glClearStencil(s);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2433,7 +2384,6 @@ _evgld_gles1_glClientActiveTexture(GLenum texture)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glClientActiveTexture(texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2447,7 +2397,6 @@ _evgld_gles1_glClipPlanex(GLenum plane, const GLfixed *equation)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glClipPlanex(plane, equation);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2461,7 +2410,6 @@ _evgld_gles1_glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glColor4ub(red, green, blue, alpha);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2475,7 +2423,6 @@ _evgld_gles1_glColor4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glColor4x(red, green, blue, alpha);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2489,7 +2436,6 @@ _evgld_gles1_glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboole
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glColorMask(red, green, blue, alpha);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2503,7 +2449,6 @@ _evgld_gles1_glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoi
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glColorPointer(size, type, stride, pointer);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2517,7 +2462,6 @@ _evgld_gles1_glCompressedTexImage2D(GLenum target, GLint level, GLenum internalf
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2531,7 +2475,6 @@ _evgld_gles1_glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2545,7 +2488,6 @@ _evgld_gles1_glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat,
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glCopyTexImage2D(target, level, internalformat, x, y, width, height, border);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2559,7 +2501,6 @@ _evgld_gles1_glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLin
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2573,7 +2514,6 @@ _evgld_gles1_glCullFace(GLenum mode)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glCullFace(mode);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2587,7 +2527,6 @@ _evgld_gles1_glDeleteBuffers(GLsizei n, const GLuint *buffers)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glDeleteBuffers(n, buffers);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2601,7 +2540,6 @@ _evgld_gles1_glDeleteTextures(GLsizei n, const GLuint *textures)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glDeleteTextures(n, textures);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2615,7 +2553,6 @@ _evgld_gles1_glDepthFunc(GLenum func)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glDepthFunc(func);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2629,7 +2566,6 @@ _evgld_gles1_glDepthMask(GLboolean flag)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glDepthMask(flag);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2643,7 +2579,6 @@ _evgld_gles1_glDepthRangex(GLclampx zNear, GLclampx zFar)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glDepthRangex(zNear, zFar);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2657,7 +2592,6 @@ _evgld_gles1_glDisable(GLenum cap)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glDisable(cap);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2671,7 +2605,6 @@ _evgld_gles1_glDisableClientState(GLenum array)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glDisableClientState(array);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2685,7 +2618,6 @@ _evgld_gles1_glDrawArrays(GLenum mode, GLint first, GLsizei count)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glDrawArrays(mode, first, count);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2699,7 +2631,6 @@ _evgld_gles1_glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoi
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glDrawElements(mode, count, type, indices);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2713,7 +2644,6 @@ _evgld_gles1_glEnable(GLenum cap)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glEnable(cap);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2727,7 +2657,6 @@ _evgld_gles1_glEnableClientState(GLenum array)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glEnableClientState(array);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2741,7 +2670,6 @@ _evgld_gles1_glFinish(void)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glFinish();
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2755,7 +2683,6 @@ _evgld_gles1_glFlush(void)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glFlush();
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2769,7 +2696,6 @@ _evgld_gles1_glFogx(GLenum pname, GLfixed param)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glFogx(pname, param);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2783,7 +2709,6 @@ _evgld_gles1_glFogxv(GLenum pname, const GLfixed *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glFogxv(pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2797,7 +2722,6 @@ _evgld_gles1_glFrontFace(GLenum mode)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glFrontFace(mode);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2811,7 +2735,6 @@ _evgld_gles1_glFrustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glFrustumx(left, right, bottom, top, zNear, zFar);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2825,7 +2748,6 @@ _evgld_gles1_glGetBooleanv(GLenum pname, GLboolean *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glGetBooleanv(pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2839,7 +2761,6 @@ _evgld_gles1_glGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glGetBufferParameteriv(target, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2853,7 +2774,6 @@ _evgld_gles1_glGetClipPlanex(GLenum pname, GLfixed eqn[4])
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glGetClipPlanex(pname, eqn);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2867,7 +2787,6 @@ _evgld_gles1_glGenBuffers(GLsizei n, GLuint *buffers)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glGenBuffers(n, buffers);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2881,7 +2800,6 @@ _evgld_gles1_glGenTextures(GLsizei n, GLuint *textures)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glGenTextures(n, textures);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2896,7 +2814,6 @@ _evgld_gles1_glGetError(void)
}
EVGL_FUNC_BEGIN();
ret = _evgl_gles1_glGetError();
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
return ret;
}
@@ -2911,7 +2828,6 @@ _evgld_gles1_glGetFixedv(GLenum pname, GLfixed *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glGetFixedv(pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2925,7 +2841,6 @@ _evgld_gles1_glGetIntegerv(GLenum pname, GLint *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glGetIntegerv(pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2939,7 +2854,6 @@ _evgld_gles1_glGetLightxv(GLenum light, GLenum pname, GLfixed *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glGetLightxv(light, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2953,7 +2867,6 @@ _evgld_gles1_glGetMaterialxv(GLenum face, GLenum pname, GLfixed *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glGetMaterialxv(face, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2967,7 +2880,6 @@ _evgld_gles1_glGetPointerv(GLenum pname, GLvoid **params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glGetPointerv(pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -2982,7 +2894,6 @@ _evgld_gles1_glGetString(GLenum name)
}
EVGL_FUNC_BEGIN();
ret = _evgl_gles1_glGetString(name);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
return ret;
}
@@ -2997,7 +2908,6 @@ _evgld_gles1_glGetTexEnviv(GLenum env, GLenum pname, GLint *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glGetTexEnviv(env, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3011,7 +2921,6 @@ _evgld_gles1_glGetTexEnvxv(GLenum env, GLenum pname, GLfixed *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glGetTexEnvxv(env, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3025,7 +2934,6 @@ _evgld_gles1_glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glGetTexParameteriv(target, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3039,7 +2947,6 @@ _evgld_gles1_glGetTexParameterxv(GLenum target, GLenum pname, GLfixed *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glGetTexParameterxv(target, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3053,7 +2960,6 @@ _evgld_gles1_glHint(GLenum target, GLenum mode)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glHint(target, mode);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3068,7 +2974,6 @@ _evgld_gles1_glIsBuffer(GLuint buffer)
}
EVGL_FUNC_BEGIN();
ret = _evgl_gles1_glIsBuffer(buffer);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
return ret;
}
@@ -3084,7 +2989,6 @@ _evgld_gles1_glIsEnabled(GLenum cap)
}
EVGL_FUNC_BEGIN();
ret = _evgl_gles1_glIsEnabled(cap);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
return ret;
}
@@ -3100,7 +3004,6 @@ _evgld_gles1_glIsTexture(GLuint texture)
}
EVGL_FUNC_BEGIN();
ret = _evgl_gles1_glIsTexture(texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
return ret;
}
@@ -3115,7 +3018,6 @@ _evgld_gles1_glLightModelx(GLenum pname, GLfixed param)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glLightModelx(pname, param);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3129,7 +3031,6 @@ _evgld_gles1_glLightModelxv(GLenum pname, const GLfixed *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glLightModelxv(pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3143,7 +3044,6 @@ _evgld_gles1_glLightx(GLenum light, GLenum pname, GLfixed param)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glLightx(light, pname, param);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3157,7 +3057,6 @@ _evgld_gles1_glLightxv(GLenum light, GLenum pname, const GLfixed *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glLightxv(light, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3171,7 +3070,6 @@ _evgld_gles1_glLineWidthx(GLfixed width)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glLineWidthx(width);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3185,7 +3083,6 @@ _evgld_gles1_glLoadIdentity(void)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glLoadIdentity();
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3199,7 +3096,6 @@ _evgld_gles1_glLoadMatrixx(const GLfixed *m)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glLoadMatrixx(m);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3213,7 +3109,6 @@ _evgld_gles1_glLogicOp(GLenum opcode)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glLogicOp(opcode);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3227,7 +3122,6 @@ _evgld_gles1_glMaterialx(GLenum face, GLenum pname, GLfixed param)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glMaterialx(face, pname, param);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3241,7 +3135,6 @@ _evgld_gles1_glMaterialxv(GLenum face, GLenum pname, const GLfixed *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glMaterialxv(face, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3255,7 +3148,6 @@ _evgld_gles1_glMatrixMode(GLenum mode)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glMatrixMode(mode);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3269,7 +3161,6 @@ _evgld_gles1_glMultMatrixx(const GLfixed *m)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glMultMatrixx(m);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3283,7 +3174,6 @@ _evgld_gles1_glMultiTexCoord4x(GLenum target, GLfixed s, GLfixed t, GLfixed r, G
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glMultiTexCoord4x(target, s, t, r, q);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3297,7 +3187,6 @@ _evgld_gles1_glNormal3x(GLfixed nx, GLfixed ny, GLfixed nz)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glNormal3x(nx, ny, nz);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3311,7 +3200,6 @@ _evgld_gles1_glNormalPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glNormalPointer(type, stride, pointer);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3325,7 +3213,6 @@ _evgld_gles1_glOrthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glOrthox(left, right, bottom, top, zNear, zFar);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3339,7 +3226,6 @@ _evgld_gles1_glPixelStorei(GLenum pname, GLint param)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glPixelStorei(pname, param);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3353,7 +3239,6 @@ _evgld_gles1_glPointParameterx(GLenum pname, GLfixed param)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glPointParameterx(pname, param);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3367,7 +3252,6 @@ _evgld_gles1_glPointParameterxv(GLenum pname, const GLfixed *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glPointParameterxv(pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3381,7 +3265,6 @@ _evgld_gles1_glPointSizex(GLfixed size)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glPointSizex(size);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3395,7 +3278,6 @@ _evgld_gles1_glPolygonOffsetx(GLfixed factor, GLfixed units)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glPolygonOffsetx(factor, units);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3409,7 +3291,6 @@ _evgld_gles1_glPopMatrix(void)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glPopMatrix();
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3423,7 +3304,6 @@ _evgld_gles1_glPushMatrix(void)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glPushMatrix();
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3437,7 +3317,6 @@ _evgld_gles1_glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenu
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glReadPixels(x, y, width, height, format, type, pixels);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3451,7 +3330,6 @@ _evgld_gles1_glRotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glRotatex(angle, x, y, z);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3465,7 +3343,6 @@ _evgld_gles1_glSampleCoverage(GLclampf value, GLboolean invert)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glSampleCoverage(value, invert);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3479,7 +3356,6 @@ _evgld_gles1_glSampleCoveragex(GLclampx value, GLboolean invert)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glSampleCoveragex(value, invert);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3493,7 +3369,6 @@ _evgld_gles1_glScalex(GLfixed x, GLfixed y, GLfixed z)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glScalex(x, y, z);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3507,7 +3382,6 @@ _evgld_gles1_glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glScissor(x, y, width, height);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3521,7 +3395,6 @@ _evgld_gles1_glShadeModel(GLenum mode)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glShadeModel(mode);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3535,7 +3408,6 @@ _evgld_gles1_glStencilFunc(GLenum func, GLint ref, GLuint mask)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glStencilFunc(func, ref, mask);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3549,7 +3421,6 @@ _evgld_gles1_glStencilMask(GLuint mask)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glStencilMask(mask);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3563,7 +3434,6 @@ _evgld_gles1_glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glStencilOp(fail, zfail, zpass);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3577,7 +3447,6 @@ _evgld_gles1_glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GL
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glTexCoordPointer(size, type, stride, pointer);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3591,7 +3460,6 @@ _evgld_gles1_glTexEnvi(GLenum target, GLenum pname, GLint param)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glTexEnvi(target, pname, param);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3605,7 +3473,6 @@ _evgld_gles1_glTexEnvx(GLenum target, GLenum pname, GLfixed param)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glTexEnvx(target, pname, param);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3619,7 +3486,6 @@ _evgld_gles1_glTexEnviv(GLenum target, GLenum pname, const GLint *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glTexEnviv(target, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3633,7 +3499,6 @@ _evgld_gles1_glTexEnvxv(GLenum target, GLenum pname, const GLfixed *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glTexEnvxv(target, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3647,7 +3512,6 @@ _evgld_gles1_glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsi
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3661,7 +3525,6 @@ _evgld_gles1_glTexParameteri(GLenum target, GLenum pname, GLint param)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glTexParameteri(target, pname, param);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3675,7 +3538,6 @@ _evgld_gles1_glTexParameterx(GLenum target, GLenum pname, GLfixed param)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glTexParameterx(target, pname, param);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3689,7 +3551,6 @@ _evgld_gles1_glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glTexParameteriv(target, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3703,7 +3564,6 @@ _evgld_gles1_glTexParameterxv(GLenum target, GLenum pname, const GLfixed *params
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glTexParameterxv(target, pname, params);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3717,7 +3577,6 @@ _evgld_gles1_glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yo
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3731,7 +3590,6 @@ _evgld_gles1_glTranslatex(GLfixed x, GLfixed y, GLfixed z)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glTranslatex(x, y, z);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3745,7 +3603,6 @@ _evgld_gles1_glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvo
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glVertexPointer(size, type, stride, pointer);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
@@ -3759,7 +3616,6 @@ _evgld_gles1_glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
}
EVGL_FUNC_BEGIN();
_evgl_gles1_glViewport(x, y, width, height);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
EVGL_FUNC_END();
}
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
typedef int (*Evas_GL_Common_Buffer_Dump_Call)(Evas_Engine_GL_Context *gc,const char* dname, const char* fname, int frame, const char* suffix);
typedef void (*Evas_Gl_Symbols)(void *(*GetProcAddress)(const char *sym));
-void glerr(int err, const char *file, const char *func, int line, const char *op);
+EAPI void __evas_gl_err(int err, const char *file, const char *func, int line, const char *op);
void evas_gl_common_tiling_start(Evas_Engine_GL_Context *gc,
int rot, int gw, int gh,
@@ -842,15 +842,76 @@ void pt_unref(Evas_GL_Texture_Pool *pt);
//#define GL_ERRORS 1
#ifdef GL_ERRORS
-# define GLERR(fn, fl, ln, op) \
- { \
+#include <dlfcn.h>
+static inline void
+__evas_gl_errdyn(int err, const char *file, const char *func, int line, const char *op)
+{
+ static void (*sym)(int,const char*,const char*,int,const char*) = NULL;
+ if (!sym) sym = dlsym(RTLD_DEFAULT, "__evas_gl_err");
+ sym(err, file, func, line, op);
+}
+# define GLERRV(op) \
+ { \
int __gl_err = glGetError(); \
- if (__gl_err != GL_NO_ERROR) glerr(__gl_err, fl, fn, ln, op); \
+ if (__gl_err != GL_NO_ERROR) \
+ __evas_gl_errdyn(__gl_err, __FILE__, __FUNCTION__, __LINE__, op); \
}
+/* Redefine common gl funcs */
+# ifndef GL_ERRORS_NODEF
+# define glActiveTexture(...) do { glActiveTexture(__VA_ARGS__); GLERRV("glActiveTexture"); } while(0)
+# define glBindAttribLocation(...) do { glBindAttribLocation(__VA_ARGS__); GLERRV("glBindAttribLocation"); } while(0)
+# define glBindBuffer(...) do { glBindBuffer(__VA_ARGS__); GLERRV("glBindBuffer"); } while(0)
+# define glBindTexture(...) do { glBindTexture(__VA_ARGS__); GLERRV("glBindTexture"); } while(0)
+# define glBlendFunc(...) do { glBlendFunc(__VA_ARGS__); GLERRV("glBlendFunc"); } while(0)
+# define glBufferData(...) do { glBufferData(__VA_ARGS__); GLERRV("glBufferData"); } while(0)
+# define glCompressedTexSubImage2D(...) do { glCompressedTexSubImage2D(__VA_ARGS__); GLERRV("glCompressedTexSubImage2D"); } while(0)
+# define glDeleteBuffers(...) do { glDeleteBuffers(__VA_ARGS__); GLERRV("glDeleteBuffers"); } while(0)
+# define glDepthMask(...) do { glDepthMask(__VA_ARGS__); GLERRV("glDepthMask"); } while(0)
+# define glDisable(...) do { glDisable(__VA_ARGS__); GLERRV("glDisable"); } while(0)
+# define glDisableVertexAttribArray(...) do { glDisableVertexAttribArray(__VA_ARGS__); GLERRV("glDisableVertexAttribArray"); } while(0)
+# define glDrawArrays(...) do { glDrawArrays(__VA_ARGS__); GLERRV("glDrawArrays"); } while(0)
+# define glEnable(...) do { glEnable(__VA_ARGS__); GLERRV("glEnable"); } while(0)
+# define glEnableVertexAttribArray(...) do { glEnableVertexAttribArray(__VA_ARGS__); GLERRV("glEnableVertexAttribArray"); } while(0)
+# define glGenBuffers(...) do { glGenBuffers(__VA_ARGS__); GLERRV("glGenBuffers"); } while(0)
+# define glGetFloatv(...) do { glGetFloatv(__VA_ARGS__); GLERRV("glGetFloatv"); } while(0)
+# define glGetIntegerv(...) do { glGetIntegerv(__VA_ARGS__); GLERRV("glGetIntegerv"); } while(0)
+# define glGetUniformLocation(...) ({ GLint _x = glGetUniformLocation(__VA_ARGS__); GLERRV("glGetUniformLocation"); _x; })
+# define glHint(...) do { glHint(__VA_ARGS__); GLERRV("glHint"); } while(0)
+# define glReadPixels(...) do { glReadPixels(__VA_ARGS__); GLERRV("glReadPixels"); } while(0)
+# define glScissor(...) do { glScissor(__VA_ARGS__); GLERRV("glScissor"); } while(0)
+# define glGenFramebuffers(...) do { glGenFramebuffers(__VA_ARGS__); GLERRV("glGenFramebuffers"); } while(0)
+# define glBindFramebuffer(...) do { glBindFramebuffer(__VA_ARGS__); GLERRV("glBindFramebuffer"); } while(0)
+# define glEndTiling(...) do { glEndTiling(__VA_ARGS__); GLERRV("glEndTiling"); } while(0)
+# define glGetProgramBinary(...) do { glGetProgramBinary(__VA_ARGS__); GLERRV("glGetProgramBinary"); } while(0)
+# define glMapBuffer(...) ({ void *_x = glMapBuffer(__VA_ARGS__); GLERRV("glMapBuffer"); _x; })
+# define glStartTiling(...) do { glStartTiling(__VA_ARGS__); GLERRV("glStartTiling"); } while(0)
+# define glUnmapBuffer(...) do { glUnmapBuffer(__VA_ARGS__); GLERRV("glUnmapBuffer"); } while(0)
+# define glTexParameterf(...) do { glTexParameterf(__VA_ARGS__); GLERRV("glTexParameterf"); } while(0)
+# define glTexParameteri(...) do { glTexParameteri(__VA_ARGS__); GLERRV("glTexParameteri"); } while(0)
+# define glTexSubImage2D(...) do { glTexSubImage2D(__VA_ARGS__); GLERRV("glTexSubImage2D"); } while(0)
+# define glUniform1f(...) do { glUniform1f(__VA_ARGS__); GLERRV("glUniform1f"); } while(0)
+# define glUniform1i(...) do { glUniform1i(__VA_ARGS__); GLERRV("glUniform1i"); } while(0)
+# define glUniform2fv(...) do { glUniform2fv(__VA_ARGS__); GLERRV("glUniform2fv"); } while(0)
+# define glUniform4fv(...) do { glUniform4fv(__VA_ARGS__); GLERRV("glUniform4fv"); } while(0)
+# define glUniformMatrix4fv(...) do { glUniformMatrix4fv(__VA_ARGS__); GLERRV("glUniformMatrix4fv"); } while(0)
+# define glUseProgram(...) do { glUseProgram(__VA_ARGS__); GLERRV("glUseProgram"); } while(0)
+# define glVertexAttribPointer(...) do { glVertexAttribPointer(__VA_ARGS__); GLERRV("glVertexAttribPointer"); } while(0)
+# define glViewport(...) do { glViewport(__VA_ARGS__); GLERRV("glViewport"); } while(0)
+# define glPixelStorei(...) do { glPixelStorei(__VA_ARGS__); GLERRV("glPixelStorei"); } while(0)
+# define glCompressedTexImage2D(...) do { glCompressedTexImage2D(__VA_ARGS__); GLERRV("glCompressedTexImage2D"); } while(0)
+# define glCreateShader(...) ({ GLuint _x = glCreateShader(__VA_ARGS__); GLERRV("glCreateShader"); _x; })
+# define glCreateProgram(...) ({ GLuint _x = glCreateProgram(__VA_ARGS__); GLERRV("glCreateProgram"); _x; })
+# define glAttachShader(...) do { glAttachShader(__VA_ARGS__); GLERRV("glAttachShader"); } while(0)
+# define glLinkProgram(...) do { glLinkProgram(__VA_ARGS__); GLERRV("glLinkProgram"); } while(0)
+# define glGetProgramiv(...) do { glGetProgramiv(__VA_ARGS__); GLERRV("glGetProgramiv"); } while(0)
+# define glGetProgramInfoLog(...) do { glGetProgramInfoLog(__VA_ARGS__); GLERRV("glGetProgramInfoLog"); } while(0)
+# define glGetShaderiv(...) do { glGetShaderiv(__VA_ARGS__); GLERRV("glGetShaderiv"); } while(0)
+# define glShaderSource(...) do { glShaderSource(__VA_ARGS__); GLERRV("glShaderSource"); } while(0)
+# define glCompileShader(...) do { glCompileShader(__VA_ARGS__); GLERRV("glCompileShader"); } while(0)
+# endif
#else
-# define GLERR(fn, fl, ln, op)
+# define GLERRV(op)
#endif
-#define GLERRLOG() GLERR(__FUNCTION__, __FILE__, __LINE__, "")
Eina_Bool evas_gl_common_module_open(void);
void 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
if ((w > gc->shared->info.max_texture_size) ||
(h > gc->shared->info.max_texture_size)) return;
glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, w, h, fmt, type, pix);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
static 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
if ((w > gc->shared->info.max_texture_size) ||
(h > gc->shared->info.max_texture_size)) return;
glCompressedTexSubImage2D(GL_TEXTURE_2D, 0, x, y, w, h, fmt, imgsize, pix);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "glCompressedTexSubImage2D");
}
#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);
static Evas_Engine_GL_Context *_evas_gl_common_context = NULL;
static Evas_GL_Shared *shared = NULL;
-void
-glerr(int err, const char *file, const char *func, int line, const char *op)
+EAPI void
+__evas_gl_err(int err, const char *file, const char *func, int line, const char *op)
{
const char *errmsg;
char buf[32];
@@ -436,7 +436,6 @@ _evas_gl_common_viewport_set(Evas_Engine_GL_Context *gc)
glViewport(0, 0, w, h);
else
glViewport(0, 0, h, w);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
// std matrix
if (m == 1)
matrix_ortho(proj,
@@ -518,15 +517,12 @@ _evas_gl_common_viewport_set(Evas_Engine_GL_Context *gc)
for (i = 0; i < SHADER_LAST; ++i)
{
glUseProgram(gc->shared->shader[i].prog);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glUniformMatrix4fv(glGetUniformLocation(gc->shared->shader[i].prog, "mvp"), 1, GL_FALSE, proj);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
if (gc->state.current.cur_prog == PRG_INVALID)
glUseProgram(gc->shared->shader[0].prog);
else glUseProgram(gc->state.current.cur_prog);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
EAPI Evas_Engine_GL_Context *
@@ -784,47 +780,31 @@ evas_gl_common_context_new(void)
);
glDisable(GL_DEPTH_TEST);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glEnable(GL_DITHER);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glDisable(GL_BLEND);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
// no dest alpha
// glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // dest alpha
// glBlendFunc(GL_SRC_ALPHA, GL_ONE); // ???
glDepthMask(GL_FALSE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
#ifdef GL_TEXTURE_MAX_ANISOTROPY_EXT
if (shared->info.anisotropic > 0.0)
- {
- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.0);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
- }
+ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.0);
#endif
glEnableVertexAttribArray(SHAD_VERTEX);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glEnableVertexAttribArray(SHAD_COLOR);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (!evas_gl_common_shader_program_init(shared)) goto error;
#define SHADER_TEXTURE_ADD(Shared, Shader, Name) \
glUseProgram(Shared->shader[SHADER_##Shader].prog); \
- GLERR(__FUNCTION__, __FILE__, __LINE__, ""); \
- glUniform1i(glGetUniformLocation(Shared->shader[SHADER_##Shader].prog, #Name), Shared->shader[SHADER_##Shader].tex_count++); \
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+ glUniform1i(glGetUniformLocation(Shared->shader[SHADER_##Shader].prog, #Name), Shared->shader[SHADER_##Shader].tex_count++);
SHADER_TEXTURE_ADD(shared, YUV, tex);
SHADER_TEXTURE_ADD(shared, YUV, texu);
@@ -893,7 +873,6 @@ evas_gl_common_context_new(void)
if (gc->state.current.cur_prog == PRG_INVALID)
glUseProgram(shared->shader[0].prog);
else glUseProgram(gc->state.current.cur_prog);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
evas_gl_common_shader_program_init_done();
// in shader:
@@ -1069,53 +1048,34 @@ evas_gl_common_context_newframe(Evas_Engine_GL_Context *gc)
gc->change.size = 1;
glDisable(GL_SCISSOR_TEST);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glScissor(0, 0, 0, 0);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glDisable(GL_DEPTH_TEST);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glEnable(GL_DITHER);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glDisable(GL_BLEND);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
// no dest alpha
// glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // dest alpha
// glBlendFunc(GL_SRC_ALPHA, GL_ONE); // ???
glDepthMask(GL_FALSE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
#ifdef GL_TEXTURE_MAX_ANISOTROPY_EXT
if (shared->info.anisotropic > 0.0)
- {
- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.0);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
- }
+ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.0);
#endif
glEnableVertexAttribArray(SHAD_VERTEX);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glEnableVertexAttribArray(SHAD_COLOR);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (gc->state.current.cur_prog == PRG_INVALID)
glUseProgram(gc->shared->shader[0].prog);
else glUseProgram(gc->state.current.cur_prog);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glActiveTexture(GL_TEXTURE0);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glBindTexture(GL_TEXTURE_2D, gc->pipe[0].shader.cur_tex);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
_evas_gl_common_viewport_set(gc);
}
@@ -1157,6 +1117,7 @@ evas_gl_common_tiling_start(Evas_Engine_GL_Context *gc EINA_UNUSED,
glsym_glStartTiling(cx, cy, cw, ch, bitmask);
break;
}
+ GLERRV("glsym_glStartTiling");
}
void
@@ -1165,6 +1126,7 @@ evas_gl_common_tiling_done(Evas_Engine_GL_Context *gc EINA_UNUSED)
if (glsym_glEndTiling)
{
glsym_glEndTiling(GL_COLOR_BUFFER_BIT0_QCOM);
+ GLERRV("glsym_glEndTiling");
}
}
@@ -1174,7 +1136,11 @@ evas_gl_common_context_done(Evas_Engine_GL_Context *gc)
{
if (gc->master_clip.used)
{
- if (glsym_glEndTiling) glsym_glEndTiling(GL_COLOR_BUFFER_BIT0_QCOM);
+ if (glsym_glEndTiling)
+ {
+ glsym_glEndTiling(GL_COLOR_BUFFER_BIT0_QCOM);
+ GLERRV("glsym_glEndTiling");
+ }
gc->master_clip.used = EINA_FALSE;
}
}
@@ -1216,12 +1182,12 @@ evas_gl_common_context_target_surface_set(Evas_Engine_GL_Context *gc,
if (gc->pipe[0].shader.surface == gc->def_surface)
{
glsym_glBindFramebuffer(GL_FRAMEBUFFER, 0);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+ GLERRV("glsym_glBindFramebuffer");
}
else
{
glsym_glBindFramebuffer(GL_FRAMEBUFFER, surface->tex->pt->fb);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+ GLERRV("glsym_glBindFramebuffer");
}
_evas_gl_common_viewport_set(gc);
}
@@ -1411,10 +1377,7 @@ shader_array_uniforms_set(Evas_Engine_GL_Context *gc, int n)
if (u->location >= 0)
loc = u->location;
else
- {
- loc = glGetUniformLocation(gc->pipe[n].shader.cur_prog, u->name);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "glGetUniformLocation");
- }
+ loc = glGetUniformLocation(gc->pipe[n].shader.cur_prog, u->name);
if (loc >= 0)
{
switch (u->type)
@@ -1430,7 +1393,6 @@ shader_array_uniforms_set(Evas_Engine_GL_Context *gc, int n)
break;
default: ERR("Unhandled uniform type"); break;
}
- GLERR(__FUNCTION__, __FILE__, __LINE__, "glUniform");
}
eina_stringshare_del(u->name);
free(u);
@@ -2852,6 +2814,7 @@ start_tiling(Evas_Engine_GL_Context *gc EINA_UNUSED,
glsym_glStartTiling(cx, cy, cw, ch, bitmask);
break;
}
+ GLERRV("glsym_glStartTiling");
}
static void
@@ -2880,11 +2843,10 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
pipe_done++;
gc->flushnum++;
- GLERR(__FUNCTION__, __FILE__, __LINE__, "<flush err>");
+ GLERRV("<flush err>");
if (gc->pipe[i].shader.cur_prog != gc->state.current.cur_prog)
{
glUseProgram(gc->pipe[i].shader.cur_prog);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
if (gc->pipe[i].shader.cur_tex != gc->state.current.cur_tex)
@@ -2893,18 +2855,14 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
if (gc->pipe[i].shader.cur_tex)
{
glEnable(GL_TEXTURE_2D);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
else
{
glDisable(GL_TEXTURE_2D);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
#endif
glActiveTexture(GL_TEXTURE0);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glBindTexture(GL_TEXTURE_2D, gc->pipe[i].shader.cur_tex);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
if (gc->pipe[i].array.im)
{
@@ -2967,20 +2925,13 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
break;
}
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
if (gc->pipe[i].shader.blend != gc->state.current.blend)
{
if (gc->pipe[i].shader.blend)
- {
- glEnable(GL_BLEND);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
- }
+ glEnable(GL_BLEND);
else
- {
- glDisable(GL_BLEND);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
- }
+ glDisable(GL_BLEND);
}
if ((gc->pipe[i].shader.smooth != gc->state.current.smooth) ||
(gc->pipe[i].shader.cur_tex != gc->state.current.cur_tex))
@@ -2989,37 +2940,23 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
{
#ifdef GL_TEXTURE_MAX_ANISOTROPY_EXT
if (shared->info.anisotropic > 0.0)
- {
- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, shared->info.anisotropic);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
- }
+ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, shared->info.anisotropic);
#endif
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
else
{
#ifdef GL_TEXTURE_MAX_ANISOTROPY_EXT
if (shared->info.anisotropic > 0.0)
- {
- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.0);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
- }
+ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.0);
#endif
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
}
if (gc->pipe[i].shader.clip != gc->state.current.clip)
@@ -3170,6 +3107,7 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
gc->pipe[i].array.buffer_use++;
x = glsym_glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY);
+ GLERRV("glsym_glMapBuffer");
if (x)
{
if (gc->pipe[i].array.use_vertex)
@@ -3201,6 +3139,7 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
gc->pipe[i].array.use_texm);
*/
glsym_glUnmapBuffer(GL_ARRAY_BUFFER);
+ GLERRV("glsym_glUnmapBuffer");
}
}
else
@@ -3214,9 +3153,7 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
texm_ptr = (unsigned char *)gc->pipe[i].array.texm;
}
glVertexAttribPointer(SHAD_VERTEX, 3, GL_SHORT, GL_FALSE, 0, (void *)vertex_ptr);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glVertexAttribPointer(SHAD_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, 0, (void *)color_ptr);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (gc->pipe[i].array.line)
{
@@ -3233,17 +3170,11 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
}
glDisableVertexAttribArray(SHAD_TEXUV);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glDisableVertexAttribArray(SHAD_TEXUV2);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glDisableVertexAttribArray(SHAD_TEXUV3);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glDisableVertexAttribArray(SHAD_TEXA);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glDisableVertexAttribArray(SHAD_TEXM);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glDrawArrays(GL_LINES, 0, gc->pipe[i].array.num);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
else
{
@@ -3252,57 +3183,40 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
if (gc->pipe[i].array.use_texuv)
{
glEnableVertexAttribArray(SHAD_TEXUV);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glVertexAttribPointer(SHAD_TEXUV, 2, GL_FLOAT, GL_FALSE, 0,
(void *)texuv_ptr);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
MASK_TEXTURE += 1;
}
else
{
glDisableVertexAttribArray(SHAD_TEXUV);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
/* Alpha plane */
if (gc->pipe[i].array.use_texa && (gc->pipe[i].region.type != RTYPE_MAP))
{
glEnableVertexAttribArray(SHAD_TEXA);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glVertexAttribPointer(SHAD_TEXA, 2, GL_FLOAT, GL_FALSE, 0, (void *)texa_ptr);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glActiveTexture(GL_TEXTURE1);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glBindTexture(GL_TEXTURE_2D, gc->pipe[i].shader.cur_texa);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
#ifdef GL_TEXTURE_MAX_ANISOTROPY_EXT
if (shared->info.anisotropic > 0.0)
- {
- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, shared->info.anisotropic);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
- }
+ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, shared->info.anisotropic);
#endif
if (gc->pipe[i].shader.smooth)
{
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
else
{
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glActiveTexture(GL_TEXTURE0);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
MASK_TEXTURE += 1;
}
@@ -3314,63 +3228,42 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
if ((gc->pipe[i].array.use_texuv2) && (gc->pipe[i].array.use_texuv3))
{
glEnableVertexAttribArray(SHAD_TEXUV2);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glEnableVertexAttribArray(SHAD_TEXUV3);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glVertexAttribPointer(SHAD_TEXUV2, 2, GL_FLOAT, GL_FALSE, 0, (void *)texuv2_ptr);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glVertexAttribPointer(SHAD_TEXUV3, 2, GL_FLOAT, GL_FALSE, 0, (void *)texuv3_ptr);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glActiveTexture(GL_TEXTURE1);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glBindTexture(GL_TEXTURE_2D, gc->pipe[i].shader.cur_texu);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
#ifdef GL_GLES
if (gc->pipe[i].shader.cur_texu_dyn)
secsym_glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, gc->pipe[i].shader.cur_texu_dyn);
#endif
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glActiveTexture(GL_TEXTURE2);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glBindTexture(GL_TEXTURE_2D, gc->pipe[i].shader.cur_texv);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
#ifdef GL_GLES
if (gc->pipe[i].shader.cur_texv_dyn)
secsym_glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, gc->pipe[i].shader.cur_texv_dyn);
#endif
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glActiveTexture(GL_TEXTURE0);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
MASK_TEXTURE += 2;
}
else if (gc->pipe[i].array.use_texuv2)
{
glEnableVertexAttribArray(SHAD_TEXUV2);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glVertexAttribPointer(SHAD_TEXUV2, 2, GL_FLOAT, GL_FALSE, 0, (void *)texuv2_ptr);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glActiveTexture(GL_TEXTURE1);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glBindTexture(GL_TEXTURE_2D, gc->pipe[i].shader.cur_texu);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
#ifdef GL_GLES
if (gc->pipe[i].shader.cur_texu_dyn)
secsym_glEGLImageTargetTexture2DOES
@@ -3379,81 +3272,55 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
if (gc->pipe[i].shader.smooth)
{
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
else
{
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
glActiveTexture(GL_TEXTURE0);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
MASK_TEXTURE += 1;
}
else
{
glDisableVertexAttribArray(SHAD_TEXUV2);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glDisableVertexAttribArray(SHAD_TEXUV3);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
/* Mask surface */
if (gc->pipe[i].array.use_texm)
{
glEnableVertexAttribArray(SHAD_TEXM);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glVertexAttribPointer(SHAD_TEXM, 2, GL_FLOAT, GL_FALSE, 0, (void *)texm_ptr);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glActiveTexture(MASK_TEXTURE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glBindTexture(GL_TEXTURE_2D, gc->pipe[i].shader.cur_texm);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
#ifdef GL_TEXTURE_MAX_ANISOTROPY_EXT
if (shared->info.anisotropic > 0.0)
- {
- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, shared->info.anisotropic);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
- }
+ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, shared->info.anisotropic);
#endif
if (gc->pipe[i].shader.smooth)
{
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
else
{
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glActiveTexture(GL_TEXTURE0);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
else
{
glDisableVertexAttribArray(SHAD_TEXM);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
// Push all uniforms
@@ -3476,7 +3343,6 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
);
}
glDrawArrays(GL_TRIANGLES, 0, gc->pipe[i].array.num);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
if (gc->pipe[i].array.im)
{
diff --git a/src/modules/evas/engines/gl_common/evas_gl_core.c b/src/modules/evas/engines/gl_common/evas_gl_core.c
index e23777d44e..ca37da49b8 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_core.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_core.c
@@ -2259,10 +2259,7 @@ evgl_make_current(void *eng_data, EVGL_Surface *sfc, EVGL_Context *ctx)
// Bind to the previously bound buffer (may be 0)
if (ctx->current_fbo)
- {
- glBindFramebuffer(GL_FRAMEBUFFER, ctx->current_fbo);
- GLERRLOG();
- }
+ glBindFramebuffer(GL_FRAMEBUFFER, ctx->current_fbo);
rsc->direct.rendered = 0;
}
@@ -2295,7 +2292,7 @@ evgl_make_current(void *eng_data, EVGL_Surface *sfc, EVGL_Context *ctx)
// Bind to the previously bound buffer
if (ctx->current_fbo)
- glBindFramebuffer(GL_FRAMEBUFFER, ctx->current_fbo);
+ glBindFramebuffer(GL_FRAMEBUFFER, ctx->current_fbo);
}
rsc->direct.rendered = 0;
}
diff --git a/src/modules/evas/engines/gl_common/evas_gl_shader.c b/src/modules/evas/engines/gl_common/evas_gl_shader.c
index 7b6a10f786..b181344ace 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_shader.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_shader.c
@@ -74,6 +74,7 @@ _evas_gl_common_shader_program_binary_init(Evas_GL_Program *p,
glAttachShader(p->prog, p->frag);
#endif
glsym_glProgramBinary(p->prog, formats[0], data, length);
+ GLERRV("glsym_glProgramBinary");
glBindAttribLocation(p->prog, SHAD_VERTEX, "vertex");
glBindAttribLocation(p->prog, SHAD_COLOR, "color");
@@ -84,7 +85,6 @@ _evas_gl_common_shader_program_binary_init(Evas_GL_Program *p,
glBindAttribLocation(p->prog, SHAD_TEXM, "tex_coordm");
glGetProgramiv(p->prog, GL_LINK_STATUS, &ok);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (!ok)
{
gl_compile_link_error(p->prog, "load a program object");
@@ -121,14 +121,13 @@ _evas_gl_common_shader_program_binary_save(Evas_GL_Program *p,
if (!glsym_glGetProgramBinary) return 0;
glGetProgramiv(p->prog, GL_PROGRAM_BINARY_LENGTH, &length);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (length <= 0) return 0;
data = malloc(length);
if (!data) return 0;
glsym_glGetProgramBinary(p->prog, length, &size, &format, data);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+ GLERRV("glsym_glGetProgramBinary");
if (length != size)
{
@@ -158,12 +157,9 @@ _evas_gl_common_shader_program_source_init(Evas_GL_Program *p,
glShaderSource(p->vert, 1,
(const char **)&(vert->src), NULL);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glCompileShader(p->vert);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
ok = 0;
glGetShaderiv(p->vert, GL_COMPILE_STATUS, &ok);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (!ok)
{
gl_compile_link_error(p->vert, "compile vertex shader");
@@ -172,12 +168,9 @@ _evas_gl_common_shader_program_source_init(Evas_GL_Program *p,
}
glShaderSource(p->frag, 1,
(const char **)&(frag->src), NULL);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glCompileShader(p->frag);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
ok = 0;
glGetShaderiv(p->frag, GL_COMPILE_STATUS, &ok);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (!ok)
{
gl_compile_link_error(p->frag, "compile fragment shader");
@@ -189,34 +182,26 @@ _evas_gl_common_shader_program_source_init(Evas_GL_Program *p,
#ifdef GL_GLES
#else
if ((glsym_glGetProgramBinary) && (glsym_glProgramParameteri))
- glsym_glProgramParameteri(p->prog, GL_PROGRAM_BINARY_RETRIEVABLE_HINT,
- GL_TRUE);
+ {
+ glsym_glProgramParameteri(p->prog, GL_PROGRAM_BINARY_RETRIEVABLE_HINT,
+ GL_TRUE);
+ GLERRV("glsym_glProgramParameteri");
+ }
#endif
glAttachShader(p->prog, p->vert);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glAttachShader(p->prog, p->frag);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glBindAttribLocation(p->prog, SHAD_VERTEX, "vertex");
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glBindAttribLocation(p->prog, SHAD_COLOR, "color");
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glBindAttribLocation(p->prog, SHAD_TEXUV, "tex_coord");
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glBindAttribLocation(p->prog, SHAD_TEXUV2, "tex_coord2");
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glBindAttribLocation(p->prog, SHAD_TEXUV3, "tex_coord3");
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glBindAttribLocation(p->prog, SHAD_TEXA, "tex_coorda");
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glBindAttribLocation(p->prog, SHAD_TEXM, "tex_coordm");
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glLinkProgram(p->prog);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
ok = 0;
glGetProgramiv(p->prog, GL_LINK_STATUS, &ok);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (!ok)
{
gl_compile_link_error(p->prog, "link fragment and vertex shaders");
@@ -364,7 +349,11 @@ evas_gl_common_shader_program_init_done(void)
#ifdef GL_GLES
glReleaseShaderCompiler();
#else
- if (glsym_glReleaseShaderCompiler) glsym_glReleaseShaderCompiler();
+ if (glsym_glReleaseShaderCompiler)
+ {
+ glsym_glReleaseShaderCompiler();
+ GLERRV("glsym_glReleaseShaderCompiler");
+ }
#endif
}
diff --git a/src/modules/evas/engines/gl_common/evas_gl_texture.c b/src/modules/evas/engines/gl_common/evas_gl_texture.c
index cee054afc2..c2af7f349b 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_texture.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_texture.c
@@ -303,7 +303,6 @@ _tex_2d(Evas_Engine_GL_Context *gc, int intfmt, int w, int h, int fmt, int type)
glTexImage2D(GL_TEXTURE_2D, 0, intfmt, w, h, 0, fmt, type, NULL);
else
glCompressedTexImage2D(GL_TEXTURE_2D, 0, intfmt, w, h, 0, sz, NULL);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
#ifdef GL_TEXTURE_INTERNAL_FORMAT
# ifdef GL_GLES
# else
@@ -387,20 +386,13 @@ _pool_tex_new(Evas_Engine_GL_Context *gc, int w, int h, GLenum intformat, GLenum
pt->eina_pool = eina_rectangle_pool_new(w, h);
glGenTextures(1, &(pt->texture));
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glBindTexture(GL_TEXTURE_2D, pt->texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
ok = _tex_2d(gc, pt->intformat, w, h, pt->format, pt->dataformat);
glBindTexture(GL_TEXTURE_2D, gc->pipe[0].shader.cur_tex);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (!ok)
{
glDeleteTextures(1, &(pt->texture));
@@ -602,30 +594,23 @@ _pool_tex_render_new(Evas_Engine_GL_Context *gc, int w, int h, int intformat, in
#endif
glGetIntegerv(GL_FRAMEBUFFER_BINDING, &fnum);
glGenTextures(1, &(pt->texture));
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glBindTexture(GL_TEXTURE_2D, pt->texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
ok = _tex_2d(gc, pt->intformat, w, h, pt->format, pt->dataformat);
glsym_glGenFramebuffers(1, &(pt->fb));
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+ GLERRV("glsym_glGenFramebuffers");
glsym_glBindFramebuffer(GL_FRAMEBUFFER, pt->fb);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+ GLERRV("glsym_glBindFramebuffer");
glsym_glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, pt->texture, 0);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+ GLERRV("glsym_glFramebufferTexture2D");
glsym_glBindFramebuffer(GL_FRAMEBUFFER, fnum);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+ GLERRV("glsym_glBindFramebuffer");
glBindTexture(GL_TEXTURE_2D, gc->pipe[0].shader.cur_tex);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (!ok)
{
@@ -677,9 +662,7 @@ _pool_tex_native_new(Evas_Engine_GL_Context *gc, int w, int h, int intformat, in
pt->native = 1;
pt->eina_pool = eina_rectangle_pool_new(w, h);
glGenTextures(1, &(pt->texture));
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glBindTexture(im->native.target, pt->texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
#ifdef GL_GLES
#else
@@ -691,17 +674,11 @@ _pool_tex_native_new(Evas_Engine_GL_Context *gc, int w, int h, int intformat, in
#endif
glTexParameteri(im->native.target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(im->native.target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(im->native.target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(im->native.target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glBindTexture(im->native.target, 0);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glBindTexture(im->native.target, gc->pipe[0].shader.cur_tex);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
texinfo.n.num++;
texinfo.n.pix += pt->w * pt->h;
@@ -760,17 +737,11 @@ _pool_tex_dynamic_new(Evas_Engine_GL_Context *gc, int w, int h, int intformat, i
_print_tex_count();
glGenTextures(1, &(pt->texture));
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glBindTexture(GL_TEXTURE_2D, pt->texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
egldisplay = pt->gc->egldisp;
@@ -783,13 +754,11 @@ _pool_tex_dynamic_new(Evas_Engine_GL_Context *gc, int w, int h, int intformat, i
EGL_NO_CONTEXT,
EGL_MAP_GL_TEXTURE_2D_SEC,
0, attr);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+ GLERRV("secsym_eglCreateImage");
if (!pt->dyn.img)
{
glBindTexture(GL_TEXTURE_2D, 0);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glDeleteTextures(1, &(pt->texture));
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (pt->eina_pool)
eina_rectangle_pool_free(pt->eina_pool);
free(pt);
@@ -820,7 +789,6 @@ _pool_tex_dynamic_new(Evas_Engine_GL_Context *gc, int w, int h, int intformat, i
if (pixtype != EGL_MAP_GL_TEXTURE_UNSIGNED_BYTE_SEC) goto error;
glBindTexture(GL_TEXTURE_2D, gc->pipe[0].shader.cur_tex);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
#else
if (gc + w + h + intformat + format) return pt;
#endif
@@ -830,12 +798,10 @@ _pool_tex_dynamic_new(Evas_Engine_GL_Context *gc, int w, int h, int intformat, i
#ifdef GL_GLES
error:
secsym_eglDestroyImage(egldisplay, pt->dyn.img);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+ GLERRV("secsym_eglDestroyImage");
pt->dyn.img = NULL;
glBindTexture(GL_TEXTURE_2D, 0);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glDeleteTextures(1, &(pt->texture));
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (pt->eina_pool)
eina_rectangle_pool_free(pt->eina_pool);
free(pt);
@@ -899,13 +865,12 @@ evas_gl_texture_pool_empty(Evas_GL_Texture_Pool *pt)
#endif
glDeleteTextures(1, &(pt->texture));
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (pt->gc->pipe[0].shader.cur_tex == pt->texture)
pt->gc->pipe[0].shader.cur_tex = 0;
if (pt->fb)
{
glsym_glDeleteFramebuffers(1, &(pt->fb));
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+ GLERRV("glsym_glDeleteFramebuffers");
pt->fb = 0;
}
EINA_LIST_FREE(pt->allocations, apt)
@@ -1025,14 +990,11 @@ evas_gl_common_texture_upload(Evas_GL_Texture *tex, RGBA_Image *im, unsigned int
fmt = tex->pt->format;
glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (tex->gc->shared->info.unpack_row_length)
{
glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
// printf("tex upload %ix%i\n", im->cache_entry.w, im->cache_entry.h);
// +-+
@@ -1088,7 +1050,6 @@ evas_gl_common_texture_upload(Evas_GL_Texture *tex, RGBA_Image *im, unsigned int
if (tex->gc->shared->info.unpack_row_length)
{
glPixelStorei(GL_UNPACK_ROW_LENGTH, im->cache_entry.w);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
// |xxx
// |xxx
//
@@ -1142,10 +1103,7 @@ evas_gl_common_texture_upload(Evas_GL_Texture *tex, RGBA_Image *im, unsigned int
tpix);
}
if (tex->pt->texture != tex->gc->pipe[0].shader.cur_tex)
- {
- glBindTexture(GL_TEXTURE_2D, tex->gc->pipe[0].shader.cur_tex);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
- }
+ glBindTexture(GL_TEXTURE_2D, tex->gc->pipe[0].shader.cur_tex);
}
void
@@ -1208,7 +1166,6 @@ evas_gl_common_texture_update(Evas_GL_Texture *tex, RGBA_Image *im)
EINA_SAFETY_ON_FALSE_RETURN(!(width & 0x3) && !(height & 0x3));
glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if ((tex->gc->shared->info.etc1_subimage ||
(im->cache_entry.space != EVAS_COLORSPACE_ETC1))
@@ -1226,7 +1183,8 @@ evas_gl_common_texture_update(Evas_GL_Texture *tex, RGBA_Image *im)
err = glGetError();
if (err != GL_NO_ERROR)
{
- glerr(err, __FILE__, __FUNCTION__, __LINE__, "glCompressedTexSubImage2D");
+ __evas_gl_err(err, __FILE__, __FUNCTION__, __LINE__,
+ "glCompressedTexSubImage2D");
// FIXME: Changing settings on the fly.
// The first texture will be black.
@@ -1241,13 +1199,11 @@ evas_gl_common_texture_update(Evas_GL_Texture *tex, RGBA_Image *im)
width, height, 0,
((width * height) >> 4) * bsize,
im->image.data);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
if (tex->pt->texture != tex->gc->pipe[0].shader.cur_tex)
{
glBindTexture(GL_TEXTURE_2D, tex->gc->pipe[0].shader.cur_tex);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
return;
}
@@ -1319,23 +1275,17 @@ evas_gl_common_texture_update(Evas_GL_Texture *tex, RGBA_Image *im)
// Bind and upload ! Vooom !
fmt = tex->ptt->format;
glBindTexture(GL_TEXTURE_2D, tex->ptt->texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (tex->gc->shared->info.unpack_row_length)
{
glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
_tex_sub_2d(tex->gc, u, tex->ty, EVAS_GL_TILE_SIZE, EVAS_GL_TILE_SIZE, fmt, tex->ptt->dataformat, out);
// Switch back to current texture
if (tex->ptt->texture != tex->gc->pipe[0].shader.cur_tex)
- {
- glBindTexture(GL_TEXTURE_2D, tex->gc->pipe[0].shader.cur_tex);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
- }
+ glBindTexture(GL_TEXTURE_2D, tex->gc->pipe[0].shader.cur_tex);
// Now prepare uploading the main texture before returning;
async = malloc(sizeof (Evas_GL_Texture_Async_Preload));
@@ -1453,21 +1403,15 @@ evas_gl_common_texture_alpha_update(Evas_GL_Texture *tex, DATA8 *pixels,
{
if (!tex->pt) return;
glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (tex->gc->shared->info.unpack_row_length)
{
glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
_tex_sub_2d(tex->gc, tex->x, tex->y, w, h, tex->pt->format,
tex->pt->dataformat, pixels);
if (tex->pt->texture != tex->gc->pipe[0].shader.cur_tex)
- {
- glBindTexture(GL_TEXTURE_2D, tex->gc->pipe[0].shader.cur_tex);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
- }
+ glBindTexture(GL_TEXTURE_2D, tex->gc->pipe[0].shader.cur_tex);
}
Evas_GL_Texture *
@@ -1560,11 +1504,9 @@ evas_gl_common_texture_rgb_a_pair_update(Evas_GL_Texture *tex,
if (!subimage || tex->gc->shared->info.unpack_row_length)
{
if (tex->gc->shared->info.unpack_row_length)
- {
- glPixelStorei(GL_UNPACK_ROW_LENGTH, w); GLERRLOG();
- }
- glPixelStorei(GL_UNPACK_ALIGNMENT, 1); GLERRLOG();
- glBindTexture(GL_TEXTURE_2D, tex->pt->texture); GLERRLOG();
+ glPixelStorei(GL_UNPACK_ROW_LENGTH, w);
+ glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+ glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
if (!_tex_2d(tex->gc, tex->pt->intformat, w, h, tex->pt->format, tex->pt->dataformat))
goto on_error;
if (upload)
@@ -1574,7 +1516,7 @@ evas_gl_common_texture_rgb_a_pair_update(Evas_GL_Texture *tex,
else
_tex_sub_2d(tex->gc, 0, 0, w, h, tex->pt->format, tex->pt->dataformat, data1);
}
- glBindTexture(GL_TEXTURE_2D, tex->pta->texture); GLERRLOG();
+ glBindTexture(GL_TEXTURE_2D, tex->pta->texture);
if (!_tex_2d(tex->gc, tex->pta->intformat, w, h, tex->pta->format, tex->pta->dataformat))
goto on_error;
if (upload)
@@ -1589,8 +1531,8 @@ evas_gl_common_texture_rgb_a_pair_update(Evas_GL_Texture *tex,
{
int y;
- glPixelStorei(GL_UNPACK_ALIGNMENT, 1); GLERRLOG();
- glBindTexture(GL_TEXTURE_2D, tex->pt->texture); GLERRLOG();
+ glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+ glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
if (!_tex_2d(tex->gc, tex->pt->intformat, w, h, tex->pt->format,
tex->pt->dataformat))
goto on_error;
@@ -1616,7 +1558,7 @@ evas_gl_common_texture_rgb_a_pair_update(Evas_GL_Texture *tex,
}
}
- glBindTexture(GL_TEXTURE_2D, tex->pta->texture); GLERRLOG();
+ glBindTexture(GL_TEXTURE_2D, tex->pta->texture);
if (!_tex_2d(tex->gc, tex->pta->intformat, w, h, tex->pta->format,
tex->pta->dataformat))
goto on_error;
@@ -1643,7 +1585,7 @@ evas_gl_common_texture_rgb_a_pair_update(Evas_GL_Texture *tex,
}
}
on_error:
- glBindTexture(GL_TEXTURE_2D, tex->gc->pipe[0].shader.cur_tex); GLERRLOG();
+ glBindTexture(GL_TEXTURE_2D, tex->gc->pipe[0].shader.cur_tex);
}
Evas_GL_Texture *
@@ -1701,25 +1643,18 @@ evas_gl_common_texture_yuv_update(Evas_GL_Texture *tex, DATA8 **rows, unsigned i
if (tex->gc->shared->info.unpack_row_length)
{
glPixelStorei(GL_UNPACK_ROW_LENGTH, rows[1] - rows[0]);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (!_tex_2d(tex->gc, tex->pt->intformat, w, h, tex->pt->format, tex->pt->dataformat))
return;
_tex_sub_2d(tex->gc, 0, 0, w, h, tex->pt->format, tex->pt->dataformat, rows[0]);
glBindTexture(GL_TEXTURE_2D, tex->ptu->texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glPixelStorei(GL_UNPACK_ROW_LENGTH, rows[h + 1] - rows[h]);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (!_tex_2d(tex->gc, tex->ptu->intformat, w / 2, h / 2, tex->ptu->format, tex->ptu->dataformat))
return;
_tex_sub_2d(tex->gc, 0, 0, w / 2, h / 2, tex->ptu->format, tex->ptu->dataformat, rows[h]);
glBindTexture(GL_TEXTURE_2D, tex->ptv->texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glPixelStorei(GL_UNPACK_ROW_LENGTH, rows[h + (h / 2) + 1] - rows[h + (h / 2)]);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (!_tex_2d(tex->gc, tex->ptv->intformat, w / 2, h / 2, tex->ptv->format, tex->ptv->dataformat))
return;
_tex_sub_2d(tex->gc, 0, 0, w / 2, h / 2, tex->ptv->format, tex->ptv->dataformat, rows[h + (h / 2)]);
@@ -1729,9 +1664,7 @@ evas_gl_common_texture_yuv_update(Evas_GL_Texture *tex, DATA8 **rows, unsigned i
unsigned int y;
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (!_tex_2d(tex->gc, tex->pt->intformat, w, h, tex->pt->format, tex->pt->dataformat))
return;
if ((rows[1] - rows[0]) == (int)w)
@@ -1743,7 +1676,6 @@ evas_gl_common_texture_yuv_update(Evas_GL_Texture *tex, DATA8 **rows, unsigned i
}
glBindTexture(GL_TEXTURE_2D, tex->ptu->texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (!_tex_2d(tex->gc, tex->ptu->intformat, w / 2, h / 2, tex->ptu->format, tex->ptu->dataformat))
return;
if ((rows[h + 1] - rows[h]) == (int)(w / 2))
@@ -1755,7 +1687,6 @@ evas_gl_common_texture_yuv_update(Evas_GL_Texture *tex, DATA8 **rows, unsigned i
}
glBindTexture(GL_TEXTURE_2D, tex->ptv->texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (!_tex_2d(tex->gc, tex->ptv->intformat, w / 2, h / 2, tex->ptv->format, tex->ptv->dataformat))
return;
if ((rows[h + (h / 2) + 1] - rows[h + (h / 2)]) == (int)(w / 2))
@@ -1767,10 +1698,7 @@ evas_gl_common_texture_yuv_update(Evas_GL_Texture *tex, DATA8 **rows, unsigned i
}
}
if (tex->pt->texture != tex->gc->pipe[0].shader.cur_tex)
- {
- glBindTexture(GL_TEXTURE_2D, tex->gc->pipe[0].shader.cur_tex);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
- }
+ glBindTexture(GL_TEXTURE_2D, tex->gc->pipe[0].shader.cur_tex);
}
static Evas_GL_Texture *
@@ -1910,9 +1838,7 @@ evas_gl_common_texture_yuy2_update(Evas_GL_Texture *tex, DATA8 **rows, unsigned
tex->ptuv = tex->double_buffer.ptuv[tex->double_buffer.source];
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (!_tex_2d(tex->gc, tex->pt->intformat, w, h, tex->pt->format, tex->pt->dataformat))
return;
if ((rows[1] - rows[0]) == (int)w * 4)
@@ -1924,7 +1850,6 @@ evas_gl_common_texture_yuy2_update(Evas_GL_Texture *tex, DATA8 **rows, unsigned
}
glBindTexture(GL_TEXTURE_2D, tex->ptuv->texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (!_tex_2d(tex->gc, tex->ptuv->intformat, w / 2, h, tex->ptuv->format, tex->ptuv->dataformat))
return;
#if 0
@@ -1942,10 +1867,7 @@ evas_gl_common_texture_yuy2_update(Evas_GL_Texture *tex, DATA8 **rows, unsigned
}
if (tex->pt->texture != tex->gc->pipe[0].shader.cur_tex)
- {
- glBindTexture(GL_TEXTURE_2D, tex->gc->pipe[0].shader.cur_tex);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
- }
+ glBindTexture(GL_TEXTURE_2D, tex->gc->pipe[0].shader.cur_tex);
}
void
@@ -1961,18 +1883,13 @@ evas_gl_common_texture_nv12_update(Evas_GL_Texture *tex, DATA8 **rows, unsigned
if (tex->gc->shared->info.unpack_row_length)
{
glPixelStorei(GL_UNPACK_ROW_LENGTH, rows[1] - rows[0]);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (!_tex_2d(tex->gc, tex->pt->intformat, w, h, tex->pt->format, tex->pt->dataformat))
return;
_tex_sub_2d(tex->gc, 0, 0, w, h, tex->pt->format, tex->pt->dataformat, rows[0]);
glBindTexture(GL_TEXTURE_2D, tex->ptuv->texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glPixelStorei(GL_UNPACK_ROW_LENGTH, rows[h + 1] - rows[h]);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (!_tex_2d(tex->gc, tex->ptuv->intformat, w / 2, h / 2, tex->ptuv->format, tex->ptuv->dataformat))
return;
_tex_sub_2d(tex->gc, 0, 0, w / 2, h / 2, tex->ptuv->format, tex->ptuv->dataformat, rows[h]);
@@ -1982,9 +1899,7 @@ evas_gl_common_texture_nv12_update(Evas_GL_Texture *tex, DATA8 **rows, unsigned
unsigned int y;
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (!_tex_2d(tex->gc, tex->pt->intformat, w, h, tex->pt->format, tex->pt->dataformat))
return;
if ((rows[1] - rows[0]) == (int)w)
@@ -1996,7 +1911,6 @@ evas_gl_common_texture_nv12_update(Evas_GL_Texture *tex, DATA8 **rows, unsigned
}
glBindTexture(GL_TEXTURE_2D, tex->ptuv->texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (!_tex_2d(tex->gc, tex->ptuv->intformat, w / 2, h / 2, tex->ptuv->format, tex->ptuv->dataformat))
return;
if ((rows[h + 1] - rows[h]) == (int)(w / 2))
@@ -2008,10 +1922,7 @@ evas_gl_common_texture_nv12_update(Evas_GL_Texture *tex, DATA8 **rows, unsigned
}
}
if (tex->pt->texture != tex->gc->pipe[0].shader.cur_tex)
- {
- glBindTexture(GL_TEXTURE_2D, tex->gc->pipe[0].shader.cur_tex);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
- }
+ glBindTexture(GL_TEXTURE_2D, tex->gc->pipe[0].shader.cur_tex);
}
void
@@ -2169,10 +2080,7 @@ evas_gl_common_texture_nv12tiled_update(Evas_GL_Texture *tex, DATA8 **rows, unsi
#endif
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
-
glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
// We are telling the driver to not swizzle back the buffer as we are going to replace all pixel
if (!_tex_2d(tex->gc, tex->pt->intformat, w, h, tex->pt->format, tex->pt->dataformat))
@@ -2220,7 +2128,6 @@ evas_gl_common_texture_nv12tiled_update(Evas_GL_Texture *tex, DATA8 **rows, unsi
}
glBindTexture(GL_TEXTURE_2D, tex->ptuv->texture);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
if (!_tex_2d(tex->gc, tex->ptuv->intformat, w, h, tex->ptuv->format, tex->ptuv->dataformat))
return;
diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c b/src/modules/evas/engines/gl_drm/evas_engine.c
index 4c6bf7452b..d20f9009af 100644
--- a/src/modules/evas/engines/gl_drm/evas_engine.c
+++ b/src/modules/evas/engines/gl_drm/evas_engine.c
@@ -891,7 +891,6 @@ _native_cb_bind(void *data EINA_UNUSED, void *image)
else if (n->ns.type == EVAS_NATIVE_SURFACE_OPENGL)
{
glBindTexture(GL_TEXTURE_2D, n->ns.data.opengl.texture_id);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
}
@@ -907,12 +906,10 @@ _native_cb_unbind(void *data EINA_UNUSED, void *image)
if (n->ns.type == EVAS_NATIVE_SURFACE_WL)
{
//glBindTexture(GL_TEXTURE_2D, 0); //really need?
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
else if (n->ns.type == EVAS_NATIVE_SURFACE_OPENGL)
{
glBindTexture(GL_TEXTURE_2D, 0);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
}
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index 082ac0d921..6feec3965a 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -237,10 +237,7 @@ _native_bind_cb(void *data EINA_UNUSED, void *image)
Evas_Native_Surface *n = im->native.data;
if (n->type == EVAS_NATIVE_SURFACE_OPENGL)
- {
- glBindTexture(GL_TEXTURE_2D, n->data.opengl.texture_id);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
- }
+ glBindTexture(GL_TEXTURE_2D, n->data.opengl.texture_id);
}
static void
@@ -250,10 +247,7 @@ _native_unbind_cb(void *data EINA_UNUSED, void *image)
Evas_Native_Surface *n = im->native.data;
if (n->type == EVAS_NATIVE_SURFACE_OPENGL)
- {
- glBindTexture(GL_TEXTURE_2D, 0);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
- }
+ glBindTexture(GL_TEXTURE_2D, 0);
}
static void
@@ -583,7 +577,7 @@ eng_image_data_get(void *data, void *image, int to_write, DATA32 **image_data, i
if (!im->tex->pt->dyn.data)
{
if (err) *err = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+ GLERRV("secsym_eglMapImageSEC");
return im;
}
im->tex->pt->dyn.checked_out++;
@@ -1343,6 +1337,7 @@ eng_gl_surface_read_pixels(void *data, void *surface,
*/
glsym_glBindFramebuffer(GL_FRAMEBUFFER, im->tex->pt->fb);
+ GLERRV("glsym_glBindFramebuffer");
if (im->tex->pt->format == GL_BGRA)
glReadPixels(x, y, w, h, GL_BGRA, GL_UNSIGNED_BYTE, pixels);
else
@@ -1360,6 +1355,7 @@ eng_gl_surface_read_pixels(void *data, void *surface,
}
}
glsym_glBindFramebuffer(GL_FRAMEBUFFER, 0);
+ GLERRV("glsym_glBindFramebuffer");
return EINA_TRUE;
}
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c
index cdbe5d297d..26bcd32be7 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -1743,7 +1743,7 @@ eng_preload_make_current(void *data, void *doit)
{
ERR("glXMakeContextCurrent(%p, %p, %p) failed",
ob->info->info.display, (void *)ob->win, (void *)ob->context);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+ GLERRV("__glXMakeContextCurrent");
return EINA_FALSE;
}
#endif
@@ -1758,7 +1758,7 @@ eng_preload_make_current(void *data, void *doit)
{
ERR("glXMakeContextCurrent(%p, None, NULL) failed",
ob->info->info.display);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+ GLERRV("__glXMakeContextCurrent");
return EINA_FALSE;
}
#endif
@@ -1888,7 +1888,7 @@ _native_bind_cb(void *data EINA_UNUSED, void *image)
{
glsym_glXBindTexImage(eng_get_ob(re)->disp, n->glx_pixmap,
GLX_FRONT_LEFT_EXT, NULL);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+ GLERRV("glsym_glXBindTexImage");
}
else
ERR("Try glXBindTexImage on GLX with no support");
@@ -1898,7 +1898,6 @@ _native_bind_cb(void *data EINA_UNUSED, void *image)
else if (n->ns.type == EVAS_NATIVE_SURFACE_OPENGL)
{
glBindTexture(GL_TEXTURE_2D, n->ns.data.opengl.texture_id);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
else if (n->ns.type == EVAS_NATIVE_SURFACE_TBM)
{
@@ -1936,7 +1935,6 @@ _native_unbind_cb(void *data EINA_UNUSED, void *image)
{
glsym_glXReleaseTexImage(eng_get_ob(re)->disp, n->glx_pixmap,
GLX_FRONT_LEFT_EXT);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
else
ERR("Try glXReleaseTexImage on GLX with no support");
@@ -1946,7 +1944,6 @@ _native_unbind_cb(void *data EINA_UNUSED, void *image)
else if (n->ns.type == EVAS_NATIVE_SURFACE_OPENGL)
{
glBindTexture(GL_TEXTURE_2D, 0);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
else if (n->ns.type == EVAS_NATIVE_SURFACE_TBM)
{
@@ -1993,7 +1990,6 @@ _native_free_cb(void *data, void *image)
{
glsym_glXReleaseTexImage(eng_get_ob(re)->disp, n->glx_pixmap,
GLX_FRONT_LEFT_EXT);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
else
ERR("Try glXReleaseTexImage on GLX with no support");
@@ -2001,7 +1997,7 @@ _native_free_cb(void *data, void *image)
if (glsym_glXDestroyPixmap)
{
glsym_glXDestroyPixmap(eng_get_ob(re)->disp, n->glx_pixmap);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
+ GLERRV("glsym_glXDestroyPixmap");
}
else
ERR("Try glXDestroyPixmap on GLX with no support");
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c
index ab8a9c2524..df4aa542e5 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
@@ -791,7 +791,6 @@ _native_cb_bind(void *data EINA_UNUSED, void *image)
if (n->ns.type == EVAS_NATIVE_SURFACE_OPENGL)
{
glBindTexture(GL_TEXTURE_2D, n->ns.data.opengl.texture_id);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
}
@@ -807,7 +806,6 @@ _native_cb_unbind(void *data EINA_UNUSED, void *image)
if (n->ns.type == EVAS_NATIVE_SURFACE_OPENGL)
{
glBindTexture(GL_TEXTURE_2D, 0);
- GLERR(__FUNCTION__, __FILE__, __LINE__, "");
}
}
View Lorry Controller Status