[Mesa-stable] [PATCH 1/3] glsl-1.10: Expect __ tests to pass

[Ian Romanick]

From: Ian Romanick <ian.d.romanick at intel.com>

>From page 14 (page 20 of the PDF) of the GLSL 1.10 spec:

    "In addition, all identifiers containing two consecutive underscores
     (__) are reserved as possible future keywords."

The intention is that names containing __ are reserved for internal use
by the implementation, and names prefixed with GL_ are reserved for use
by Khronos.  Names simply containing __ are dangerous to use, but should
be allowed.

Per the Khronos bug mentioned below, a future version of the GLSL
specification will clarify this.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Cc: "9.2 10.0 10.1" <mesa-stable at lists.freedesktop.org>
Cc: Tapani Pälli <lemody at gmail.com>
Cc: Kenneth Graunke <kenneth at whitecape.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71870
Bugzilla: Khronos #11702
---
 tests/spec/glsl-1.10/compiler/reserved/double-underscore-01.frag | 7 ++++++-
 tests/spec/glsl-1.10/compiler/reserved/double-underscore-02.frag | 8 +++++++-
 tests/spec/glsl-1.10/compiler/reserved/double-underscore-03.frag | 7 ++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/tests/spec/glsl-1.10/compiler/reserved/double-underscore-01.frag b/tests/spec/glsl-1.10/compiler/reserved/double-underscore-01.frag
index 7e8637a..a0d3faf 100644
--- a/tests/spec/glsl-1.10/compiler/reserved/double-underscore-01.frag
+++ b/tests/spec/glsl-1.10/compiler/reserved/double-underscore-01.frag
@@ -1,5 +1,5 @@
 // [config]
-// expect_result: fail
+// expect_result: pass
 // glsl_version: 1.10
 // [end config]
 //
@@ -9,6 +9,11 @@
 // From page 14 (20 of pdf) of the GLSL 1.10 spec:
 //     "In addition, all identifiers containing two consecutive underscores
 //     (__) are reserved as possible future keywords."
+//
+// The intention is that names containing __ are reserved for internal use by
+// the implementation, and names prefixed with GL_ are reserved for use by
+// Khronos.  Names simply containing __ are dangerous to use, but should be
+// allowed.
 
 int f()
 {
diff --git a/tests/spec/glsl-1.10/compiler/reserved/double-underscore-02.frag b/tests/spec/glsl-1.10/compiler/reserved/double-underscore-02.frag
index a818042..ce36d4a 100644
--- a/tests/spec/glsl-1.10/compiler/reserved/double-underscore-02.frag
+++ b/tests/spec/glsl-1.10/compiler/reserved/double-underscore-02.frag
@@ -1,5 +1,5 @@
 // [config]
-// expect_result: fail
+// expect_result: pass
 // glsl_version: 1.10
 // [end config]
 //
@@ -9,6 +9,12 @@
 // From page 14 (20 of pdf) of the GLSL 1.10 spec:
 //     "In addition, all identifiers containing two consecutive underscores
 //     (__) are reserved as possible future keywords."
+//
+// The intention is that names containing __ are reserved for internal use by
+// the implementation, and names prefixed with GL_ are reserved for use by
+// Khronos.  Names simply containing __ are dangerous to use, but should be
+// allowed.
+
 
 int f()
 {
diff --git a/tests/spec/glsl-1.10/compiler/reserved/double-underscore-03.frag b/tests/spec/glsl-1.10/compiler/reserved/double-underscore-03.frag
index 85bb0ce..2331d66 100644
--- a/tests/spec/glsl-1.10/compiler/reserved/double-underscore-03.frag
+++ b/tests/spec/glsl-1.10/compiler/reserved/double-underscore-03.frag
@@ -1,5 +1,5 @@
 // [config]
-// expect_result: fail
+// expect_result: pass
 // glsl_version: 1.10
 // [end config]
 //
@@ -9,6 +9,11 @@
 // From page 14 (20 of pdf) of the GLSL 1.10 spec:
 //     "In addition, all identifiers containing two consecutive underscores
 //     (__) are reserved as possible future keywords."
+//
+// The intention is that names containing __ are reserved for internal use by
+// the implementation, and names prefixed with GL_ are reserved for use by
+// Khronos.  Names simply containing __ are dangerous to use, but should be
+// allowed.
 
 int f()
 {
-- 
1.8.1.4