From: Eric Anholt <eric@anholt.net>
Date: Fri, 24 May 2013 20:37:13 +0000 (-0700)
Subject: intel: Add an assert for glCopyTexSubImage() being called on MSAA buffers.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=045612c90e53cd3c4e46c203b982f376d21ab13d;p=mesa.git

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 <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Paul Berry <stereotype441@gmail.com>
---

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",