blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

OpenGL: fix FBO error messages 

Old code had a mix of framebuffer error codes from OpenGL ES, EXT_framebuffer_object, and desktop GL. We use desktop GL (or ARB_framebuffer_object which acts just like GL 3.x) so I made it compatible with that.

Changed messages to the actual GL_FRAMEBUFFER_XXX symbols. These are less friendly and more accurate. Can easily look up what an error means, unfiltered by what a Blender dev thinks it means.

Kept ES error codes around in case we support that one day. Just flip the #if or use a compile-time option.
This commit is contained in:
Mike Erwin 2016-08-08 18:02:40 -04:00
parent 39259fc8ab
commit 9893153799
1 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
source/blender/gpu/intern/gpu_framebuffer.c
View File

@ -54,44 +54,37 @@ struct GPUFrameBuffer {
static void GPU_print_framebuffer_error(GLenum status, char err_out[256])
{
const char *format = "GPUFrameBuffer: framebuffer status %s";
const char *err = "unknown";
#define format_status(X) \
case GL_FRAMEBUFFER_##X: err = "GL_FRAMEBUFFER_"#X; \
break;
switch (status) {
case GL_FRAMEBUFFER_COMPLETE:
break;
case GL_INVALID_OPERATION:
err = "Invalid operation";
break;
case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
err = "Incomplete attachment";
break;
case GL_FRAMEBUFFER_UNSUPPORTED:
err = "Unsupported framebuffer format";
break;
case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
err = "Missing attachment";
break;
case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS:
err = "Attached images must have same dimensions";
break;
case GL_FRAMEBUFFER_INCOMPLETE_FORMATS:
err = "Attached images must have same format";
break;
case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER:
err = "Missing draw buffer";
break;
case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER:
err = "Missing read buffer";
break;
/* success */
format_status(COMPLETE)
/* errors shared by OpenGL desktop & ES */
format_status(INCOMPLETE_ATTACHMENT)
format_status(INCOMPLETE_MISSING_ATTACHMENT)
format_status(UNSUPPORTED)
#if 0 /* for OpenGL ES only */
format_status(INCOMPLETE_DIMENSIONS)
#else /* for desktop GL only */
format_status(INCOMPLETE_DRAW_BUFFER)
format_status(INCOMPLETE_READ_BUFFER)
format_status(INCOMPLETE_MULTISAMPLE)
format_status(UNDEFINED)
#endif
}
#undef format_status
if (err_out) {
BLI_snprintf(err_out, 256, "GPUFrameBuffer: framebuffer incomplete error %d '%s'",
(int)status, err);
BLI_snprintf(err_out, 256, format, err);
}
else {
fprintf(stderr, "GPUFrameBuffer: framebuffer incomplete error %d '%s'\n",
(int)status, err);
fprintf(stderr, format, err);
}
}