diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2011-10-03 13:05:47 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2012-08-20 09:52:27 -0700 |
| commit | 27e55805fbc4b11331c402b1185d097a2564f6b1 (patch) | |
| tree | e243c3bea3a48881649217d7a7008f0a7504f700 /src/mesa/main/es1_conversion.c | |
| parent | 926a4a922f9a5ec397cb3d316dd915b00b39c54d (diff) | |
| download | external_mesa3d-27e55805fbc4b11331c402b1185d097a2564f6b1.zip external_mesa3d-27e55805fbc4b11331c402b1185d097a2564f6b1.tar.gz external_mesa3d-27e55805fbc4b11331c402b1185d097a2564f6b1.tar.bz2 | |
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>
Diffstat (limited to 'src/mesa/main/es1_conversion.c')
| -rw-r--r-- | src/mesa/main/es1_conversion.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/mesa/main/es1_conversion.c b/src/mesa/main/es1_conversion.c index b8ae267..9e8dbf2 100644 --- a/src/mesa/main/es1_conversion.c +++ b/src/mesa/main/es1_conversion.c @@ -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; |