aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVinson Lee <vlee@vmware.com>2010-07-14 17:11:56 -0700
committerVinson Lee <vlee@vmware.com>2010-07-14 17:11:56 -0700
commit14277414a6529425856e30af370ce3341f9916f9 (patch)
treef176a83bd1e19af51a9caabde4b60c1bf61a33b3
parent92ff6a91d6a14114bc3b16a765254c88c99d91bb (diff)
glsl-const-builtin-*: Fix GLSL compilation errors on Mac OS X.
-rw-r--r--tests/shaders/glsl-const-builtin-acos.shader_test2
-rw-r--r--tests/shaders/glsl-const-builtin-atan.shader_test2
-rw-r--r--tests/shaders/glsl-const-builtin-exp-log.shader_test2
-rw-r--r--tests/shaders/glsl-const-builtin-exp2.shader_test2
-rw-r--r--tests/shaders/glsl-const-builtin-log2.shader_test2
-rw-r--r--tests/shaders/glsl-const-builtin-sqrt.shader_test2
6 files changed, 6 insertions, 6 deletions
diff --git a/tests/shaders/glsl-const-builtin-acos.shader_test b/tests/shaders/glsl-const-builtin-acos.shader_test
index 4b535b65..0ceb1cb7 100644
--- a/tests/shaders/glsl-const-builtin-acos.shader_test
+++ b/tests/shaders/glsl-const-builtin-acos.shader_test
@@ -9,7 +9,7 @@ glsl-mvp.vert
#version 120
void main() {
const float zero = acos(1.0);
- const float zero2 = acos(1);
+ const float zero2 = acos(1.0);
gl_FragColor = vec4(zero, 1.0, zero2, 1.0);
}
diff --git a/tests/shaders/glsl-const-builtin-atan.shader_test b/tests/shaders/glsl-const-builtin-atan.shader_test
index 4a231302..c81e5ce4 100644
--- a/tests/shaders/glsl-const-builtin-atan.shader_test
+++ b/tests/shaders/glsl-const-builtin-atan.shader_test
@@ -9,7 +9,7 @@ glsl-mvp.vert
#version 120
void main() {
const float x = atan(100.0, 100.0);
- const float y = atan(1);
+ const float y = atan(1.0);
if (x == y)
gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0);
else
diff --git a/tests/shaders/glsl-const-builtin-exp-log.shader_test b/tests/shaders/glsl-const-builtin-exp-log.shader_test
index 84fd8ba7..5718ceca 100644
--- a/tests/shaders/glsl-const-builtin-exp-log.shader_test
+++ b/tests/shaders/glsl-const-builtin-exp-log.shader_test
@@ -9,7 +9,7 @@ glsl-mvp.vert
#version 120
void main()
{
- const float one = log(exp(2)) - 1.0;
+ const float one = log(exp(2.0)) - 1.0;
gl_FragColor = vec4(0.0, one, 0.0, one);
}
diff --git a/tests/shaders/glsl-const-builtin-exp2.shader_test b/tests/shaders/glsl-const-builtin-exp2.shader_test
index 2e901233..68b59cdd 100644
--- a/tests/shaders/glsl-const-builtin-exp2.shader_test
+++ b/tests/shaders/glsl-const-builtin-exp2.shader_test
@@ -9,7 +9,7 @@ glsl-mvp.vert
#version 120
void main()
{
- const float one = exp2(16) - 65535;
+ const float one = exp2(16.0) - 65535;
gl_FragColor = vec4(0.0, one, 0.0, one);
}
diff --git a/tests/shaders/glsl-const-builtin-log2.shader_test b/tests/shaders/glsl-const-builtin-log2.shader_test
index 7e2d802b..c46c3a55 100644
--- a/tests/shaders/glsl-const-builtin-log2.shader_test
+++ b/tests/shaders/glsl-const-builtin-log2.shader_test
@@ -9,7 +9,7 @@ glsl-mvp.vert
#version 120
void main()
{
- const float one = log2(65536) - 15;
+ const float one = log2(65536.0) - 15;
gl_FragColor = vec4(0.0, one, 0.0, one);
}
diff --git a/tests/shaders/glsl-const-builtin-sqrt.shader_test b/tests/shaders/glsl-const-builtin-sqrt.shader_test
index cbcb9214..bd555520 100644
--- a/tests/shaders/glsl-const-builtin-sqrt.shader_test
+++ b/tests/shaders/glsl-const-builtin-sqrt.shader_test
@@ -9,7 +9,7 @@ glsl-mvp.vert
#version 120
void main()
{
- const float one = sqrt(16) - 3;
+ const float one = sqrt(16.0) - 3;
gl_FragColor = vec4(0.0, one, 0.0, one);
}