[Piglit] [PATCH 9/9] arb_es2_compatibility: remove '#ifdef GL_EXTENSION' guards
Emil Velikov
emil.l.velikov at gmail.com
Mon Jun 27 16:52:48 UTC 2016
From: Emil Velikov <emil.velikov at collabora.com>
Analogous to previous commit(s).
With this commit no GL test in piglit (barring glean) relies on this
broken behaviour. Checked with the following:
$ git grep "defined.*\<GL_"
$ git grep "ifdef.*\<GL_"
Only local definitions can be seen with the inverse query
$ git grep "ifndef.*\<GL_"
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
.../arb_es2_compatibility/arb_es2_compatibility-depthrangef.c | 4 ----
.../arb_es2_compatibility-getshaderprecisionformat.c | 4 ----
.../spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c | 5 -----
.../arb_es2_compatibility-releaseshadercompiler.c | 8 --------
.../arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c | 4 ----
5 files changed, 25 deletions(-)
diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c
index eb155c1..f87ea3d 100644
--- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c
+++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c
@@ -48,7 +48,6 @@ piglit_init(int argc, char **argv)
enum piglit_result
piglit_display(void)
{
-#ifdef GL_ARB_ES2_compatibility
GLboolean pass = GL_TRUE;
float red[4] = {1.0, 0.0, 0.0, 0.0};
float green[4] = {0.0, 1.0, 0.0, 0.0};
@@ -88,7 +87,4 @@ piglit_display(void)
piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
-#else
- return PIGLIT_SKIP;
-#endif /* GL_ARB_ES2_compatibility */
}
diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-getshaderprecisionformat.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-getshaderprecisionformat.c
index b6b7b85..97d67ae 100644
--- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-getshaderprecisionformat.c
+++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-getshaderprecisionformat.c
@@ -54,7 +54,6 @@ piglit_display(void)
void
piglit_init(int argc, char **argv)
{
-#ifdef GL_ARB_ES2_compatibility
GLboolean pass = GL_TRUE;
GLint status;
unsigned i;
@@ -129,7 +128,4 @@ piglit_init(int argc, char **argv)
}
}
piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
-#else
- piglit_report_result(PIGLIT_SKIP);
-#endif /* GL_ARB_ES2_compatibility */
}
diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c
index ee8a305..6f69c66 100644
--- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c
+++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c
@@ -45,7 +45,6 @@ piglit_display(void)
void
piglit_init(int argc, char **argv)
{
-#ifdef GL_ARB_ES2_compatibility
GLboolean pass = GL_TRUE;
GLint floats, vecs;
@@ -88,8 +87,4 @@ piglit_init(int argc, char **argv)
piglit_report_result(PIGLIT_FAIL);
else
piglit_report_result(PIGLIT_PASS);
-#else
- piglit_report_result(PIGLIT_SKIP);
-
-#endif /* GL_ARB_ES2_compatibility */
}
diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c
index e7ce98a..e1b47b8 100644
--- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c
+++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c
@@ -43,7 +43,6 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
PIGLIT_GL_TEST_CONFIG_END
-#ifdef GL_ARB_ES2_compatibility
static const char vs_text[] =
"#version 100\n"
"uniform vec4 offset;\n"
@@ -85,12 +84,10 @@ draw(const float *color, float x_offset, bool release)
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
glDeleteProgram(prog);
}
-#endif
enum piglit_result
piglit_display(void)
{
-#ifdef GL_ARB_ES2_compatibility
GLboolean pass = GL_TRUE;
float green[] = {0.0, 1.0, 0.0, 0.0};
float blue[] = {0.0, 0.0, 1.0, 0.0};
@@ -110,15 +107,11 @@ piglit_display(void)
piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
-#else
- return PIGLIT_SKIP;
-#endif /* GL_ARB_ES2_compatibility */
}
void
piglit_init(int argc, char **argv)
{
-#ifdef GL_ARB_ES2_compatibility
static const float verts[] = {
-1.0, 1.0, 0.0, 1.0,
-1.0, -1.0, 0.0, 1.0,
@@ -136,5 +129,4 @@ piglit_init(int argc, char **argv)
glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, sizeof(float) * 4,
verts);
glEnableVertexAttribArray(0);
-#endif
}
diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c
index 335c088..a3ac27a 100644
--- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c
+++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c
@@ -46,7 +46,6 @@ piglit_display(void)
void
piglit_init(int argc, char **argv)
{
-#ifdef GL_ARB_ES2_compatibility
GLint shadercompiler;
piglit_require_gl_version(20);
@@ -62,7 +61,4 @@ piglit_init(int argc, char **argv)
piglit_report_result(PIGLIT_FAIL);
else
piglit_report_result(PIGLIT_PASS);
-#else
- piglit_report_result(PIGLIT_SKIP);
-#endif
}
--
2.8.2
More information about the Piglit
mailing list