mesa: fix error checking for getting zero-sized texture images
authorIlia Mirkin <imirkin@alum.mit.edu>
Fri, 24 Jul 2015 00:18:57 +0000 (20:18 -0400)
committerIlia Mirkin <imirkin@alum.mit.edu>
Fri, 24 Jul 2015 21:09:27 +0000 (17:09 -0400)
commitf8059c9f3fdd270370737c9eff369eb6d14caa0b
tree0e18481d7fa035bc08d654543d7543261b1a2ca7
parent56980f107ef64d0a5bfc5d292cc891661e47d0f0
mesa: fix error checking for getting zero-sized texture images

Commit 17f714836 (mesa: rearrange texture error checking order) moved
the width/height/depth == 0 allowance before checking if the image was
there. This was in part due to depth having to be == 1 for 2D images and
width having to be == 1 for 1D images. Instead relax the height/depth
checks to also accept 0 as valid.

With this change,

  bin/arb_direct_state_access-get-textures

starts passing again.

Fixes: 17f714836 (mesa: rearrange texture error checking order)
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Brian Paul <brianp@vmware.com>
src/mesa/main/texgetimage.c