From 27e55805fbc4b11331c402b1185d097a2564f6b1 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon, 3 Oct 2011 13:05:47 -0700
Subject: [PATCH] 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>
---
 src/mesa/main/APIspec.xml      | 25 ++++---------------------
 src/mesa/main/es1_conversion.c | 25 -------------------------
 2 files changed, 4 insertions(+), 46 deletions(-)

diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index b6cf52d074a..1b8dae396ba 100644
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -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"/>
diff --git a/src/mesa/main/es1_conversion.c b/src/mesa/main/es1_conversion.c
index b8ae2673807..9e8dbf2045a 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;
-- 
2.30.2