From d714b20eb4617f24b496a09028a90fdd8c19b5bd Mon Sep 17 00:00:00 2001 From: Anuj Phogat Date: Wed, 19 Mar 2014 11:55:50 -0700 Subject: i965: Fix crash in do_blit_readpixels() Fixes a crash in Khronos CTS packed_pixels tests. Cc: Signed-off-by: Anuj Phogat Reviewed-by: Ian Romanick --- src/mesa/drivers/dri/i965/intel_pixel_read.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/mesa/drivers/dri/i965') diff --git a/src/mesa/drivers/dri/i965/intel_pixel_read.c b/src/mesa/drivers/dri/i965/intel_pixel_read.c index 600d288994b..8cd7579142a 100644 --- a/src/mesa/drivers/dri/i965/intel_pixel_read.c +++ b/src/mesa/drivers/dri/i965/intel_pixel_read.c @@ -34,6 +34,7 @@ #include "main/bufferobj.h" #include "main/readpix.h" #include "main/state.h" +#include "main/glformats.h" #include "brw_context.h" #include "intel_screen.h" @@ -89,6 +90,12 @@ do_blit_readpixels(struct gl_context * ctx, struct gl_renderbuffer *rb = ctx->ReadBuffer->_ColorReadBuffer; struct intel_renderbuffer *irb = intel_renderbuffer(rb); + /* Currently this function only supports reading from color buffers. */ + if (!_mesa_is_color_format(format)) + return false; + + assert(irb != NULL); + if (ctx->_ImageTransferState || !_mesa_format_matches_format_and_type(irb->mt->format, format, type, false)) { -- cgit v1.2.3