[Piglit] [PATCH 02/10] arb_enhanced_layouts: GL_ARB_gpu_shader_fp64 requires GLSL 1.50

Andres Gomez agomez at igalia.com
Fri Feb 1 17:55:16 UTC 2019


Cc: Timothy Arceri <tarceri at itsqueeze.com>
Signed-off-by: Andres Gomez <agomez at igalia.com>
---
 .../compiler/component-layout/double-component-1.vert     | 4 ++--
 .../compiler/component-layout/double-component-3.vert     | 4 ++--
 .../compiler/component-layout/dvec2.vert                  | 4 ++--
 .../compiler/component-layout/dvec3.vert                  | 4 ++--
 .../compiler/component-layout/dvec4.vert                  | 4 ++--
 .../compiler/component-layout/overflow-double.vert        | 4 ++--
 .../compiler/component-layout/overflow-dvec2.vert         | 4 ++--
 .../component-layout/vs-fs-array-dvec3.shader_test        | 6 +++---
 .../execution/component-layout/vs-fs-doubles.shader_test  | 6 +++---
 .../component-layout/vs-to-fs-double-overlap.shader_test  | 6 +++---
 .../vs-to-fs-type-mismatch-double-float.shader_test       | 8 ++++----
 11 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/tests/spec/arb_enhanced_layouts/compiler/component-layout/double-component-1.vert b/tests/spec/arb_enhanced_layouts/compiler/component-layout/double-component-1.vert
index c8da16566..f0fb1616b 100644
--- a/tests/spec/arb_enhanced_layouts/compiler/component-layout/double-component-1.vert
+++ b/tests/spec/arb_enhanced_layouts/compiler/component-layout/double-component-1.vert
@@ -1,6 +1,6 @@
 // [config]
 // expect_result: fail
-// glsl_version: 1.40
+// glsl_version: 1.50
 // require_extensions: GL_ARB_enhanced_layouts GL_ARB_gpu_shader_fp64 GL_ARB_separate_shader_objects
 // [end config]
 //
@@ -9,7 +9,7 @@
 //   "It is a compile-time error to use component 1 or 3 as the beginning of a
 //   double or dvec2."
 
-#version 140
+#version 150
 #extension GL_ARB_enhanced_layouts: require
 #extension GL_ARB_gpu_shader_fp64: require
 #extension GL_ARB_separate_shader_objects: require
diff --git a/tests/spec/arb_enhanced_layouts/compiler/component-layout/double-component-3.vert b/tests/spec/arb_enhanced_layouts/compiler/component-layout/double-component-3.vert
index d054cd2a5..3c0a197fc 100644
--- a/tests/spec/arb_enhanced_layouts/compiler/component-layout/double-component-3.vert
+++ b/tests/spec/arb_enhanced_layouts/compiler/component-layout/double-component-3.vert
@@ -1,6 +1,6 @@
 // [config]
 // expect_result: fail
-// glsl_version: 1.40
+// glsl_version: 1.50
 // require_extensions: GL_ARB_enhanced_layouts GL_ARB_gpu_shader_fp64 GL_ARB_separate_shader_objects
 // [end config]
 //
@@ -9,7 +9,7 @@
 //   "It is a compile-time error to use component 1 or 3 as the beginning of a
 //   double or dvec2."
 
-#version 140
+#version 150
 #extension GL_ARB_enhanced_layouts: require
 #extension GL_ARB_gpu_shader_fp64: require
 #extension GL_ARB_separate_shader_objects: require
diff --git a/tests/spec/arb_enhanced_layouts/compiler/component-layout/dvec2.vert b/tests/spec/arb_enhanced_layouts/compiler/component-layout/dvec2.vert
index 090aac090..9cf96ea0d 100644
--- a/tests/spec/arb_enhanced_layouts/compiler/component-layout/dvec2.vert
+++ b/tests/spec/arb_enhanced_layouts/compiler/component-layout/dvec2.vert
@@ -1,6 +1,6 @@
 // [config]
 // expect_result: pass
-// glsl_version: 1.40
+// glsl_version: 1.50
 // require_extensions: GL_ARB_enhanced_layouts GL_ARB_gpu_shader_fp64 GL_ARB_separate_shader_objects
 // [end config]
 //
@@ -10,7 +10,7 @@
 //   consume all four components available within a location. A dvec3 or dvec4
 //   can only be declared without specifying a component."
 
-#version 140
+#version 150
 #extension GL_ARB_enhanced_layouts: require
 #extension GL_ARB_gpu_shader_fp64: require
 #extension GL_ARB_separate_shader_objects: require
diff --git a/tests/spec/arb_enhanced_layouts/compiler/component-layout/dvec3.vert b/tests/spec/arb_enhanced_layouts/compiler/component-layout/dvec3.vert
index 192765809..84eaf3ef7 100644
--- a/tests/spec/arb_enhanced_layouts/compiler/component-layout/dvec3.vert
+++ b/tests/spec/arb_enhanced_layouts/compiler/component-layout/dvec3.vert
@@ -1,6 +1,6 @@
 // [config]
 // expect_result: fail
-// glsl_version: 1.40
+// glsl_version: 1.50
 // require_extensions: GL_ARB_enhanced_layouts GL_ARB_gpu_shader_fp64 GL_ARB_separate_shader_objects
 // [end config]
 //
@@ -8,7 +8,7 @@
 //
 //   "A dvec3 or dvec4 can only be declared without specifying a component."
 
-#version 140
+#version 150
 #extension GL_ARB_enhanced_layouts: require
 #extension GL_ARB_gpu_shader_fp64: require
 #extension GL_ARB_separate_shader_objects: require
diff --git a/tests/spec/arb_enhanced_layouts/compiler/component-layout/dvec4.vert b/tests/spec/arb_enhanced_layouts/compiler/component-layout/dvec4.vert
index 35584170f..3c6216310 100644
--- a/tests/spec/arb_enhanced_layouts/compiler/component-layout/dvec4.vert
+++ b/tests/spec/arb_enhanced_layouts/compiler/component-layout/dvec4.vert
@@ -1,6 +1,6 @@
 // [config]
 // expect_result: fail
-// glsl_version: 1.40
+// glsl_version: 1.50
 // require_extensions: GL_ARB_enhanced_layouts GL_ARB_gpu_shader_fp64 GL_ARB_separate_shader_objects
 // [end config]
 //
@@ -8,7 +8,7 @@
 //
 //   "A dvec3 or dvec4 can only be declared without specifying a component."
 
-#version 140
+#version 150
 #extension GL_ARB_enhanced_layouts: require
 #extension GL_ARB_gpu_shader_fp64: require
 #extension GL_ARB_separate_shader_objects: require
diff --git a/tests/spec/arb_enhanced_layouts/compiler/component-layout/overflow-double.vert b/tests/spec/arb_enhanced_layouts/compiler/component-layout/overflow-double.vert
index da60aa361..99eb7abc5 100644
--- a/tests/spec/arb_enhanced_layouts/compiler/component-layout/overflow-double.vert
+++ b/tests/spec/arb_enhanced_layouts/compiler/component-layout/overflow-double.vert
@@ -1,6 +1,6 @@
 // [config]
 // expect_result: fail
-// glsl_version: 1.40
+// glsl_version: 1.50
 // require_extensions: GL_ARB_enhanced_layouts GL_ARB_gpu_shader_fp64 GL_ARB_separate_shader_objects
 // [end config]
 //
@@ -12,7 +12,7 @@
 //   will consume two of these components, and a dvec2 will consume all four
 //   components available within a location."
 
-#version 140
+#version 150
 #extension GL_ARB_enhanced_layouts: require
 #extension GL_ARB_gpu_shader_fp64: require
 #extension GL_ARB_separate_shader_objects: require
diff --git a/tests/spec/arb_enhanced_layouts/compiler/component-layout/overflow-dvec2.vert b/tests/spec/arb_enhanced_layouts/compiler/component-layout/overflow-dvec2.vert
index baa05758f..27df8038c 100644
--- a/tests/spec/arb_enhanced_layouts/compiler/component-layout/overflow-dvec2.vert
+++ b/tests/spec/arb_enhanced_layouts/compiler/component-layout/overflow-dvec2.vert
@@ -1,6 +1,6 @@
 // [config]
 // expect_result: fail
-// glsl_version: 1.40
+// glsl_version: 1.50
 // require_extensions: GL_ARB_enhanced_layouts GL_ARB_gpu_shader_fp64 GL_ARB_separate_shader_objects
 // [end config]
 //
@@ -12,7 +12,7 @@
 //   will consume two of these components, and a dvec2 will consume all four
 //   components available within a location."
 
-#version 140
+#version 150
 #extension GL_ARB_enhanced_layouts: require
 #extension GL_ARB_gpu_shader_fp64: require
 #extension GL_ARB_separate_shader_objects: require
diff --git a/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-fs-array-dvec3.shader_test b/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-fs-array-dvec3.shader_test
index c2d619953..de348cbb3 100644
--- a/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-fs-array-dvec3.shader_test
+++ b/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-fs-array-dvec3.shader_test
@@ -1,13 +1,13 @@
 # Test filling in the gaps of a dvec3 array.
 
 [require]
-GLSL >= 1.40
+GLSL >= 1.50
 GL_ARB_enhanced_layouts
 GL_ARB_separate_shader_objects
 GL_ARB_gpu_shader_fp64
 
 [vertex shader]
-#version 140
+#version 150
 #extension GL_ARB_enhanced_layouts: require
 #extension GL_ARB_separate_shader_objects: require
 #extension GL_ARB_gpu_shader_fp64: require
@@ -30,7 +30,7 @@ void main()
 }
 
 [fragment shader]
-#version 140
+#version 150
 #extension GL_ARB_enhanced_layouts: require
 #extension GL_ARB_separate_shader_objects: require
 #extension GL_ARB_gpu_shader_fp64: require
diff --git a/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-fs-doubles.shader_test b/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-fs-doubles.shader_test
index 250766834..0d40820aa 100644
--- a/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-fs-doubles.shader_test
+++ b/tests/spec/arb_enhanced_layouts/execution/component-layout/vs-fs-doubles.shader_test
@@ -1,13 +1,13 @@
 # pass a basic double component layout through vs->fs.
 
 [require]
-GLSL >= 1.40
+GLSL >= 1.50
 GL_ARB_enhanced_layouts
 GL_ARB_separate_shader_objects
 GL_ARB_gpu_shader_fp64
 
 [vertex shader]
-#version 140
+#version 150
 #extension GL_ARB_enhanced_layouts: require
 #extension GL_ARB_separate_shader_objects: require
 #extension GL_ARB_gpu_shader_fp64: require
@@ -30,7 +30,7 @@ void main()
 }
 
 [fragment shader]
-#version 140
+#version 150
 #extension GL_ARB_enhanced_layouts: require
 #extension GL_ARB_separate_shader_objects: require
 #extension GL_ARB_gpu_shader_fp64: require
diff --git a/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-double-overlap.shader_test b/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-double-overlap.shader_test
index f692dd811..ac04c439e 100644
--- a/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-double-overlap.shader_test
+++ b/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-double-overlap.shader_test
@@ -9,13 +9,13 @@
 //   component aliasing."
 
 [require]
-GLSL >= 1.40
+GLSL >= 1.50
 GL_ARB_enhanced_layouts
 GL_ARB_gpu_shader_fp64
 GL_ARB_separate_shader_objects
 
 [vertex shader]
-#version 140
+#version 150
 #extension GL_ARB_enhanced_layouts: require
 #extension GL_ARB_gpu_shader_fp64: require
 #extension GL_ARB_separate_shader_objects: require
@@ -33,7 +33,7 @@ void main()
 }
 
 [fragment shader]
-#version 140
+#version 150
 #extension GL_ARB_enhanced_layouts: require
 #extension GL_ARB_gpu_shader_fp64: require
 #extension GL_ARB_separate_shader_objects: require
diff --git a/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-double-float.shader_test b/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-double-float.shader_test
index 1f822c025..8f11bf131 100644
--- a/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-double-float.shader_test
+++ b/tests/spec/arb_enhanced_layouts/linker/component-layout/vs-to-fs-type-mismatch-double-float.shader_test
@@ -13,13 +13,13 @@
 //   the same auxiliary storage and interpolation qualification"
 
 [require]
-GLSL >= 1.40
+GLSL >= 1.50
 GL_ARB_enhanced_layouts
-GL_ARB_separate_shader_objects
 GL_ARB_gpu_shader_fp64
+GL_ARB_separate_shader_objects
 
 [vertex shader]
-#version 140
+#version 150
 #extension GL_ARB_enhanced_layouts: require
 #extension GL_ARB_gpu_shader_fp64: require
 #extension GL_ARB_separate_shader_objects: require
@@ -37,7 +37,7 @@ void main()
 }
 
 [fragment shader]
-#version 140
+#version 150
 #extension GL_ARB_enhanced_layouts: require
 #extension GL_ARB_gpu_shader_fp64: require
 #extension GL_ARB_separate_shader_objects: require
-- 
2.20.1



More information about the Piglit mailing list