summaryrefslogtreecommitdiff
path: root/tests/spec/arb_arrays_of_arrays
diff options
context:
space:
mode:
Diffstat (limited to 'tests/spec/arb_arrays_of_arrays')
-rw-r--r--tests/spec/arb_arrays_of_arrays/execution/atomic_counters/fs-indirect-index.shader_test4
-rw-r--r--tests/spec/arb_arrays_of_arrays/execution/atomic_counters/fs-simple-inc-dec-read.shader_test4
-rw-r--r--tests/spec/arb_arrays_of_arrays/execution/atomic_counters/vs-indirect-index.shader_test4
-rw-r--r--tests/spec/arb_arrays_of_arrays/execution/atomic_counters/vs-simple-inc-dec-read.shader_test4
-rw-r--r--tests/spec/arb_arrays_of_arrays/execution/glsl-arrays-copy-size-mismatch.shader_test1
-rw-r--r--tests/spec/arb_arrays_of_arrays/execution/sampler/vs-struct-nonconst-non-opaque-members.shader_test2
-rw-r--r--tests/spec/arb_arrays_of_arrays/linker/vs-to-fs-interface-field-unsized2.shader_test2
-rw-r--r--tests/spec/arb_arrays_of_arrays/max-binding.c6
8 files changed, 14 insertions, 13 deletions
diff --git a/tests/spec/arb_arrays_of_arrays/execution/atomic_counters/fs-indirect-index.shader_test b/tests/spec/arb_arrays_of_arrays/execution/atomic_counters/fs-indirect-index.shader_test
index 39dc268df..27e85fd3b 100644
--- a/tests/spec/arb_arrays_of_arrays/execution/atomic_counters/fs-indirect-index.shader_test
+++ b/tests/spec/arb_arrays_of_arrays/execution/atomic_counters/fs-indirect-index.shader_test
@@ -1,4 +1,4 @@
-# Simple test of accessing an atomic counter with dynamic indicies.
+# Simple test of accessing an atomic counter with dynamic indexes.
#
[require]
@@ -26,7 +26,7 @@ void main()
uint v0[12];
uint v1[12];
- /* Get all initail values of a0 */
+ /* Get all initial values of a0 */
v0[0] = atomicCounter(a0[0][0]);
v0[1] = atomicCounter(a0[0][1]);
v0[2] = atomicCounter(a0[0][2]);
diff --git a/tests/spec/arb_arrays_of_arrays/execution/atomic_counters/fs-simple-inc-dec-read.shader_test b/tests/spec/arb_arrays_of_arrays/execution/atomic_counters/fs-simple-inc-dec-read.shader_test
index 9949df843..dd2c3b734 100644
--- a/tests/spec/arb_arrays_of_arrays/execution/atomic_counters/fs-simple-inc-dec-read.shader_test
+++ b/tests/spec/arb_arrays_of_arrays/execution/atomic_counters/fs-simple-inc-dec-read.shader_test
@@ -25,7 +25,7 @@ void main()
uint v0[12];
uint v1[12];
- /* Get all initail values of a0 */
+ /* Get all initial values of a0 */
v0[0] = atomicCounter(a0[0][0]);
v0[1] = atomicCounter(a0[0][1]);
v0[2] = atomicCounter(a0[0][2]);
@@ -59,7 +59,7 @@ void main()
atomicCounterDecrement(a1[0][1][1]);
atomicCounterDecrement(a1[2][0][1]);
- /* Get all initail values of a1 */
+ /* Get all initial values of a1 */
v0[0] = atomicCounter(a1[0][0][0]);
v0[1] = atomicCounter(a1[0][0][1]);
v0[2] = atomicCounter(a1[0][1][0]);
diff --git a/tests/spec/arb_arrays_of_arrays/execution/atomic_counters/vs-indirect-index.shader_test b/tests/spec/arb_arrays_of_arrays/execution/atomic_counters/vs-indirect-index.shader_test
index d58b07691..f6d72751e 100644
--- a/tests/spec/arb_arrays_of_arrays/execution/atomic_counters/vs-indirect-index.shader_test
+++ b/tests/spec/arb_arrays_of_arrays/execution/atomic_counters/vs-indirect-index.shader_test
@@ -1,4 +1,4 @@
-# Simple test of accessing an atomic counter with dynamic indicies.
+# Simple test of accessing an atomic counter with dynamic indices.
#
[require]
@@ -26,7 +26,7 @@ void main()
uint v0[12];
uint v1[12];
- /* Get all initail values of a0 */
+ /* Get all initial values of a0 */
v0[0] = atomicCounter(a0[0][0]);
v0[1] = atomicCounter(a0[0][1]);
v0[2] = atomicCounter(a0[0][2]);
diff --git a/tests/spec/arb_arrays_of_arrays/execution/atomic_counters/vs-simple-inc-dec-read.shader_test b/tests/spec/arb_arrays_of_arrays/execution/atomic_counters/vs-simple-inc-dec-read.shader_test
index c5c3015dc..fd9344394 100644
--- a/tests/spec/arb_arrays_of_arrays/execution/atomic_counters/vs-simple-inc-dec-read.shader_test
+++ b/tests/spec/arb_arrays_of_arrays/execution/atomic_counters/vs-simple-inc-dec-read.shader_test
@@ -25,7 +25,7 @@ void main()
uint v0[12];
uint v1[12];
- /* Get all initail values of a0 */
+ /* Get all initial values of a0 */
v0[0] = atomicCounter(a0[0][0]);
v0[1] = atomicCounter(a0[0][1]);
v0[2] = atomicCounter(a0[0][2]);
@@ -59,7 +59,7 @@ void main()
atomicCounterDecrement(a1[0][1][1]);
atomicCounterDecrement(a1[2][0][1]);
- /* Get all initail values of a1 */
+ /* Get all initial values of a1 */
v0[0] = atomicCounter(a1[0][0][0]);
v0[1] = atomicCounter(a1[0][0][1]);
v0[2] = atomicCounter(a1[0][1][0]);
diff --git a/tests/spec/arb_arrays_of_arrays/execution/glsl-arrays-copy-size-mismatch.shader_test b/tests/spec/arb_arrays_of_arrays/execution/glsl-arrays-copy-size-mismatch.shader_test
index b7256b39b..04ac3ea38 100644
--- a/tests/spec/arb_arrays_of_arrays/execution/glsl-arrays-copy-size-mismatch.shader_test
+++ b/tests/spec/arb_arrays_of_arrays/execution/glsl-arrays-copy-size-mismatch.shader_test
@@ -1,5 +1,6 @@
[require]
GLSL >= 1.20
+GL_ARB_arrays_of_arrays
[vertex shader]
#version 120
diff --git a/tests/spec/arb_arrays_of_arrays/execution/sampler/vs-struct-nonconst-non-opaque-members.shader_test b/tests/spec/arb_arrays_of_arrays/execution/sampler/vs-struct-nonconst-non-opaque-members.shader_test
index dbc9c40e4..8eae15c5b 100644
--- a/tests/spec/arb_arrays_of_arrays/execution/sampler/vs-struct-nonconst-non-opaque-members.shader_test
+++ b/tests/spec/arb_arrays_of_arrays/execution/sampler/vs-struct-nonconst-non-opaque-members.shader_test
@@ -1,5 +1,5 @@
# This test verifies that dynamically uniform indexing of sampler arrays
-# in the vertex shader behaves correctly, and the offests for the
+# in the vertex shader behaves correctly, and the offsets for the
# non-opaque members are calculated correctly.
[require]
diff --git a/tests/spec/arb_arrays_of_arrays/linker/vs-to-fs-interface-field-unsized2.shader_test b/tests/spec/arb_arrays_of_arrays/linker/vs-to-fs-interface-field-unsized2.shader_test
index 269690462..da8ed8661 100644
--- a/tests/spec/arb_arrays_of_arrays/linker/vs-to-fs-interface-field-unsized2.shader_test
+++ b/tests/spec/arb_arrays_of_arrays/linker/vs-to-fs-interface-field-unsized2.shader_test
@@ -4,7 +4,7 @@
#
# Note: The size of the arrays also means this tests the
# max boundary of GL_MAX_VERTEX_ATTRIBS when it's set
-# to 64 (the mininum allowed for an implementation).
+# to 64 (the minimum allowed for an implementation).
[require]
GLSL >= 1.50
diff --git a/tests/spec/arb_arrays_of_arrays/max-binding.c b/tests/spec/arb_arrays_of_arrays/max-binding.c
index 9d9bd2d47..4622f1d53 100644
--- a/tests/spec/arb_arrays_of_arrays/max-binding.c
+++ b/tests/spec/arb_arrays_of_arrays/max-binding.c
@@ -23,7 +23,7 @@
/** @file max-binding.c
*
- * Test that using more than the maximum number of suported interface block,
+ * Test that using more than the maximum number of supported interface block,
* sampler, or atomic bindings fails with a compile error.
*/
@@ -49,7 +49,7 @@ generate_and_compile_shader(GLuint stage, const char *src_template,
ret = asprintf(&src, src_template, binding);
assert(ret);
- ret = piglit_compile_shader_text_nothrow(stage, src, true);
+ ret = piglit_compile_shader_text_nothrow(stage, src, false);
free(src);
return ret;
@@ -172,7 +172,7 @@ piglit_init(int argc, char **argv)
/* test max boundary */
if(!run_test_sampler_max_bindings(max_samp_binding-array_elements))
subtest_fail(&status, "Test sampler binding on boundary "
- "of maximum number of texure "
+ "of maximum number of texture "
"unit bindings");
if (piglit_is_extension_supported("GL_ARB_shader_atomic_counters")) {