summaryrefslogtreecommitdiff
path: root/progs
diff options
context:
space:
mode:
authorMichal Krol <mjkrol@gmail.org>2006-08-09 20:05:26 +0000
committerMichal Krol <mjkrol@gmail.org>2006-08-09 20:05:26 +0000
commitedefc658e4374fea96404715ce176b24942322d3 (patch)
treee5bbe94949bbf7c2db2965e9f75c854458811037 /progs
parent9f344b3e7d6e23674dd4747faec253f103563b36 (diff)
More GLSL code - more support for vec4 operations on x86 back-end.
Diffstat (limited to 'progs')
-rw-r--r--progs/slang/cltest.txt21
-rw-r--r--progs/slang/vstest.c2
2 files changed, 22 insertions, 1 deletions
diff --git a/progs/slang/cltest.txt b/progs/slang/cltest.txt
index 07fee4de57..e7d47c2cb6 100644
--- a/progs/slang/cltest.txt
+++ b/progs/slang/cltest.txt
@@ -1463,6 +1463,16 @@ void main () {
printMESA (normalize (_Two4.xyz));
printMESA (normalize (_Three4));
+
+ vec4 tmp = _Two4;
+ printMESA (tmp);
+
+ printMESA (_Two4 == _Three4);
+ printMESA (_Two4 != _Three4);
+ printMESA (_Two4 == _Two4);
+ printMESA (_Three4 != _Three4);
+ printMESA (_Two4 != vec4 (_Two4.xyz, 999.0));
+ printMESA (_Two4 != vec4 (999.0, _Two4.yzw));
}
$output
@@ -1552,3 +1562,14 @@ $output
0.507392
0.522768
+2.1
+2.2
+2.3
+2.4
+
+false
+true
+true
+false
+true
+true
diff --git a/progs/slang/vstest.c b/progs/slang/vstest.c
index e31f3b16df..5108d15742 100644
--- a/progs/slang/vstest.c
+++ b/progs/slang/vstest.c
@@ -320,7 +320,7 @@ void RenderScene (void)
break;
}
if (fabs (value - attribs[i].data[j]) > EPSILON)
- printf ("*** %s\n", "Values are different");
+ printf ("*** %s, is %f, should be %f\n", "Values are different", value, attribs[i].data[j]);
p = strchr (p, '\n');
if (p != NULL)
p++;