mesa: Don't call driver RenderTexture for invalid zoffset
authorIan Romanick <ian.d.romanick@intel.com>
Sat, 27 Jul 2013 19:16:56 +0000 (12:16 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Tue, 6 Aug 2013 19:18:42 +0000 (12:18 -0700)
This fixes the segfault in the 'invalid slice of 3D texture' and
'invalid layer of an array texture' subtests of piglit's fbo-incomplete
test.

The 'invalid layer of an array texture' subtest still fails.

v2: Fix off-by-one comparison error noticed by Chris Forbes.  Also,
1D_ARRAY textures have Depth == 1.  Instead, compare against Height.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> [v1]
Cc: "9.1 9.2" mesa-stable@lists.freedesktop.org
src/mesa/main/fbobject.c

index 8f70a20f14bc4fff1eaed65386fd7a229c540c06..06cc586c431451391b7b3af67f787e5d813e80b0 100644 (file)
@@ -355,6 +355,12 @@ driver_RenderTexture_is_safe(const struct gl_renderbuffer_attachment *att)
    if (texImage->Width == 0 || texImage->Height == 0 || texImage->Depth == 0)
       return false;
 
+   if ((texImage->TexObject->Target == GL_TEXTURE_1D_ARRAY
+        && att->Zoffset >= texImage->Height)
+       || (texImage->TexObject->Target != GL_TEXTURE_1D_ARRAY
+           && att->Zoffset >= texImage->Depth))
+      return false;
+
    return true;
 }