KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa/es: Remove redundant min/mag filter validation 

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Ian Romanick 2011-10-03 13:05:47 -07:00
parent 926a4a922f
commit 27e55805fb
2 changed files with 4 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/mesa/main/APIspec.xml
View File

@ -304,27 +304,10 @@
</desc>
</desc>
<desc name="pname">
<value name="GL_TEXTURE_MIN_FILTER"/>
<desc name="param">
<value name="GL_NEAREST"/>
<value name="GL_LINEAR"/>
<value name="GL_NEAREST_MIPMAP_NEAREST"/>
<value name="GL_NEAREST_MIPMAP_LINEAR"/>
<value name="GL_LINEAR_MIPMAP_NEAREST"/>
<value name="GL_LINEAR_MIPMAP_LINEAR"/>
</desc>
</desc>
<desc name="pname">
<value name="GL_TEXTURE_MAG_FILTER"/>
<desc name="param">
<value name="GL_NEAREST"/>
<value name="GL_LINEAR"/>
</desc>
</desc>
<desc name="pname">
<value name="GL_TEXTURE_MIN_FILTER"/>
<value name="GL_TEXTURE_MAG_FILTER"/>
</desc>
<desc name="pname" category="GLES1.1">
<value name="GL_GENERATE_MIPMAP"/>

25
src/mesa/main/es1_conversion.c
View File

@ -1376,19 +1376,7 @@ _es_TexParameterx(GLenum target, GLenum pname, GLfixed param)
convert_param_value = false;
break;
case GL_TEXTURE_MIN_FILTER:
if (param != GL_NEAREST && param != GL_LINEAR && param != GL_NEAREST_MIPMAP_NEAREST && param != GL_NEAREST_MIPMAP_LINEAR && param != GL_LINEAR_MIPMAP_NEAREST && param != GL_LINEAR_MIPMAP_LINEAR) {
_mesa_error(_mesa_get_current_context(), GL_INVALID_ENUM,
"glTexParameterx(pname=0x%x)", pname);
return;
}
convert_param_value = false;
break;
case GL_TEXTURE_MAG_FILTER:
if (param != GL_NEAREST && param != GL_LINEAR) {
_mesa_error(_mesa_get_current_context(), GL_INVALID_ENUM,
"glTexParameterx(pname=0x%x)", pname);
return;
}
convert_param_value = false;
break;
case GL_GENERATE_MIPMAP:
@ -1446,20 +1434,7 @@ _es_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params)
n_params = 1;
break;
case GL_TEXTURE_MIN_FILTER:
if (params[0] != GL_NEAREST && params[0] != GL_LINEAR && params[0] != GL_NEAREST_MIPMAP_NEAREST && params[0] != GL_NEAREST_MIPMAP_LINEAR && params[0] != GL_LINEAR_MIPMAP_NEAREST && params[0] != GL_LINEAR_MIPMAP_LINEAR) {
_mesa_error(_mesa_get_current_context(), GL_INVALID_ENUM,
"glTexParameterxv(pname=0x%x)", pname);
return;
}
convert_params_value = false;
n_params = 1;
break;
case GL_TEXTURE_MAG_FILTER:
if (params[0] != GL_NEAREST && params[0] != GL_LINEAR) {
_mesa_error(_mesa_get_current_context(), GL_INVALID_ENUM,
"glTexParameterxv(pname=0x%x)", pname);
return;
}
convert_params_value = false;
n_params = 1;
break;