enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 13 Pull Requests 2 Projects Releases Wiki Activity

oops fix erro check. 

SVN revision: 46234
This commit is contained in:
Carsten Haitzler 2010-02-17 04:30:58 +00:00
parent dc8fdf5e3a
commit c474d55267
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
legacy/evas/src/modules/engines/gl_common/evas_gl_common.h
View File

@ -255,7 +255,7 @@ extern Evas_GL_Program_Source shader_yuv_vert_src;
extern Evas_GL_Program_Source shader_tex_frag_src; extern Evas_GL_Program_Source shader_tex_frag_src;
extern Evas_GL_Program_Source shader_tex_vert_src; extern Evas_GL_Program_Source shader_tex_vert_src;
void glerr(const char *file, const char *func, int line, const char *op); void glerr(int err, const char *file, const char *func, int line, const char *op);
Evas_GL_Context *evas_gl_common_context_new(void); Evas_GL_Context *evas_gl_common_context_new(void);
void evas_gl_common_context_free(Evas_GL_Context *gc); void evas_gl_common_context_free(Evas_GL_Context *gc);
@ -343,7 +343,11 @@ void (*glsym_glDeleteFramebuffers) (GLsizei a, const GLuint *b);
#define GL_ERRORS 1 #define GL_ERRORS 1
#ifdef GL_ERRORS #ifdef GL_ERRORS
# define GLERR(fn, fl, ln, op) if (glGetError()) glerr(fn, fl, ln, op) # define GLERR(fn, fl, ln, op) \
{ \
int __gl_err = glGetError(); \
if (__gl_err != GL_NO_ERROR) glerr(__gl_err, fn, fl, ln, op); \
}
#else #else
# define GLERR(fn, fl, ln, op) # define GLERR(fn, fl, ln, op)
#endif #endif

38
legacy/evas/src/modules/engines/gl_common/evas_gl_context.c
View File

@ -53,29 +53,25 @@ static Evas_GL_Context *_evas_gl_common_context = NULL;
static Evas_GL_Shared *shared = NULL; static Evas_GL_Shared *shared = NULL;
void void
glerr(const char *file, const char *func, int line, const char *op) glerr(int err, const char *file, const char *func, int line, const char *op)
{ {
GLenum err = glGetError(); fprintf(stderr, "GLERR: %s:%i %s(), %s: ", file, line, func, op);
if (err != GL_NO_ERROR) switch (err)
{ {
fprintf(stderr, "GLERR: %s:%i %s(), %s: ", file, line, func, op); case GL_INVALID_ENUM:
switch (err) fprintf(stderr, "GL_INVALID_ENUM\n");
{ break;
case GL_INVALID_ENUM: case GL_INVALID_VALUE:
fprintf(stderr, "GL_INVALID_ENUM\n"); fprintf(stderr, "GL_INVALID_VALUE\n");
break; break;
case GL_INVALID_VALUE: case GL_INVALID_OPERATION:
fprintf(stderr, "GL_INVALID_VALUE\n"); fprintf(stderr, "GL_INVALID_OPERATION\n");
break; break;
case GL_INVALID_OPERATION: case GL_OUT_OF_MEMORY:
fprintf(stderr, "GL_INVALID_OPERATION\n"); fprintf(stderr, "GL_OUT_OF_MEMORY\n");
break; break;
case GL_OUT_OF_MEMORY: default:
fprintf(stderr, "GL_OUT_OF_MEMORY\n"); fprintf(stderr, "0x%x\n", err);
break;
default:
fprintf(stderr, "0x%x\n", err);
}
} }
} }