[Piglit] [PATCH] ARB_explicit_uniform_location: bump gl and glsl version requirement
Tapani Pälli
tapani.palli at intel.com
Wed Jun 4 22:13:34 PDT 2014
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
---
tests/spec/arb_explicit_uniform_location/array-elements.c | 3 ++-
tests/spec/arb_explicit_uniform_location/compiler/layout-01.frag | 2 +-
tests/spec/arb_explicit_uniform_location/compiler/layout-01.vert | 2 +-
tests/spec/arb_explicit_uniform_location/inactive-uniform.c | 3 ++-
.../linker/overlap-array-loc-stages.shader_test | 6 ++++--
.../linker/overlap-array-loc.shader_test | 5 +++--
.../linker/overlap-location-across-stages.shader_test | 5 ++++-
.../linker/set-explicit-location-once-decl-twice.shader_test | 5 ++++-
.../linker/set-explicit-location-twice.shader_test | 4 +++-
.../linker/set-same-explicit-location-twice.shader_test | 5 ++++-
.../linker/unused-uniform-reserve-location.shader_test | 5 ++++-
tests/spec/arb_explicit_uniform_location/loc-boundaries.c | 3 ++-
tests/spec/arb_explicit_uniform_location/preprocessor/define.frag | 4 ++--
tests/spec/arb_explicit_uniform_location/preprocessor/define.vert | 4 ++--
14 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/tests/spec/arb_explicit_uniform_location/array-elements.c b/tests/spec/arb_explicit_uniform_location/array-elements.c
index c803233..7001941 100644
--- a/tests/spec/arb_explicit_uniform_location/array-elements.c
+++ b/tests/spec/arb_explicit_uniform_location/array-elements.c
@@ -34,7 +34,7 @@
PIGLIT_GL_TEST_CONFIG_BEGIN
- config.supports_gl_compat_version = 20;
+ config.supports_gl_core_version = 33;
config.window_visual = PIGLIT_GL_VISUAL_RGB;
PIGLIT_GL_TEST_CONFIG_END
@@ -52,6 +52,7 @@ static const char vs_text[] =
"}";
static const char fs_text[] =
+ "#version 330\n"
"#extension GL_ARB_explicit_uniform_location: require\n"
"#define ARRAY_SIZE 16\n"
"layout(location = 1) uniform float r;\n"
diff --git a/tests/spec/arb_explicit_uniform_location/compiler/layout-01.frag b/tests/spec/arb_explicit_uniform_location/compiler/layout-01.frag
index fbcdbd0..9a60c85 100644
--- a/tests/spec/arb_explicit_uniform_location/compiler/layout-01.frag
+++ b/tests/spec/arb_explicit_uniform_location/compiler/layout-01.frag
@@ -5,7 +5,7 @@
// [end config]
//
-#version 110
+#version 330
#extension GL_ARB_explicit_uniform_location: require
vec4 color;
layout(location = 42) uniform float test1;
diff --git a/tests/spec/arb_explicit_uniform_location/compiler/layout-01.vert b/tests/spec/arb_explicit_uniform_location/compiler/layout-01.vert
index b635365..8bc89bc 100644
--- a/tests/spec/arb_explicit_uniform_location/compiler/layout-01.vert
+++ b/tests/spec/arb_explicit_uniform_location/compiler/layout-01.vert
@@ -4,7 +4,7 @@
// require_extensions: GL_ARB_explicit_uniform_location
// [end config]
-#version 110
+#version 330
#extension GL_ARB_explicit_uniform_location: require
vec4 vertex;
layout(location = 41) uniform float foo;
diff --git a/tests/spec/arb_explicit_uniform_location/inactive-uniform.c b/tests/spec/arb_explicit_uniform_location/inactive-uniform.c
index 5b37eba..527b2da 100644
--- a/tests/spec/arb_explicit_uniform_location/inactive-uniform.c
+++ b/tests/spec/arb_explicit_uniform_location/inactive-uniform.c
@@ -47,7 +47,7 @@
PIGLIT_GL_TEST_CONFIG_BEGIN
- config.supports_gl_compat_version = 20;
+ config.supports_gl_core_version = 33;
config.window_visual = PIGLIT_GL_VISUAL_RGB;
PIGLIT_GL_TEST_CONFIG_END
@@ -65,6 +65,7 @@ static const char vs_text[] =
"}";
static const char fs_text[] =
+ "#version 330\n"
"#extension GL_ARB_explicit_uniform_location: require\n"
"layout(location = 7) uniform float var;\n"
"void main() {\n"
diff --git a/tests/spec/arb_explicit_uniform_location/linker/overlap-array-loc-stages.shader_test b/tests/spec/arb_explicit_uniform_location/linker/overlap-array-loc-stages.shader_test
index 60175d0..f3d04e2 100644
--- a/tests/spec/arb_explicit_uniform_location/linker/overlap-array-loc-stages.shader_test
+++ b/tests/spec/arb_explicit_uniform_location/linker/overlap-array-loc-stages.shader_test
@@ -8,10 +8,12 @@
# will be generated"
[require]
-GLSL >= 1.20
+GL >= 3.3
+GLSL >= 3.30
GL_ARB_explicit_uniform_location
[vertex shader]
+#version 330
#extension GL_ARB_explicit_uniform_location: require
layout(location = 2) uniform vec4 vertex;
@@ -21,7 +23,7 @@ void main()
}
[fragment shader]
-#version 120
+#version 330
#extension GL_ARB_explicit_uniform_location: require
layout(location = 0) uniform float a[16];
diff --git a/tests/spec/arb_explicit_uniform_location/linker/overlap-array-loc.shader_test b/tests/spec/arb_explicit_uniform_location/linker/overlap-array-loc.shader_test
index 597b093..02897e4 100644
--- a/tests/spec/arb_explicit_uniform_location/linker/overlap-array-loc.shader_test
+++ b/tests/spec/arb_explicit_uniform_location/linker/overlap-array-loc.shader_test
@@ -8,13 +8,14 @@
# will be generated"
[require]
-GLSL >= 1.20
+GL >= 3.3
+GLSL >= 3.30
GL_ARB_explicit_uniform_location
[vertex shader passthrough]
[fragment shader]
-#version 120
+#version 330
#extension GL_ARB_explicit_uniform_location: require
layout(location = 0) uniform float a[16];
layout(location = 2) uniform float r;
diff --git a/tests/spec/arb_explicit_uniform_location/linker/overlap-location-across-stages.shader_test b/tests/spec/arb_explicit_uniform_location/linker/overlap-location-across-stages.shader_test
index 056ecfa..4b69ceb 100644
--- a/tests/spec/arb_explicit_uniform_location/linker/overlap-location-across-stages.shader_test
+++ b/tests/spec/arb_explicit_uniform_location/linker/overlap-location-across-stages.shader_test
@@ -9,10 +9,12 @@
# will be generated"
[require]
-GLSL >= 1.20
+GL >= 3.3
+GLSL >= 3.30
GL_ARB_explicit_uniform_location
[vertex shader]
+#version 330
#extension GL_ARB_explicit_uniform_location: require
layout(location = 42) uniform vec4 offset;
vec4 vertex;
@@ -22,6 +24,7 @@ void main()
}
[fragment shader]
+#version 330
#extension GL_ARB_explicit_uniform_location: require
layout(location = 42) uniform vec4 color;
void main()
diff --git a/tests/spec/arb_explicit_uniform_location/linker/set-explicit-location-once-decl-twice.shader_test b/tests/spec/arb_explicit_uniform_location/linker/set-explicit-location-once-decl-twice.shader_test
index e044d7a..c06ada1 100644
--- a/tests/spec/arb_explicit_uniform_location/linker/set-explicit-location-once-decl-twice.shader_test
+++ b/tests/spec/arb_explicit_uniform_location/linker/set-explicit-location-once-decl-twice.shader_test
@@ -3,10 +3,12 @@
# same uniform without explicit location in fragment stage.
[require]
-GLSL >= 1.10
+GL >= 3.3
+GLSL >= 3.30
GL_ARB_explicit_uniform_location
[vertex shader]
+#version 330
#extension GL_ARB_explicit_uniform_location: require
layout(location = 0) uniform vec4 foo;
vec4 vertex;
@@ -16,6 +18,7 @@ void main()
}
[fragment shader]
+#version 330
#extension GL_ARB_explicit_uniform_location: require
uniform vec4 foo;
void main()
diff --git a/tests/spec/arb_explicit_uniform_location/linker/set-explicit-location-twice.shader_test b/tests/spec/arb_explicit_uniform_location/linker/set-explicit-location-twice.shader_test
index 9978aac..2e768d1 100644
--- a/tests/spec/arb_explicit_uniform_location/linker/set-explicit-location-twice.shader_test
+++ b/tests/spec/arb_explicit_uniform_location/linker/set-explicit-location-twice.shader_test
@@ -2,10 +2,11 @@
# Tests setting 2 different explicit locations to same uniform variable.
[require]
-GLSL >= 1.10
+GLSL >= 3.30
GL_ARB_explicit_uniform_location
[vertex shader]
+#version 330
#extension GL_ARB_explicit_uniform_location: require
layout(location = 0) uniform vec4 foo;
vec4 vertex;
@@ -15,6 +16,7 @@ void main()
}
[fragment shader]
+#version 330
#extension GL_ARB_explicit_uniform_location: require
layout(location = 1) uniform vec4 foo;
void main()
diff --git a/tests/spec/arb_explicit_uniform_location/linker/set-same-explicit-location-twice.shader_test b/tests/spec/arb_explicit_uniform_location/linker/set-same-explicit-location-twice.shader_test
index 13beadb..d72ca92 100644
--- a/tests/spec/arb_explicit_uniform_location/linker/set-same-explicit-location-twice.shader_test
+++ b/tests/spec/arb_explicit_uniform_location/linker/set-same-explicit-location-twice.shader_test
@@ -2,10 +2,12 @@
# Tests setting same explicit locations twice to same uniform variable.
[require]
-GLSL >= 1.10
+GL >= 3.3
+GLSL >= 3.30
GL_ARB_explicit_uniform_location
[vertex shader]
+#version 330
#extension GL_ARB_explicit_uniform_location: require
layout(location = 0) uniform vec4 foo;
vec4 vertex;
@@ -15,6 +17,7 @@ void main()
}
[fragment shader]
+#version 330
#extension GL_ARB_explicit_uniform_location: require
layout(location = 0) uniform vec4 foo;
void main()
diff --git a/tests/spec/arb_explicit_uniform_location/linker/unused-uniform-reserve-location.shader_test b/tests/spec/arb_explicit_uniform_location/linker/unused-uniform-reserve-location.shader_test
index 2489e4e..61c85db 100644
--- a/tests/spec/arb_explicit_uniform_location/linker/unused-uniform-reserve-location.shader_test
+++ b/tests/spec/arb_explicit_uniform_location/linker/unused-uniform-reserve-location.shader_test
@@ -10,10 +10,12 @@
# error will be generated."
[require]
-GLSL >= 1.20
+GL >= 3.3
+GLSL >= 3.30
GL_ARB_explicit_uniform_location
[vertex shader]
+#version 330
#extension GL_ARB_explicit_uniform_location: require
layout(location = 0) uniform float array[128];
vec4 vertex;
@@ -23,6 +25,7 @@ void main()
}
[fragment shader]
+#version 330
#extension GL_ARB_explicit_uniform_location: require
layout(location = 127) uniform vec4 color;
void main()
diff --git a/tests/spec/arb_explicit_uniform_location/loc-boundaries.c b/tests/spec/arb_explicit_uniform_location/loc-boundaries.c
index 3e6ea7a..ac84028 100644
--- a/tests/spec/arb_explicit_uniform_location/loc-boundaries.c
+++ b/tests/spec/arb_explicit_uniform_location/loc-boundaries.c
@@ -43,7 +43,7 @@
PIGLIT_GL_TEST_CONFIG_BEGIN
- config.supports_gl_compat_version = 20;
+ config.supports_gl_core_version = 33;
config.window_visual = PIGLIT_GL_VISUAL_RGB;
PIGLIT_GL_TEST_CONFIG_END
@@ -61,6 +61,7 @@ static const char vs_text[] =
"}";
static const char fs_template[] =
+ "#version 330\n"
"#extension GL_ARB_explicit_uniform_location: require\n"
"uniform float a;\n"
"layout(location = %d) uniform float r;\n"
diff --git a/tests/spec/arb_explicit_uniform_location/preprocessor/define.frag b/tests/spec/arb_explicit_uniform_location/preprocessor/define.frag
index bd35c41..1aab638 100644
--- a/tests/spec/arb_explicit_uniform_location/preprocessor/define.frag
+++ b/tests/spec/arb_explicit_uniform_location/preprocessor/define.frag
@@ -1,10 +1,10 @@
// [config]
// expect_result: pass
-// glsl_version: 1.10
+// glsl_version: 3.30
// require_extensions: GL_ARB_explicit_uniform_location
// [end config]
-#version 110
+#version 330
#extension GL_ARB_explicit_uniform_location: require
#if !defined GL_ARB_explicit_uniform_location
diff --git a/tests/spec/arb_explicit_uniform_location/preprocessor/define.vert b/tests/spec/arb_explicit_uniform_location/preprocessor/define.vert
index bd35c41..1aab638 100644
--- a/tests/spec/arb_explicit_uniform_location/preprocessor/define.vert
+++ b/tests/spec/arb_explicit_uniform_location/preprocessor/define.vert
@@ -1,10 +1,10 @@
// [config]
// expect_result: pass
-// glsl_version: 1.10
+// glsl_version: 3.30
// require_extensions: GL_ARB_explicit_uniform_location
// [end config]
-#version 110
+#version 330
#extension GL_ARB_explicit_uniform_location: require
#if !defined GL_ARB_explicit_uniform_location
--
1.8.3.1
More information about the Piglit
mailing list