summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2013-08-09 14:28:35 -0700
committerIan Romanick <ian.d.romanick@intel.com>2013-08-15 15:24:00 -0700
commit898db0c7e535f7471fef41652e82f37a655acc8f (patch)
treea48eb7819ef6207054de2015cbd0a9ec0f5cc40f
parent18e74552640148ad40475a7fa0da249ffaebb6f8 (diff)
glsl-es-1.00: Fix really broken precision tests
Each of these tests contains a dummy function to work around issues with some GLSL compilers (e.g., Apple). Each of these dummy functions looks like: float f() { return 0.0; } Since most of the tests don't define a default precision for float, *ALL* of the fragment shader tests should fail to compile. Oops. Work around this by changing the dummy function to: void f() { } Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Paul Berry <stereotype441@gmail.com> Cc: Tom Gall <tom.gall@linaro.org>
-rw-r--r--tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-bool-01.frag4
-rw-r--r--tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-float-01.frag4
-rw-r--r--tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-int-01.frag4
-rw-r--r--tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-vec-01.frag4
-rw-r--r--tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-bool-01.frag3
-rw-r--r--tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-bool-02.frag3
-rw-r--r--tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-01.frag3
-rw-r--r--tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-02.frag3
-rw-r--r--tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-03.frag4
-rw-r--r--tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-04.frag3
-rw-r--r--tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-fs-highp-01.frag4
-rw-r--r--tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-fs-highp-02.frag4
-rw-r--r--tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-function-param-01.frag4
-rw-r--r--tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-global-01.frag4
-rw-r--r--tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-01.frag3
-rw-r--r--tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-02.frag3
-rw-r--r--tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-03.frag4
-rw-r--r--tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-literal-const-01.frag3
-rw-r--r--tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-literal-const-02.frag3
-rw-r--r--tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-local-01.frag3
-rw-r--r--tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-struct-01.frag4
-rw-r--r--tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-struct-02.frag4
-rw-r--r--tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-vs-highp-01.vert4
23 files changed, 23 insertions, 59 deletions
diff --git a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-bool-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-bool-01.frag
index 07b669fc8..ad934acf1 100644
--- a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-bool-01.frag
+++ b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-bool-01.frag
@@ -17,6 +17,4 @@
precision lowp bool;
-float f() {
- return 0.0;
-}
+void f() { }
diff --git a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-float-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-float-01.frag
index 63b8756fc..8a270b229 100644
--- a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-float-01.frag
+++ b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-float-01.frag
@@ -16,6 +16,4 @@
precision lowp float;
-float f() {
- return 0.0;
-}
+void f() { }
diff --git a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-int-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-int-01.frag
index ecfd6e7ad..2d3ba2102 100644
--- a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-int-01.frag
+++ b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-int-01.frag
@@ -16,6 +16,4 @@
precision mediump int;
-float f() {
- return 0.0;
-}
+void f() { }
diff --git a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-vec-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-vec-01.frag
index 777d06917..86c9c1716 100644
--- a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-vec-01.frag
+++ b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-vec-01.frag
@@ -18,6 +18,4 @@
precision mediump vec2;
-float f() {
- return 0.0;
-}
+void f() { }
diff --git a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-bool-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-bool-01.frag
index a350ae6ed..88855bdfd 100644
--- a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-bool-01.frag
+++ b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-bool-01.frag
@@ -11,7 +11,6 @@
#version 100
-float f() {
+void f() {
lowp bool b;
- return 0.0;
}
diff --git a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-bool-02.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-bool-02.frag
index 0251c78f5..1ba669a29 100644
--- a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-bool-02.frag
+++ b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-bool-02.frag
@@ -11,7 +11,6 @@
#version 130
-float f() {
+void f() {
lowp bvec2 v;
- return 0.0;
}
diff --git a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-01.frag
index 9e122b8d4..be6bb9817 100644
--- a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-01.frag
+++ b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-01.frag
@@ -11,7 +11,6 @@
#version 100
-float f() {
+void f() {
mediump float x;
- return 0.0;
}
diff --git a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-02.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-02.frag
index e84dba02b..34033e3c3 100644
--- a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-02.frag
+++ b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-02.frag
@@ -11,7 +11,6 @@
#version 100
-float f() {
+void f() {
lowp vec2 v;
- return 0.0;
}
diff --git a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-03.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-03.frag
index d4878edd7..2a9ceb210 100644
--- a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-03.frag
+++ b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-03.frag
@@ -13,6 +13,4 @@
lowp float a[4];
-float f() {
- return 0.0;
-}
+void f() { }
diff --git a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-04.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-04.frag
index b13877df4..f5680441b 100644
--- a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-04.frag
+++ b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-04.frag
@@ -11,7 +11,6 @@
#version 100
-float f() {
+void f() {
lowp mat4 m;
- return 0.0;
}
diff --git a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-fs-highp-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-fs-highp-01.frag
index 7540d3004..46a81b0fc 100644
--- a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-fs-highp-01.frag
+++ b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-fs-highp-01.frag
@@ -19,6 +19,4 @@
highp float x;
#endif
-float f() {
- return 0.0;
-}
+void f() { }
diff --git a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-fs-highp-02.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-fs-highp-02.frag
index a79d0f02e..18bc6a183 100644
--- a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-fs-highp-02.frag
+++ b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-fs-highp-02.frag
@@ -21,6 +21,4 @@ highp float x;
#error
#endif
-float f() {
- return 0.0;
-}
+void f() { }
diff --git a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-function-param-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-function-param-01.frag
index 8ab67340e..2e776a5ff 100644
--- a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-function-param-01.frag
+++ b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-function-param-01.frag
@@ -11,6 +11,4 @@
#version 100
-lowp float f(lowp int x) {
- return 0.0;
-}
+void f(lowp int x) { }
diff --git a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-global-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-global-01.frag
index 83e4ce96f..ec61ac2d6 100644
--- a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-global-01.frag
+++ b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-global-01.frag
@@ -14,6 +14,4 @@
uniform mediump float x;
varying lowp float y;
-float f() {
- return 0.0;
-}
+void f() { }
diff --git a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-01.frag
index 061b36542..84b00435e 100644
--- a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-01.frag
+++ b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-01.frag
@@ -11,7 +11,6 @@
#version 100
-float f() {
+void f() {
lowp int x;
- return 0.0;
}
diff --git a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-02.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-02.frag
index 3572a4b77..9fe1cf3bf 100644
--- a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-02.frag
+++ b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-02.frag
@@ -11,7 +11,6 @@
#version 100
-float f() {
+void f() {
mediump ivec2 v;
- return 0.0;
}
diff --git a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-03.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-03.frag
index 4ed9263fa..fcb63d96d 100644
--- a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-03.frag
+++ b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-03.frag
@@ -13,6 +13,4 @@
lowp int a[4];
-float f() {
- return 0.0;
-}
+void f() { }
diff --git a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-literal-const-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-literal-const-01.frag
index abeb82c99..a410d29ee 100644
--- a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-literal-const-01.frag
+++ b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-literal-const-01.frag
@@ -10,7 +10,6 @@
#version 100
-float f() {
+void f() {
lowp int x = lowp 1;
- return 0.0;
}
diff --git a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-literal-const-02.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-literal-const-02.frag
index 8daeb3bb2..a9364a010 100644
--- a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-literal-const-02.frag
+++ b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-literal-const-02.frag
@@ -10,7 +10,6 @@
#version 100
-float f() {
+void f() {
lowp float x = lowp 0.0;
- return 0.0;
}
diff --git a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-local-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-local-01.frag
index 4f7e28525..674c2fdfc 100644
--- a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-local-01.frag
+++ b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-local-01.frag
@@ -11,7 +11,6 @@
#version 100
-float f() {
+void f() {
lowp float x = 0.0;
- return 0.0;
}
diff --git a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-struct-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-struct-01.frag
index 07161a273..f0063db51 100644
--- a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-struct-01.frag
+++ b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-struct-01.frag
@@ -16,6 +16,4 @@ lowp struct s {
lowp float a;
};
-float f() {
- return 0.0;
-}
+void f() { }
diff --git a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-struct-02.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-struct-02.frag
index 4dcaa9809..b14d17516 100644
--- a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-struct-02.frag
+++ b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-struct-02.frag
@@ -16,6 +16,4 @@ lowp struct s {
float a;
};
-float f() {
- return 0.0;
-}
+void f() { }
diff --git a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-vs-highp-01.vert b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-vs-highp-01.vert
index bf9a0eb91..b7c7e2676 100644
--- a/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-vs-highp-01.vert
+++ b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-vs-highp-01.vert
@@ -13,6 +13,4 @@
highp float x;
-float f() {
- return 0.0;
-}
+void f() { }