[Piglit] [PATCH 08/25] arb_direct_state_access: Delete test_texture_env subtest from texunits

Ian Romanick idr at freedesktop.org
Mon May 18 13:50:01 PDT 2015


From: Ian Romanick <ian.d.romanick at intel.com>

There are no DSA functions used in this test, so it does not belong
here.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
---
 tests/spec/arb_direct_state_access/texunits.c | 37 ---------------------------
 1 file changed, 37 deletions(-)

diff --git a/tests/spec/arb_direct_state_access/texunits.c b/tests/spec/arb_direct_state_access/texunits.c
index a5c74b6..5117f9c 100644
--- a/tests/spec/arb_direct_state_access/texunits.c
+++ b/tests/spec/arb_direct_state_access/texunits.c
@@ -255,42 +255,6 @@ test_texture_params(void)
 }
 
 
-static bool
-test_texture_env(void)
-{
-   /* Texture Environment state is fixed-function; not used by shaders */
-   int i;
-
-   piglit_reset_gl_error();
-
-   /* set per-unit state */
-   for (i = 0; i < MaxTextureCombinedUnits; i++) {
-      glActiveTexture(GL_TEXTURE0 + i);
-      glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, Random[i]);
-      if (!piglit_check_gl_error(GL_NO_ERROR))
-         return false;
-   }
-
-   /* check per-unit state */
-   for (i = 0; i < MaxTextureCombinedUnits; i++) {
-      GLfloat v[4];
-      glActiveTexture(GL_TEXTURE0 + i);
-      glGetTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, v);
-      if (!equal4v(v, Random[i])) {
-         printf("Setting per-unit env state failed for unit %d\n", i);
-         report4v(Random[i], v);
-         return false;
-      }
-   }
-
-   /* there should be no errors at this point */
-   if (!piglit_check_gl_error(GL_NO_ERROR))
-      return false;
-
-   return true;
-}
-
-
 static void
 report_info(void)
 {
@@ -310,7 +274,6 @@ piglit_display(void)
 	pass = test_rasterpos() && pass;
 	pass = test_texture_matrix() && pass;
 	pass = test_texture_params() && pass;
-	pass = test_texture_env() && pass;
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
-- 
2.1.0



More information about the Piglit mailing list