[Piglit] [PATCH 5/6] util: Remove now unused piglit_ARBfp_pass_through.

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


---
 tests/util/piglit-util-gl.c | 15 +--------------
 tests/util/piglit-util-gl.h |  9 ---------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/tests/util/piglit-util-gl.c b/tests/util/piglit-util-gl.c
index 767767d..8dd4c8a 100644
--- a/tests/util/piglit-util-gl.c
+++ b/tests/util/piglit-util-gl.c
@@ -1950,24 +1950,11 @@ bool piglit_probe_buffer_doubles(GLuint buf, GLenum target, const char *label,
 
 	return status;
 }
-GLint piglit_ARBfp_pass_through = 0;
 
 int piglit_use_fragment_program(void)
 {
-	static const char source[] =
-		"!!ARBfp1.0\n"
-		"MOV	result.color, fragment.color;\n"
-		"END\n"
-		;
-
 	piglit_dispatch_default_init(PIGLIT_DISPATCH_GL);
-	if (!piglit_is_extension_supported("GL_ARB_fragment_program"))
-		return 0;
-
-	piglit_ARBfp_pass_through =
-		piglit_compile_program(GL_FRAGMENT_PROGRAM_ARB, source);
-
-	return (piglit_ARBfp_pass_through != 0);
+	return piglit_is_extension_supported("GL_ARB_fragment_program");
 }
 
 void piglit_require_fragment_program(void)
diff --git a/tests/util/piglit-util-gl.h b/tests/util/piglit-util-gl.h
index f06438a..5a8c82b 100644
--- a/tests/util/piglit-util-gl.h
+++ b/tests/util/piglit-util-gl.h
@@ -298,15 +298,6 @@ extern const GLenum cube_face_targets[6];
 	"DP4	oPos.z, mvp[2], iPos;\n"		\
 	"DP4	oPos.w, mvp[3], iPos;\n"
 
-/**
- * Handle to a generic fragment program that passes the input color to output
- *
- * \note
- * Either \c piglit_use_fragment_program or \c piglit_require_fragment_program
- * must be called before using this program handle.
- */
-extern GLint piglit_ARBfp_pass_through;
-
 static const GLint PIGLIT_ATTRIB_POS = 0;
 static const GLint PIGLIT_ATTRIB_TEX = 1;
 
-- 
2.4.9



More information about the Piglit mailing list