From f34764ea5308221dc35479bd118142a0e249049c Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Wed, 27 Jun 2012 16:16:26 -0700 Subject: msaa: Make meta-ops save and restore state of GL_MULTISAMPLE. The meta-ops _mesa_meta_Clear() and _mesa_meta_glsl_Clear() need to ignore the state of GL_SAMPLE_ALPHA_TO_COVERAGE, GL_SAMPLE_ALPHA_TO_ONE, GL_SAMPLE_COVERAGE, GL_SAMPLE_COVERAGE_VALUE, and GL_SAMPLE_COVERAGE_INVERT when clearing multisampled buffers. The easiest way to accomplish this is to disable GL_MULTISAMPLE during the clear meta-ops. Note: this patch also causes GL_MULTISAMPLE to be disabled during _mesa_meta_GenerateMipmap() and _mesa_meta_GetTexImage() (since those two meta-ops use MESA_META_ALL). Arguably this isn't strictly necessary, since those meta-ops use their own non-MSAA fbo's, but it shouldn't do any harm. Fixes Piglit tests "EXT_framebuffer_multisample/clear {2,4} {color,stencil}" on i965. Reviewed-by: Brian Paul Reviewed-by: Anuj Phogat Reviewed-by: Chad Versace --- src/mesa/drivers/common/meta.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/mesa/drivers/common/meta.h') diff --git a/src/mesa/drivers/common/meta.h b/src/mesa/drivers/common/meta.h index 7a80b1dde4d..d8dfb56f9b1 100644 --- a/src/mesa/drivers/common/meta.h +++ b/src/mesa/drivers/common/meta.h @@ -55,6 +55,7 @@ #define MESA_META_CONDITIONAL_RENDER 0x20000 #define MESA_META_CLIP 0x40000 #define MESA_META_SELECT_FEEDBACK 0x80000 +#define MESA_META_MULTISAMPLE 0x100000 /**\}*/ extern void -- cgit v1.2.3