On 05/24/2013 01:56 PM, Eric Anholt wrote:

s/intle/intel/ in the title.

This is just in case someone else trips over this due to our weird reuse
of this code in glBlitFramebuffer().
---
  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 94e90da..4a13b9a 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",


_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to