diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2012-07-27 15:57:09 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2012-08-29 15:09:35 -0700 |
| commit | 8df3f9bd5f7626a4548e9901c0b7af33a21af8a6 (patch) | |
| tree | 81092633783eba82550e6a0273af7e2591952c3c /src/mesa/main/es1_conversion.c | |
| parent | 9555d7bdc1cec4cf08be85a2d1e9095de8dd3771 (diff) | |
| download | external_mesa3d-8df3f9bd5f7626a4548e9901c0b7af33a21af8a6.zip external_mesa3d-8df3f9bd5f7626a4548e9901c0b7af33a21af8a6.tar.gz external_mesa3d-8df3f9bd5f7626a4548e9901c0b7af33a21af8a6.tar.bz2 | |
mesa/es: Validate glGetMaterial pname in Mesa code rather than the ES wrapper
Fixes a bug that glGetMaterial[fx]v in ES1 contexts would (try to) allow
queries of GL_AMBIENT_AND_DIFFUSE. This enum can only be used in glMaterial,
not in the get.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/mesa/main/es1_conversion.c')
| -rw-r--r-- | src/mesa/main/es1_conversion.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mesa/main/es1_conversion.c b/src/mesa/main/es1_conversion.c index c1d7b83..c1bcfbe 100644 --- a/src/mesa/main/es1_conversion.c +++ b/src/mesa/main/es1_conversion.c @@ -293,7 +293,6 @@ _es_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params) break; case GL_AMBIENT: case GL_DIFFUSE: - case GL_AMBIENT_AND_DIFFUSE: case GL_SPECULAR: case GL_EMISSION: n_params = 4; |