mesa: Fix incorrect assertion in init_teximage_fields_ms
authorIago Toral Quiroga <itoral@igalia.com>
Fri, 28 Nov 2014 09:03:56 +0000 (10:03 +0100)
committerIago Toral Quiroga <itoral@igalia.com>
Mon, 12 Jan 2015 10:20:27 +0000 (11:20 +0100)
commit3473a84fb2c2cdab0bcecb43fbf519d9b3fc0142
treed281dd826b2f19bb85779d3e9c880d6be3442c50
parentb2b39ce2578870e87b892d603ad68b872c54d2ba
mesa: Fix incorrect assertion in init_teximage_fields_ms

_BaseFormat is a GLenum (unsigned int) so testing if its value is
greater than 0 to detect the cases where _mesa_base_tex_format
returns -1 doesn't work.

Fixing the assertion breaks the arb_texture_view-lifetime-format
piglit test on nouveau, since that test calls
_mesa_base_tex_format with GL_R16F with a context that does not
have ARB_texture_float, so it returns -1 for the BaseFormat, which
was not being caught properly by the ASSERT in init_teximage_fields_ms
until now.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
src/mesa/main/teximage.c