diff options
author | Eduardo Lima Mitev <[email protected]> | 2015-09-24 10:57:41 +0200 |
---|---|---|
committer | Jason Ekstrand <[email protected]> | 2015-09-28 11:39:53 -0700 |
commit | 15ab968f62dd322ecda6d70b1069f52616fe39bb (patch) | |
tree | ef63dbdcecc27d32eb77255611f0dde50d8a7dea /src/mesa/main/texcompress_s3tc.c | |
parent | 7cdd818d2ae82f0cc81ebbc58ae6c95e6d649ba2 (diff) |
mesa: Fix order of format+type and internal format checks for glTexImageXD ops
The more specific GLES constrains should be checked after the general
validation performed by _mesa_error_check_format_and_type(). This is also
for consistency with the error checks order of glTexSubImage ops.
v3: The change of order uncovered a bug that regresses a couple of piglit
tests written against OpenGL-ES 1.1 spec, which expects an INVALID_VALUE
instead of the INVALID_ENUM returned by _mesa_error_check_format_and_type()
when an invalid format is passed to glTexImage2D. This version of the patch
accounts for those cases.
Fixes 1 dEQP test:
* dEQP-GLES3.functional.negative_api.texture.teximage2d
Cc: "11.0" <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
Tested-by: Mark Janes <[email protected]>
Diffstat (limited to 'src/mesa/main/texcompress_s3tc.c')
0 files changed, 0 insertions, 0 deletions