Commit 67174fbc authored by Matt Turner's avatar Matt Turner
Browse files

shaders: Remove #version from glsl-const tests.

Also basically a revert of 6533d757

 to make the cosh test match.
Reviewed-by: default avatarIan Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke's avatarKenneth Graunke <kenneth@whitecape.org>
parent c1b0098e
......@@ -5,7 +5,6 @@ GLSL >= 1.20
glsl-mvp.vert
[fragment shader]
#version 120
void main()
{
const float x = abs(-0.5);
......
......@@ -5,7 +5,6 @@ GLSL >= 1.20
glsl-mvp.vert
[fragment shader]
#version 120
void main() {
const float zero = acos(1.0);
const float half_pi = acos(0.0);
......
......@@ -5,7 +5,6 @@ GLSL >= 1.20
glsl-mvp.vert
[fragment shader]
#version 120
void main()
{
const bvec2 v_true = bvec2(true, true);
......
......@@ -5,7 +5,6 @@ GLSL >= 1.20
glsl-mvp.vert
[fragment shader]
#version 120
void main()
{
const bvec2 v_true = bvec2(true, true);
......
......@@ -5,7 +5,6 @@ GLSL >= 1.20
glsl-mvp.vert
[fragment shader]
#version 120
void main() {
const float zero = asin(0.0);
const float pi_over_three = asin(0.866025403784439);
......
......@@ -5,7 +5,6 @@ GLSL >= 1.20
glsl-mvp.vert
[fragment shader]
#version 120
void main() {
const float x = atan(100.0, 100.0);
const float y = atan(1.0);
......
......@@ -5,7 +5,6 @@ GLSL >= 1.20
glsl-mvp.vert
[fragment shader]
#version 120
void main()
{
const float x = ceil(-0.5);
......
......@@ -5,7 +5,6 @@ GLSL >= 1.20
glsl-mvp.vert
[fragment shader]
#version 120
void main()
{
const vec2 v1 = clamp(vec2(-10.0, -15.0), vec2(-5.0, 5.0), vec2(1.0, 10.0));
......
......@@ -5,7 +5,6 @@ GLSL >= 1.20
glsl-mvp.vert
[fragment shader]
#version 120
void main() {
const float sqrt_two_over_two = cos(0.785398163397448);
const float one = cos(0.0);
......
[require]
GLSL >= 1.30
[vertex shader]
#version 130
void main()
{
gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
}
[vertex shader file]
glsl-mvp.vert
[fragment shader]
#version 130
void main() {
const float f_154 = cosh(1.0);
const float f_376 = cosh(2.0);
......
......@@ -5,7 +5,6 @@ GLSL >= 1.20
glsl-mvp.vert
[fragment shader]
#version 120
void main()
{
const vec3 v1 = vec3(3.0, -3.0, 1.0);
......
......@@ -5,7 +5,6 @@ GLSL >= 1.20
glsl-mvp.vert
[fragment shader]
#version 120
void main() {
const int x = int(degrees(3.1415926535));
if (x == 180)
......
......@@ -5,7 +5,6 @@ GLSL >= 1.20
glsl-mvp.vert
[fragment shader]
#version 120
void main() {
const float dx = dFdx(0.0);
const float dy = dFdy(0.0);
......
......@@ -5,7 +5,6 @@ GLSL >= 1.20
glsl-mvp.vert
[fragment shader]
#version 120
void main()
{
const vec2 p0 = vec2(1.2, 3.4);
......
......@@ -5,7 +5,6 @@ GLSL >= 1.20
glsl-mvp.vert
[fragment shader]
#version 120
void main()
{
const vec2 c1 = vec2(2.0, 4.0);
......
......@@ -6,7 +6,6 @@ GLSL >= 1.20
glsl-mvp.vert
[fragment shader]
#version 120
void main()
{
const bvec2 res = equal(vec2(3.0, 3.14),
......
......@@ -6,7 +6,6 @@ GLSL >= 1.20
glsl-mvp.vert
[fragment shader]
#version 120
void main()
{
const bvec3 res = equal(vec3(13.4, -0.9, 12.55),
......
......@@ -6,7 +6,6 @@ GLSL >= 1.20
glsl-mvp.vert
[fragment shader]
#version 120
void main()
{
const bvec4 res = equal(vec4(-2.0, 0.0, 0.123, -1000.5),
......
......@@ -6,7 +6,6 @@ GLSL >= 1.20
glsl-mvp.vert
[fragment shader]
#version 120
void main()
{
const bvec2 res = equal(ivec2(-8, 12),
......
......@@ -6,7 +6,6 @@ GLSL >= 1.20
glsl-mvp.vert
[fragment shader]
#version 120
void main()
{
const bvec3 res = equal(ivec3(0, 8, 89),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment