[Piglit] [PATCH 09/25] arb_direct_state_access: Delete test_rasterpos subtest from texunits
Ian Romanick
idr at freedesktop.org
Mon May 18 13:50:02 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 | 66 ---------------------------
1 file changed, 66 deletions(-)
diff --git a/tests/spec/arb_direct_state_access/texunits.c b/tests/spec/arb_direct_state_access/texunits.c
index 5117f9c..a55192f 100644
--- a/tests/spec/arb_direct_state_access/texunits.c
+++ b/tests/spec/arb_direct_state_access/texunits.c
@@ -92,71 +92,6 @@ report4v(const GLfloat exp[4], const GLfloat act[4])
static bool
-test_rasterpos(void)
-{
- int i;
-
- piglit_reset_gl_error();
-
- /* set current texcoords */
- for (i = 0; i < MaxTextureCoordUnits; i++) {
- glMultiTexCoord4fv(GL_TEXTURE0 + i, Random[i]);
- }
-
- /* query current texcoords */
- for (i = 0; i < MaxTextureCoordUnits; i++) {
- GLfloat v[4];
- glActiveTexture(GL_TEXTURE0 + i);
- glGetFloatv(GL_CURRENT_TEXTURE_COORDS, v);
- if (!equal4v(Random[i], v)) {
- printf("Get GL_CURRENT_TEXTURE_COORDS, unit %d failed\n", i);
- report4v(Random[i], v);
- return false;
- }
- }
-
- /* set raster pos to update raster tex coords */
- glRasterPos2i(0, 0);
-
- for (i = 0; i < MaxTextureCoordUnits; i++) {
- GLfloat v[4];
- glActiveTexture(GL_TEXTURE0 + i);
- glGetFloatv(GL_CURRENT_RASTER_TEXTURE_COORDS, v);
- if (!equal4v(Random[i], v)) {
- printf("Get GL_CURRENT_RASTER_TEXTURE_COORDS, unit %d failed\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;
- }
-
- /* this should generate an error */
- {
- GLfloat v[4];
- glActiveTexture(GL_TEXTURE0 + MaxTextureCoordUnits);
- if (MaxTextureCoordUnits == MaxTextureCombinedUnits) {
- /* INVALID_ENUM is expected */
- if (!piglit_check_gl_error(GL_INVALID_ENUM)) {
- return false;
- }
- } else {
- /* INVALID_OPERATION is expected */
- glGetFloatv(GL_CURRENT_RASTER_TEXTURE_COORDS, v);
- if (!piglit_check_gl_error(GL_INVALID_OPERATION)) {
- return false;
- }
- }
- }
-
- return true;
-}
-
-
-static bool
test_texture_matrix(void)
{
int i;
@@ -271,7 +206,6 @@ piglit_display(void)
{
bool pass = true;
- pass = test_rasterpos() && pass;
pass = test_texture_matrix() && pass;
pass = test_texture_params() && pass;
--
2.1.0
More information about the Piglit
mailing list