[Piglit] [PATCH 5/8] arb_enhanced_layouts/component-layout: require GLSL 1.50

Marek Olšák maraeo at gmail.com
Mon Apr 10 21:01:40 UTC 2017


From: Marek Olšák <marek.olsak at amd.com>

---
 .../linker/component-layout/fs-out-array.shader_test                    | 2 +-
 .../linker/component-layout/fs-out-overlap2.shader_test                 | 2 +-
 .../linker/component-layout/fs-out-overlap3.shader_test                 | 2 +-
 .../linker/component-layout/fs-out-overlap4.shader_test                 | 2 +-
 .../linker/component-layout/fs-out-type-mismatch-array.shader_test      | 2 +-
 .../linker/component-layout/fs-out-type-mismatch.shader_test            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/spec/arb_enhanced_layouts/linker/component-layout/fs-out-array.shader_test b/tests/spec/arb_enhanced_layouts/linker/component-layout/fs-out-array.shader_test
index df96f89..e0defac 100644
--- a/tests/spec/arb_enhanced_layouts/linker/component-layout/fs-out-array.shader_test
+++ b/tests/spec/arb_enhanced_layouts/linker/component-layout/fs-out-array.shader_test
@@ -1,19 +1,19 @@
 // From Section 4.4.2 (Output Layout Qualifiers) of the GLSL 4.40 spec:
 //
 //   "Additionally, for fragment shader outputs, if two variables are placed
 //   within the same location, they must have the same underlying type
 //   (floating-point or integer). No component aliasing of output variables or
 //   members is allowed."
 
 [require]
-GLSL >= 1.40
+GLSL >= 1.50
 GL_ARB_enhanced_layouts
 GL_ARB_separate_shader_objects
 GL_ARB_explicit_attrib_location
 
 [vertex shader passthrough]
 
 [fragment shader]
 #version 150
 #extension GL_ARB_enhanced_layouts: require
 #extension GL_ARB_separate_shader_objects: require
diff --git a/tests/spec/arb_enhanced_layouts/linker/component-layout/fs-out-overlap2.shader_test b/tests/spec/arb_enhanced_layouts/linker/component-layout/fs-out-overlap2.shader_test
index 44817ee..ac995e5 100644
--- a/tests/spec/arb_enhanced_layouts/linker/component-layout/fs-out-overlap2.shader_test
+++ b/tests/spec/arb_enhanced_layouts/linker/component-layout/fs-out-overlap2.shader_test
@@ -1,19 +1,19 @@
 // From Section 4.4.2 (Output Layout Qualifiers) of the GLSL 4.40 spec:
 //
 //   "Additionally, for fragment shader outputs, if two variables are placed
 //   within the same location, they must have the same underlying type
 //   (floating-point or integer). No component aliasing of output variables or
 //   members is allowed."
 
 [require]
-GLSL >= 1.40
+GLSL >= 1.50
 GL_ARB_enhanced_layouts
 GL_ARB_separate_shader_objects
 GL_ARB_explicit_attrib_location
 
 [vertex shader passthrough]
 
 [fragment shader]
 #version 150
 #extension GL_ARB_enhanced_layouts: require
 #extension GL_ARB_separate_shader_objects: require
diff --git a/tests/spec/arb_enhanced_layouts/linker/component-layout/fs-out-overlap3.shader_test b/tests/spec/arb_enhanced_layouts/linker/component-layout/fs-out-overlap3.shader_test
index f6200b6..5cc1b97 100644
--- a/tests/spec/arb_enhanced_layouts/linker/component-layout/fs-out-overlap3.shader_test
+++ b/tests/spec/arb_enhanced_layouts/linker/component-layout/fs-out-overlap3.shader_test
@@ -1,19 +1,19 @@
 // From Section 4.4.2 (Output Layout Qualifiers) of the GLSL 4.40 spec:
 //
 //   "Additionally, for fragment shader outputs, if two variables are placed
 //   within the same location, they must have the same underlying type
 //   (floating-point or integer). No component aliasing of output variables or
 //   members is allowed."
 
 [require]
-GLSL >= 1.40
+GLSL >= 1.50
 GL_ARB_enhanced_layouts
 GL_ARB_separate_shader_objects
 GL_ARB_explicit_attrib_location
 
 [vertex shader passthrough]
 
 [fragment shader]
 #version 150
 #extension GL_ARB_enhanced_layouts: require
 #extension GL_ARB_separate_shader_objects: require
diff --git a/tests/spec/arb_enhanced_layouts/linker/component-layout/fs-out-overlap4.shader_test b/tests/spec/arb_enhanced_layouts/linker/component-layout/fs-out-overlap4.shader_test
index 43ac056..051fe90 100644
--- a/tests/spec/arb_enhanced_layouts/linker/component-layout/fs-out-overlap4.shader_test
+++ b/tests/spec/arb_enhanced_layouts/linker/component-layout/fs-out-overlap4.shader_test
@@ -1,19 +1,19 @@
 // From Section 4.4.2 (Output Layout Qualifiers) of the GLSL 4.40 spec:
 //
 //   "Additionally, for fragment shader outputs, if two variables are placed
 //   within the same location, they must have the same underlying type
 //   (floating-point or integer). No component aliasing of output variables or
 //   members is allowed."
 
 [require]
-GLSL >= 1.40
+GLSL >= 1.50
 GL_ARB_enhanced_layouts
 GL_ARB_separate_shader_objects
 GL_ARB_explicit_attrib_location
 
 [vertex shader passthrough]
 
 [fragment shader]
 #version 150
 #extension GL_ARB_enhanced_layouts: require
 #extension GL_ARB_separate_shader_objects: require
diff --git a/tests/spec/arb_enhanced_layouts/linker/component-layout/fs-out-type-mismatch-array.shader_test b/tests/spec/arb_enhanced_layouts/linker/component-layout/fs-out-type-mismatch-array.shader_test
index 7ca5543..14c3ee9 100644
--- a/tests/spec/arb_enhanced_layouts/linker/component-layout/fs-out-type-mismatch-array.shader_test
+++ b/tests/spec/arb_enhanced_layouts/linker/component-layout/fs-out-type-mismatch-array.shader_test
@@ -1,19 +1,19 @@
 // From Section 4.4.2 (Output Layout Qualifiers) of the GLSL 4.40 spec:
 //
 //   "Additionally, for fragment shader outputs, if two variables are placed
 //   within the same location, they must have the same underlying type
 //   (floating-point or integer). No component aliasing of output variables or
 //   members is allowed."
 
 [require]
-GLSL >= 1.40
+GLSL >= 1.50
 GL_ARB_enhanced_layouts
 GL_ARB_separate_shader_objects
 GL_ARB_explicit_attrib_location
 
 [vertex shader passthrough]
 
 [fragment shader]
 #version 150
 #extension GL_ARB_enhanced_layouts: require
 #extension GL_ARB_separate_shader_objects: require
diff --git a/tests/spec/arb_enhanced_layouts/linker/component-layout/fs-out-type-mismatch.shader_test b/tests/spec/arb_enhanced_layouts/linker/component-layout/fs-out-type-mismatch.shader_test
index 450c182..7644044 100644
--- a/tests/spec/arb_enhanced_layouts/linker/component-layout/fs-out-type-mismatch.shader_test
+++ b/tests/spec/arb_enhanced_layouts/linker/component-layout/fs-out-type-mismatch.shader_test
@@ -1,19 +1,19 @@
 // From Section 4.4.2 (Output Layout Qualifiers) of the GLSL 4.40 spec:
 //
 //   "Additionally, for fragment shader outputs, if two variables are placed
 //   within the same location, they must have the same underlying type
 //   (floating-point or integer). No component aliasing of output variables or
 //   members is allowed."
 
 [require]
-GLSL >= 1.40
+GLSL >= 1.50
 GL_ARB_enhanced_layouts
 GL_ARB_separate_shader_objects
 GL_ARB_explicit_attrib_location
 
 [vertex shader passthrough]
 
 [fragment shader]
 #version 150
 #extension GL_ARB_enhanced_layouts: require
 #extension GL_ARB_separate_shader_objects: require
-- 
2.7.4



More information about the Piglit mailing list