[Piglit] [PATCH 4/6] shaders: Drop unnecessary fragment programs from vp-address-*.

Matt Turner mattst88 at gmail.com
Tue Nov 10 22:46:21 PST 2015


---
 tests/shaders/vp-address-01.c | 3 ---
 tests/shaders/vp-address-02.c | 3 ---
 tests/shaders/vp-address-03.c | 3 ---
 tests/shaders/vp-address-04.c | 3 ---
 tests/shaders/vp-address-05.c | 3 ---
 tests/shaders/vp-address-06.c | 3 ---
 6 files changed, 18 deletions(-)

diff --git a/tests/shaders/vp-address-01.c b/tests/shaders/vp-address-01.c
index 09eeed3..be7c1d1 100644
--- a/tests/shaders/vp-address-01.c
+++ b/tests/shaders/vp-address-01.c
@@ -123,7 +123,6 @@ piglit_init(int argc, char **argv)
 	(void) argv;
 
 	piglit_require_vertex_program();
-	piglit_require_fragment_program();
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
 	glGetProgramivARB(GL_VERTEX_PROGRAM_ARB,
@@ -161,9 +160,7 @@ piglit_init(int argc, char **argv)
 						  shader_source);
 	}
 
-	glEnable(GL_FRAGMENT_PROGRAM_ARB);
 	glEnable(GL_VERTEX_PROGRAM_ARB);
-	glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, piglit_ARBfp_pass_through);
 
 	glClearColor(0.5, 0.5, 0.5, 1.0);
 }
diff --git a/tests/shaders/vp-address-02.c b/tests/shaders/vp-address-02.c
index 5164ba7..a04cac6 100644
--- a/tests/shaders/vp-address-02.c
+++ b/tests/shaders/vp-address-02.c
@@ -137,7 +137,6 @@ piglit_init(int argc, char **argv)
 	(void) argv;
 
 	piglit_require_vertex_program();
-	piglit_require_fragment_program();
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
 	glGetProgramivARB(GL_VERTEX_PROGRAM_ARB,
@@ -196,9 +195,7 @@ piglit_init(int argc, char **argv)
 						  shader_source);
 	}
 
-	glEnable(GL_FRAGMENT_PROGRAM_ARB);
 	glEnable(GL_VERTEX_PROGRAM_ARB);
-	glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, piglit_ARBfp_pass_through);
 
 	glClearColor(0.5, 0.5, 0.5, 1.0);
 }
diff --git a/tests/shaders/vp-address-03.c b/tests/shaders/vp-address-03.c
index 58caeef..88bd259 100644
--- a/tests/shaders/vp-address-03.c
+++ b/tests/shaders/vp-address-03.c
@@ -115,7 +115,6 @@ piglit_init(int argc, char **argv)
 	(void) argv;
 
 	piglit_require_vertex_program();
-	piglit_require_fragment_program();
 	piglit_require_extension("GL_NV_vertex_program2_option");
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
@@ -129,9 +128,7 @@ piglit_init(int argc, char **argv)
 						  shader_source);
 	}
 
-	glEnable(GL_FRAGMENT_PROGRAM_ARB);
 	glEnable(GL_VERTEX_PROGRAM_ARB);
-	glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, piglit_ARBfp_pass_through);
 
 	glClearColor(0.5, 0.5, 0.5, 1.0);
 }
diff --git a/tests/shaders/vp-address-04.c b/tests/shaders/vp-address-04.c
index 14f1e6f..44401dd 100644
--- a/tests/shaders/vp-address-04.c
+++ b/tests/shaders/vp-address-04.c
@@ -233,7 +233,6 @@ piglit_init(int argc, char **argv)
 	(void) argv;
 
 	piglit_require_vertex_program();
-	piglit_require_fragment_program();
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
 	glGetProgramivARB(GL_VERTEX_PROGRAM_ARB,
@@ -274,9 +273,7 @@ piglit_init(int argc, char **argv)
 		}
 	}
 
-	glEnable(GL_FRAGMENT_PROGRAM_ARB);
 	glEnable(GL_VERTEX_PROGRAM_ARB);
-	glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, piglit_ARBfp_pass_through);
 
 	glClearColor(0.5, 0.5, 0.5, 1.0);
 }
diff --git a/tests/shaders/vp-address-05.c b/tests/shaders/vp-address-05.c
index e8dfff6..483b8d7 100644
--- a/tests/shaders/vp-address-05.c
+++ b/tests/shaders/vp-address-05.c
@@ -118,7 +118,6 @@ piglit_init(int argc, char **argv)
 	(void) argv;
 
 	piglit_require_vertex_program();
-	piglit_require_fragment_program();
 	piglit_require_extension("GL_NV_vertex_program2_option");
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
@@ -132,9 +131,7 @@ piglit_init(int argc, char **argv)
 						  shader_source);
 	}
 
-	glEnable(GL_FRAGMENT_PROGRAM_ARB);
 	glEnable(GL_VERTEX_PROGRAM_ARB);
-	glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, piglit_ARBfp_pass_through);
 
 	glClearColor(0.5, 0.5, 0.5, 1.0);
 }
diff --git a/tests/shaders/vp-address-06.c b/tests/shaders/vp-address-06.c
index 23c5ea9..a675351 100644
--- a/tests/shaders/vp-address-06.c
+++ b/tests/shaders/vp-address-06.c
@@ -117,7 +117,6 @@ piglit_init(int argc, char **argv)
 	(void) argv;
 
 	piglit_require_vertex_program();
-	piglit_require_fragment_program();
 	piglit_require_extension("GL_NV_vertex_program2_option");
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
@@ -133,9 +132,7 @@ piglit_init(int argc, char **argv)
 						  shader_source);
 	}
 
-	glEnable(GL_FRAGMENT_PROGRAM_ARB);
 	glEnable(GL_VERTEX_PROGRAM_ARB);
-	glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, piglit_ARBfp_pass_through);
 
 	glClearColor(0.5, 0.5, 0.5, 1.0);
 }
-- 
2.4.9



More information about the Piglit mailing list