summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Monakov <[email protected]>2015-06-09 20:58:22 +0300
committerKenneth Graunke <[email protected]>2015-06-11 00:15:37 -0700
commitbd38f91f8d80897ca91979962d80d4bc0acef586 (patch)
tree290133d478d675818c65f6e616150541ebb76857
parentf9a18acb56c69b24c1e47cd326dc98e14fadcf94 (diff)
i965: do_blit_drawpixels: decode array formats
Correct a regression introduced by commit 922c0c9fd526 by converting "array format", if received from _mesa_format_from_format_and_type, to mesa_format. References: https://bugs.freedesktop.org/show_bug.cgi?id=90839 Signed-off-by: Alexander Monakov <[email protected]> Tested-by: AnAkkk <[email protected]> Reviewed-by: Jason Ekstrand <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Cc: [email protected]
-rw-r--r--src/mesa/drivers/dri/i965/intel_pixel_draw.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_pixel_draw.c b/src/mesa/drivers/dri/i965/intel_pixel_draw.c
index d68cbb6e401..189a592d8d2 100644
--- a/src/mesa/drivers/dri/i965/intel_pixel_draw.c
+++ b/src/mesa/drivers/dri/i965/intel_pixel_draw.c
@@ -78,6 +78,8 @@ do_blit_drawpixels(struct gl_context * ctx,
struct intel_renderbuffer *irb = intel_renderbuffer(rb);
mesa_format src_format = _mesa_format_from_format_and_type(format, type);
+ if (_mesa_format_is_mesa_array_format(src_format))
+ src_format = _mesa_format_from_array_format(src_format);
mesa_format dst_format = irb->mt->format;
/* We can safely discard sRGB encode/decode for the DrawPixels interface */