From 045612c90e53cd3c4e46c203b982f376d21ab13d Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 24 May 2013 13:37:13 -0700 Subject: intel: Add an assert for glCopyTexSubImage() being called on MSAA buffers. This is just in case someone else trips over this due to our weird reuse of this code in glBlitFramebuffer(). Reviewed-and-tested-by: Ian Romanick Reviewed-by: Kenneth Graunke Acked-by: Paul Berry --- src/mesa/drivers/dri/intel/intel_tex_copy.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/mesa/drivers/dri/intel/intel_tex_copy.c b/src/mesa/drivers/dri/intel/intel_tex_copy.c index 94e90da5eaa..4a13b9ae2c2 100644 --- a/src/mesa/drivers/dri/intel/intel_tex_copy.c +++ b/src/mesa/drivers/dri/intel/intel_tex_copy.c @@ -62,6 +62,12 @@ intel_copy_texsubimage(struct intel_context *intel, intel_prepare_render(intel); + /* glCopyTexSubImage() can't be called on multisampled renderbuffers or + * textures. + */ + assert(!irb->Base.Base.NumSamples); + assert(!intelImage->base.Base.NumSamples); + if (!intelImage->mt || !irb || !irb->mt) { if (unlikely(INTEL_DEBUG & DEBUG_PERF)) fprintf(stderr, "%s fail %p %p (0x%08x)\n", -- cgit v1.2.3