[1/4] remove 'es' from glsl_version in shaders

Submitted by Dylan Baker on April 14, 2015, 8:52 p.m.

Details

Message ID 1429044766-11803-2-git-send-email-baker.dylan.c@gmail.com
State New, archived
Headers show

Not browsing as part of any series.

Commit Message

Dylan Baker April 14, 2015, 8:52 p.m.
glslparser doesn't do anything with this information, it just assumes
that version 1.00 or 3.00 must be OpenGL ES. With that in mind it is
completely safe to drop this extra data, and that was it doesn't trip up
the space error in the Test arguments.

Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
---
 tests/spec/glsl-es-3.00/compiler/default-precision-sampler.frag         | 2 +-
 tests/spec/glsl-es-3.00/compiler/default-precision-sampler.vert         | 2 +-
 .../compiler/interpolation-qualifiers/nonflat-int-array.frag            | 2 +-
 .../compiler/interpolation-qualifiers/nonflat-int-array.vert            | 2 +-
 .../glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-int.frag     | 2 +-
 .../glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-int.vert     | 2 +-
 .../glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-ivec4.frag   | 2 +-
 .../glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-ivec4.vert   | 2 +-
 .../glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uint.frag    | 2 +-
 .../glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uint.vert    | 2 +-
 .../glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uvec4.frag   | 2 +-
 .../glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uvec4.vert   | 2 +-
 tests/spec/glsl-es-3.00/compiler/precision-sampler.frag                 | 2 +-
 tests/spec/glsl-es-3.00/compiler/precision-sampler.vert                 | 2 +-
 tests/spec/glsl-es-3.00/compiler/uniform_block/block-array.vert         | 2 +-
 .../uniform_block/interface-name-access-without-interface-name.vert     | 2 +-
 .../interface-name-array-access-with-noncontant-index.vert              | 2 +-
 .../uniform_block/interface-name-array-access-without-index.vert        | 2 +-
 .../compiler/uniform_block/interface-name-array-without-size.vert       | 2 +-
 .../spec/glsl-es-3.00/compiler/uniform_block/interface-name-array.vert  | 2 +-
 .../spec/glsl-es-3.00/compiler/uniform_block/interface-name-basic.vert  | 2 +-
 .../uniform_block/interface-name-field-clashes-with-function.vert       | 2 +-
 .../uniform_block/interface-name-field-clashes-with-struct.vert         | 2 +-
 .../uniform_block/interface-name-field-clashes-with-variable.vert       | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

Patch hide | download patch | download mbox

diff --git a/tests/spec/glsl-es-3.00/compiler/default-precision-sampler.frag b/tests/spec/glsl-es-3.00/compiler/default-precision-sampler.frag
index 4731491..dbbcd5c 100644
--- a/tests/spec/glsl-es-3.00/compiler/default-precision-sampler.frag
+++ b/tests/spec/glsl-es-3.00/compiler/default-precision-sampler.frag
@@ -1,6 +1,6 @@ 
 // [config]
 // expect_result: pass
-// glsl_version: 3.00 es
+// glsl_version: 3.00
 // check_link: true
 // [end config]
 //
diff --git a/tests/spec/glsl-es-3.00/compiler/default-precision-sampler.vert b/tests/spec/glsl-es-3.00/compiler/default-precision-sampler.vert
index 7b10053..d6f5814 100644
--- a/tests/spec/glsl-es-3.00/compiler/default-precision-sampler.vert
+++ b/tests/spec/glsl-es-3.00/compiler/default-precision-sampler.vert
@@ -1,6 +1,6 @@ 
 // [config]
 // expect_result: pass
-// glsl_version: 3.00 es
+// glsl_version: 3.00
 // check_link: true
 // [end config]
 //
diff --git a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-int-array.frag b/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-int-array.frag
index a36ea73..2be690b 100644
--- a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-int-array.frag
+++ b/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-int-array.frag
@@ -1,6 +1,6 @@ 
 // [config]
 // expect_result: fail
-// glsl_version: 3.00 es
+// glsl_version: 3.00
 // check_link: true
 // [end config]
 //
diff --git a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-int-array.vert b/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-int-array.vert
index 6a5aa17..f4c21fe 100644
--- a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-int-array.vert
+++ b/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-int-array.vert
@@ -1,6 +1,6 @@ 
 // [config]
 // expect_result: fail
-// glsl_version: 3.00 es
+// glsl_version: 3.00
 // check_link: true
 // [end config]
 //
diff --git a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-int.frag b/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-int.frag
index 470ebbf..44dc023 100644
--- a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-int.frag
+++ b/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-int.frag
@@ -1,6 +1,6 @@ 
 // [config]
 // expect_result: fail
-// glsl_version: 3.00 es
+// glsl_version: 3.00
 // check_link: true
 // [end config]
 //
diff --git a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-int.vert b/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-int.vert
index 2e3dde0..cfdd66f 100644
--- a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-int.vert
+++ b/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-int.vert
@@ -1,6 +1,6 @@ 
 // [config]
 // expect_result: fail
-// glsl_version: 3.00 es
+// glsl_version: 3.00
 // check_link: true
 // [end config]
 //
diff --git a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-ivec4.frag b/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-ivec4.frag
index ffdec89..b683503 100644
--- a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-ivec4.frag
+++ b/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-ivec4.frag
@@ -1,6 +1,6 @@ 
 // [config]
 // expect_result: fail
-// glsl_version: 3.00 es
+// glsl_version: 3.00
 // check_link: true
 // [end config]
 //
diff --git a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-ivec4.vert b/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-ivec4.vert
index d28b885..5171701 100644
--- a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-ivec4.vert
+++ b/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-ivec4.vert
@@ -1,6 +1,6 @@ 
 // [config]
 // expect_result: fail
-// glsl_version: 3.00 es
+// glsl_version: 3.00
 // check_link: true
 // [end config]
 //
diff --git a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uint.frag b/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uint.frag
index 52bb49d..3acf125 100644
--- a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uint.frag
+++ b/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uint.frag
@@ -1,6 +1,6 @@ 
 // [config]
 // expect_result: fail
-// glsl_version: 3.00 es
+// glsl_version: 3.00
 // check_link: true
 // [end config]
 //
diff --git a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uint.vert b/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uint.vert
index 6361db5..ebe8c96 100644
--- a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uint.vert
+++ b/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uint.vert
@@ -1,6 +1,6 @@ 
 // [config]
 // expect_result: fail
-// glsl_version: 3.00 es
+// glsl_version: 3.00
 // check_link: true
 // [end config]
 //
diff --git a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uvec4.frag b/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uvec4.frag
index 86e5702..05903b9 100644
--- a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uvec4.frag
+++ b/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uvec4.frag
@@ -1,6 +1,6 @@ 
 // [config]
 // expect_result: fail
-// glsl_version: 3.00 es
+// glsl_version: 3.00
 // check_link: true
 // [end config]
 //
diff --git a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uvec4.vert b/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uvec4.vert
index 9425d0b..7f6d952 100644
--- a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uvec4.vert
+++ b/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uvec4.vert
@@ -1,6 +1,6 @@ 
 // [config]
 // expect_result: fail
-// glsl_version: 3.00 es
+// glsl_version: 3.00
 // check_link: true
 // [end config]
 //
diff --git a/tests/spec/glsl-es-3.00/compiler/precision-sampler.frag b/tests/spec/glsl-es-3.00/compiler/precision-sampler.frag
index 346ebb3..600474a 100644
--- a/tests/spec/glsl-es-3.00/compiler/precision-sampler.frag
+++ b/tests/spec/glsl-es-3.00/compiler/precision-sampler.frag
@@ -1,6 +1,6 @@ 
 // [config]
 // expect_result: pass
-// glsl_version: 3.00 es
+// glsl_version: 3.00
 // check_link: true
 // [end config]
 //
diff --git a/tests/spec/glsl-es-3.00/compiler/precision-sampler.vert b/tests/spec/glsl-es-3.00/compiler/precision-sampler.vert
index a25a537..1345aec 100644
--- a/tests/spec/glsl-es-3.00/compiler/precision-sampler.vert
+++ b/tests/spec/glsl-es-3.00/compiler/precision-sampler.vert
@@ -1,6 +1,6 @@ 
 // [config]
 // expect_result: pass
-// glsl_version: 3.00 es
+// glsl_version: 3.00
 // check_link: true
 // [end config]
 //
diff --git a/tests/spec/glsl-es-3.00/compiler/uniform_block/block-array.vert b/tests/spec/glsl-es-3.00/compiler/uniform_block/block-array.vert
index ebcf2a4..a4f75ab 100644
--- a/tests/spec/glsl-es-3.00/compiler/uniform_block/block-array.vert
+++ b/tests/spec/glsl-es-3.00/compiler/uniform_block/block-array.vert
@@ -1,6 +1,6 @@ 
 /* [config]
  * expect_result: fail
- * glsl_version: 3.00 es
+ * glsl_version: 3.00
  * [end config]
  *
  * The GLSL ES 3.00 spec says:
diff --git a/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-access-without-interface-name.vert b/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-access-without-interface-name.vert
index 3309768..62fa460 100644
--- a/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-access-without-interface-name.vert
+++ b/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-access-without-interface-name.vert
@@ -1,6 +1,6 @@ 
 /* [config]
  * expect_result: fail
- * glsl_version: 3.00 es
+ * glsl_version: 3.00
  * [end config]
  *
  * The GLSL ES 3.00 spec says:
diff --git a/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-array-access-with-noncontant-index.vert b/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-array-access-with-noncontant-index.vert
index cdf7b0e..c9ac74b 100644
--- a/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-array-access-with-noncontant-index.vert
+++ b/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-array-access-with-noncontant-index.vert
@@ -1,6 +1,6 @@ 
 /* [config]
  * expect_result: fail
- * glsl_version: 3.00 es
+ * glsl_version: 3.00
  * [end config]
  *
  * The GLSL ES 3.00 spec says:
diff --git a/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-array-access-without-index.vert b/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-array-access-without-index.vert
index 6bf97dc..e576c02 100644
--- a/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-array-access-without-index.vert
+++ b/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-array-access-without-index.vert
@@ -1,6 +1,6 @@ 
 /* [config]
  * expect_result: fail
- * glsl_version: 3.00 es
+ * glsl_version: 3.00
  * [end config]
  *
  * The GLSL ES 3.00 spec says:
diff --git a/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-array-without-size.vert b/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-array-without-size.vert
index caf91bf..8f07420 100644
--- a/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-array-without-size.vert
+++ b/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-array-without-size.vert
@@ -1,6 +1,6 @@ 
 /* [config]
  * expect_result: fail
- * glsl_version: 3.00 es
+ * glsl_version: 3.00
  * [end config]
  *
  * The GLSL ES 3.00 spec says:
diff --git a/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-array.vert b/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-array.vert
index 511fc53..959fc5b 100644
--- a/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-array.vert
+++ b/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-array.vert
@@ -1,6 +1,6 @@ 
 /* [config]
  * expect_result: pass
- * glsl_version: 3.00 es
+ * glsl_version: 3.00
  * [end config]
  */
 #version 300 es
diff --git a/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-basic.vert b/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-basic.vert
index 16d55bd..fc30efa 100644
--- a/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-basic.vert
+++ b/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-basic.vert
@@ -1,6 +1,6 @@ 
 /* [config]
  * expect_result: pass
- * glsl_version: 3.00 es
+ * glsl_version: 3.00
  * [end config]
  */
 #version 300 es
diff --git a/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-field-clashes-with-function.vert b/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-field-clashes-with-function.vert
index 898b6d7..3e98309 100644
--- a/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-field-clashes-with-function.vert
+++ b/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-field-clashes-with-function.vert
@@ -1,6 +1,6 @@ 
 /* [config]
  * expect_result: pass
- * glsl_version: 3.00 es
+ * glsl_version: 3.00
  * [end config]
  *
  * The GLSL ES 3.00 spec says:
diff --git a/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-field-clashes-with-struct.vert b/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-field-clashes-with-struct.vert
index ae7400b..8296c0f 100644
--- a/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-field-clashes-with-struct.vert
+++ b/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-field-clashes-with-struct.vert
@@ -1,6 +1,6 @@ 
 /* [config]
  * expect_result: pass
- * glsl_version: 3.00 es
+ * glsl_version: 3.00
  * [end config]
  *
  * The GLSL ES 3.00 spec says:
diff --git a/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-field-clashes-with-variable.vert b/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-field-clashes-with-variable.vert
index 4e3102e..b55921a 100644
--- a/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-field-clashes-with-variable.vert
+++ b/tests/spec/glsl-es-3.00/compiler/uniform_block/interface-name-field-clashes-with-variable.vert
@@ -1,6 +1,6 @@ 
 /* [config]
  * expect_result: pass
- * glsl_version: 3.00 es
+ * glsl_version: 3.00
  * [end config]
  *
  * The GLSL ES 3.00 spec says: