diff options
author | Kenneth Graunke <[email protected]> | 2011-10-17 16:41:57 -0700 |
---|---|---|
committer | Kenneth Graunke <[email protected]> | 2011-10-25 16:25:39 -0700 |
commit | 7a86bf816c3eb977a5d7e558e85f00f8f2b9868a (patch) | |
tree | 99dc18f9053c32d8feb2f4bf593e73aedd5a7545 /src/mesa/main | |
parent | 00ddc7ea47fdae09ca154d8b3a15c6f9a4926d68 (diff) |
mesa: Remove unnecessary and incorrect TexEnv parameter validation.
For GL_RGB_SCALE and GL_ALPHA_SCALE targets, the API wrapper code
attempts to ensure the parameter is 1.0, 2.0, or 4.0.
This is unnecessary: set_combiner_scale in texenv.c (called by
_mesa_TexEnvfv) already checks this and raises an appropriate error.
It's also incorrect: For glTexEnvx, the API validation code directly
compares the GLfixed input parameter with a floating point constant,
prior to converting fixed-point to floating point.
Fixes an issue in the OpenGL ES 1.1 conformance suite.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa/main')
-rw-r--r-- | src/mesa/main/APIspec.xml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml index 574480e284d..a92bb437c91 100644 --- a/src/mesa/main/APIspec.xml +++ b/src/mesa/main/APIspec.xml @@ -631,12 +631,6 @@ <desc name="pname"> <value name="GL_RGB_SCALE"/> <value name="GL_ALPHA_SCALE"/> - - <desc name="param" convert="true" error="GL_INVALID_VALUE"> - <value name="1.0"/> - <value name="2.0"/> - <value name="4.0"/> - </desc> </desc> <desc name="pname"> |