Module: Mesa Branch: master Commit: f8e7aa2827e2bdb1ed238cbdd351be3c8a6e9b12 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f8e7aa2827e2bdb1ed238cbdd351be3c8a6e9b12
Author: Jordan Justen <[email protected]> Date: Sat Jan 12 01:11:21 2013 -0800 framebuffer: update allowed implementation format/type Allow additional format/type combinations based on the color render buffer to fix failures with gles3-gtf. Reviewed-by: Ian Romanick <[email protected]> Signed-off-by: Jordan Justen <[email protected]> --- src/mesa/main/framebuffer.c | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c index 8cbfbd6..0597de2 100644 --- a/src/mesa/main/framebuffer.c +++ b/src/mesa/main/framebuffer.c @@ -871,13 +871,20 @@ _mesa_dest_buffer_exists(struct gl_context *ctx, GLenum format) GLenum _mesa_get_color_read_format(struct gl_context *ctx) { + const GLenum data_type = _mesa_get_format_datatype( + ctx->ReadBuffer->_ColorReadBuffer->Format); + switch (ctx->ReadBuffer->_ColorReadBuffer->Format) { case MESA_FORMAT_ARGB8888: return GL_BGRA; case MESA_FORMAT_RGB565: return GL_BGR; default: - return GL_RGBA; + if (data_type == GL_UNSIGNED_INT || data_type == GL_INT) { + return GL_RGBA_INTEGER; + } else { + return GL_RGBA; + } } } @@ -888,12 +895,25 @@ _mesa_get_color_read_format(struct gl_context *ctx) GLenum _mesa_get_color_read_type(struct gl_context *ctx) { + const GLenum data_type = _mesa_get_format_datatype( + ctx->ReadBuffer->_ColorReadBuffer->Format); + switch (ctx->ReadBuffer->_ColorReadBuffer->Format) { - case MESA_FORMAT_ARGB8888: - return GL_UNSIGNED_BYTE; case MESA_FORMAT_RGB565: return GL_UNSIGNED_SHORT_5_6_5_REV; default: + break; + } + + switch (data_type) { + case GL_SIGNED_NORMALIZED: + return GL_BYTE; + case GL_UNSIGNED_INT: + case GL_INT: + case GL_FLOAT: + return data_type; + case GL_UNSIGNED_NORMALIZED: + default: return GL_UNSIGNED_BYTE; } } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
