Module: Mesa Branch: 9.2 Commit: 26ffbf6f391542b40c4ffe9b08f5cdc88efe18c9 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=26ffbf6f391542b40c4ffe9b08f5cdc88efe18c9
Author: Eric Anholt <[email protected]> Date: Thu Sep 19 08:45:07 2013 -0700 i965: Reenable glBitmap() after the sRGB winsys enabling. The format of the window system framebuffer changed from ARGB8888 to SARGB8, but we're still supposed to render to it the same as ARGB8888 unless the user flipped the GL_FRAMEBUFFER_SRGB switch. Reviewed-by: Kenneth Graunke <[email protected]> NOTE: This is a candidate for stable branches. (cherry picked from commit 48b9720272184d884b21524ae0b5318d42019793) --- src/mesa/drivers/dri/i965/intel_pixel_bitmap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c b/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c index 5398cb8..91f21a3 100644 --- a/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c +++ b/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c @@ -25,6 +25,7 @@ * **************************************************************************/ +#include "main/blend.h" #include "main/glheader.h" #include "main/enums.h" #include "main/image.h" @@ -227,7 +228,7 @@ do_blit_bitmap( struct gl_context *ctx, UNCLAMPED_FLOAT_TO_UBYTE(ubcolor[2], tmpColor[2]); UNCLAMPED_FLOAT_TO_UBYTE(ubcolor[3], tmpColor[3]); - switch (irb->mt->format) { + switch (_mesa_get_render_format(ctx, intel_rb_format(irb))) { case MESA_FORMAT_ARGB8888: case MESA_FORMAT_XRGB8888: color = PACK_COLOR_8888(ubcolor[3], ubcolor[0], ubcolor[1], ubcolor[2]); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
