diff options
| author | Ian Romanick <[email protected]> | 2013-07-27 12:16:56 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2013-08-06 12:18:42 -0700 |
| commit | 41485fea7c6061cca9d2706f39fa425da291b260 (patch) | |
| tree | a867716275aefd0dac647750d56f26746b5d9015 /src/mesa | |
| parent | fb49713f8ed099559d255403dc1065a06305e0d8 (diff) | |
mesa: Don't call driver RenderTexture for invalid zoffset
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 <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]> [v1]
Cc: "9.1 9.2" [email protected]
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/fbobject.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index 8f70a20f14b..06cc586c431 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -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; } |