[Piglit] [PATCH 2/2] arb_shader_atomic_counters: gs/tes/tcs all need version 150

[Ilia Mirkin]

---

Shaders fail to compile on nvidia blob otherwise with errors like

Failed to compile shader: 0(4) : error C3013: input/output layout qualifiers supported above GL version 140
0(5) : error C3013: input/output layout qualifiers supported above GL version 140
0(12) : error C7532: global variable gl_in requires "#version 150" or later

 tests/spec/arb_shader_atomic_counters/semantics.c     | 12 ++++++------
 tests/spec/arb_shader_atomic_counters/unused-result.c | 15 ++++++---------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/tests/spec/arb_shader_atomic_counters/semantics.c b/tests/spec/arb_shader_atomic_counters/semantics.c
index 622b178..694f1fe 100644
--- a/tests/spec/arb_shader_atomic_counters/semantics.c
+++ b/tests/spec/arb_shader_atomic_counters/semantics.c
@@ -126,7 +126,7 @@ run_test_geometry(void)
                 "void main() {\n"
                 "       fcolor = gcolor;\n"
                 "}\n";
-        const char *gs_source = "#version 140\n"
+        const char *gs_source = "#version 150\n"
                 "#extension GL_ARB_shader_atomic_counters : enable\n"
                 "\n"
                 "layout(points) in;\n"
@@ -178,7 +178,7 @@ run_test_tess_control(void)
                 "void main() {\n"
                 "       fg = tecolor;\n"
                 "}\n";
-        const char *tes_source = "#version 140\n"
+        const char *tes_source = "#version 150\n"
                 "#extension GL_ARB_tessellation_shader : enable\n"
                 "\n"
                 "layout(triangles, point_mode) in;\n"
@@ -193,7 +193,7 @@ run_test_tess_control(void)
                 "       \n"
                 "       tecolor = tccolor;\n"
                 "}\n";
-        const char *tcs_source = "#version 140\n"
+        const char *tcs_source = "#version 150\n"
                 "#extension GL_ARB_tessellation_shader : enable\n"
                 "#extension GL_ARB_shader_atomic_counters : enable\n"
                 "\n"
@@ -257,7 +257,8 @@ run_test_tess_evaluation(void)
                 "void main() {\n"
                 "       fg = tecolor;\n"
                 "}\n";
-        const char *tes_source = "#version 140\n"
+        const char *tes_source = "#version 150\n"
+                "#extension GL_ARB_shader_atomic_counters : enable\n"
                 "#extension GL_ARB_tessellation_shader : enable\n"
                 "\n"
                 "layout(triangles, point_mode) in;\n"
@@ -280,8 +281,7 @@ run_test_tess_evaluation(void)
                 "               tecolor = ivec4(0);\n"
                 "       }\n"
                 "}\n";
-        const char *tcs_source = "#version 140\n"
-                "#extension GL_ARB_shader_atomic_counters : enable\n"
+        const char *tcs_source = "#version 150\n"
                 "#extension GL_ARB_tessellation_shader : enable\n"
                 "\n"
                 "layout(vertices=3) out;\n"
diff --git a/tests/spec/arb_shader_atomic_counters/unused-result.c b/tests/spec/arb_shader_atomic_counters/unused-result.c
index e0cc216..f2fde30 100644
--- a/tests/spec/arb_shader_atomic_counters/unused-result.c
+++ b/tests/spec/arb_shader_atomic_counters/unused-result.c
@@ -118,7 +118,7 @@ run_test_geometry(void)
                 "void main() {\n"
                 "       fcolor = ivec4(0);\n"
                 "}\n";
-        const char *gs_source = "#version 140\n"
+        const char *gs_source = "#version 150\n"
                 "#extension GL_ARB_shader_atomic_counters : enable\n"
                 "\n"
                 "layout(points) in;\n"
@@ -132,7 +132,6 @@ run_test_geometry(void)
                 "       EmitVertex();\n"
                 "}\n";
         const char *vs_source = "#version 140\n"
-                "#extension GL_ARB_shader_atomic_counters : enable\n"
                 "\n"
                 "in vec4 piglit_vertex;\n"
                 "\n"
@@ -163,7 +162,7 @@ run_test_tess_control(void)
                 "void main() {\n"
                 "       fg = ivec4(0);\n"
                 "}\n";
-        const char *tes_source = "#version 140\n"
+        const char *tes_source = "#version 150\n"
                 "#extension GL_ARB_tessellation_shader : enable\n"
                 "\n"
                 "layout(triangles, point_mode) in;\n"
@@ -175,7 +174,7 @@ run_test_tess_control(void)
                 "               gl_in[2].gl_Position * gl_TessCoord.z;\n"
                 "       \n"
                 "}\n";
-        const char *tcs_source = "#version 140\n"
+        const char *tcs_source = "#version 150\n"
                 "#extension GL_ARB_tessellation_shader : enable\n"
                 "#extension GL_ARB_shader_atomic_counters : enable\n"
                 "\n"
@@ -198,7 +197,6 @@ run_test_tess_control(void)
                 "               gl_in[gl_InvocationID].gl_Position;\n"
                 "}\n";
         const char *vs_source = "#version 140\n"
-                "#extension GL_ARB_shader_atomic_counters : enable\n"
                 "\n"
                 "in vec4 piglit_vertex;\n"
                 "\n"
@@ -232,7 +230,8 @@ run_test_tess_evaluation(void)
                 "void main() {\n"
                 "       fg = ivec4(0);\n"
                 "}\n";
-        const char *tes_source = "#version 140\n"
+        const char *tes_source = "#version 150\n"
+                "#extension GL_ARB_shader_atomic_counters : enable\n"
                 "#extension GL_ARB_tessellation_shader : enable\n"
                 "\n"
                 "layout(triangles, point_mode) in;\n"
@@ -248,8 +247,7 @@ run_test_tess_evaluation(void)
                 "               atomicCounterIncrement(x);\n"
                 "       }\n"
                 "}\n";
-        const char *tcs_source = "#version 140\n"
-                "#extension GL_ARB_shader_atomic_counters : enable\n"
+        const char *tcs_source = "#version 150\n"
                 "#extension GL_ARB_tessellation_shader : enable\n"
                 "\n"
                 "layout(vertices=3) out;\n"
@@ -267,7 +265,6 @@ run_test_tess_evaluation(void)
                 "               gl_in[gl_InvocationID].gl_Position;\n"
                 "}\n";
         const char *vs_source = "#version 140\n"
-                "#extension GL_ARB_shader_atomic_counters : enable\n"
                 "\n"
                 "in vec4 piglit_vertex;\n"
                 "\n"
-- 
1.8.5.5