diff options
| author | Dylan Baker <baker.dylan.c@gmail.com> | 2015-03-26 17:44:43 -0700 |
|---|---|---|
| committer | Dylan Baker <baker.dylan.c@gmail.com> | 2015-06-09 15:08:25 -0700 |
| commit | ed872266bf104f91997f2524f9cbb64f4fba064f (patch) | |
| tree | 77afdf0a4f1a34054e098ee64b3b5f22df77fe83 | |
| parent | 8de771e67db8ad97a77a1cc7c7bbd4316167dafb (diff) | |
generators: port variable-index-read.sh to python
This patch replaces a bash based generator with a python generator. This
has the obvious advantage of remove a large swath of generated tests
from the check-in, and prevents modification of a generated file. It
also is much faster than the bash generator, so running at compile time
isn't a problem.
There are no functional differences between the bash generated versions
and the python generated versions, only whitespace/line-wrapping
differences, and small changes to the copyright header.
All tests that passed with the bash versions pass with the python
versions on the i965 driver with multiple hardware revisions.
Tested with python2.7 and python3.3
v2: - rename generated test .list file (Emil)
- Use a shared function to add the license text
(also removes a typo in the text spotted by Emil)
Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Acked-by: Jose Fonseca <jfonseca@vmware.com>
440 files changed, 591 insertions, 34076 deletions
diff --git a/generated_tests/CMakeLists.txt b/generated_tests/CMakeLists.txt index 5036a5db6..665d661ff 100644 --- a/generated_tests/CMakeLists.txt +++ b/generated_tests/CMakeLists.txt @@ -120,6 +120,12 @@ piglit_make_generated_tests( piglit_make_generated_tests( shader_image_load_store_tests.list gen_shader_image_load_store_tests.py) +piglit_make_generated_tests( + variable_index_read_tests.list + gen_variable_index_read_tests.py + templates/gen_variable_index_read_tests/vs.shader_test.mako + templates/gen_variable_index_read_tests/fs.shader_test.mako + templates/gen_variable_index_read_tests/helpers.mako) # OpenCL Test generators piglit_make_generated_tests( @@ -161,11 +167,12 @@ add_custom_target(gen-gl-tests constant_array_size_tests_fp64.list shader_precision_tests.list shader_image_load_store_tests.list + variable_index_read_tests.list ) # Create a custom target for generating OpenCL tests # This is not added to the default target, instead it is added -# as a dependency of gen-etsts if OpenCL tests are enabled +# as a dependency of gen-tests if OpenCL tests are enabled add_custom_target(gen-cl-tests DEPENDS builtin_cl_int_tests.list builtin_cl_math_tests.list diff --git a/generated_tests/gen_variable_index_read_tests.py b/generated_tests/gen_variable_index_read_tests.py new file mode 100644 index 000000000..c92248b46 --- /dev/null +++ b/generated_tests/gen_variable_index_read_tests.py @@ -0,0 +1,261 @@ +# Copyright (c) 2015 Intel Corporation + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +"""Generate tests for glsl 1.10 and 1.20 variable index reads.""" + +from __future__ import print_function, absolute_import, division +import os +import itertools + +from six.moves import range + +from templates import template_dir +from modules.utils import lazy_property, safe_makedirs + +TEMPLATES = template_dir(os.path.basename(os.path.splitext(__file__)[0])) +FS_TEMPLATE = TEMPLATES.get_template('fs.shader_test.mako') +VS_TEMPLATE = TEMPLATES.get_template('vs.shader_test.mako') +DIRNAME = os.path.join('spec', 'glsl-{}', 'execution', 'variable-indexing') + + +class TestParams(object): + """Parameters for a single test. + + This is all of the non-formatting logic of the test. Each property is + wrapped with a lazy_property decorator, which means the data is cached + after it is calculated once. + + """ + def __init__(self, matrix_dim, array_dim, mode, index_value, col, + expect_type, glsl_version): + self.matrix_dim = matrix_dim + self.array_dim = array_dim + self.mode = mode + self.index_value = index_value + self.col = col + self.expect_type = expect_type + + assert glsl_version in [110, 120] + self.glsl_version = glsl_version + + @lazy_property + def idx(self): + if self.array_dim != 0: + return '[{}]'.format(self.index_value) + else: + return '' + + @lazy_property + def cxr_type(self): + return 'mat{0}x{0}'.format(self.matrix_dim) + + @lazy_property + def base_type(self): + if self.glsl_version == 120: + return self.cxr_type + else: + return 'mat{}'.format(self.matrix_dim) + + @lazy_property + def type(self): + if self.array_dim != 0 and self.glsl_version == 120: + return '{}[{}]'.format(self.base_type, self.array_dim) + else: + return self.base_type + + @lazy_property + def dim(self): + if self.array_dim != 0 and self.glsl_version == 110: + return '[{}]'.format(self.array_dim) + else: + # XXX: should this be an error? + return '' + + @lazy_property + def row(self): + if self.expect_type == 'float': + return '[row]' + else: + # XXX: Should this be an error? + return '' + + @lazy_property + def test_sizes(self): + if self.array_dim == 0: + return [1] + elif self.index_value == 'index': + return list(range(1, 1 + self.array_dim)) + else: + return [2] + + @lazy_property + def test_columns(self): + if self.col == 'col': + return list(range(1, 1 + self.matrix_dim)) + else: + return [2] + + @lazy_property + def test_rows(self): + if self.expect_type == 'float': + return list(range(1, 1 + self.matrix_dim)) + else: + return [1] + + @lazy_property + def test_array_dim(self): + if (self.mode == 'uniform' and + self.glsl_version == 110 and + self.array_dim != 0 and + self.index_value != 'index'): + return self.index_value + 1 + else: + return self.array_dim + + @lazy_property + def varying_comps(self): + if self.array_dim != 0: + return 4 + self.matrix_dim**2 * self.array_dim + else: + return 4 + self.matrix_dim**2 + + @lazy_property + def formated_version(self): + return '{:.2f}'.format(float(self.glsl_version) / 100) + + +def make_fs(name, params): + """Generate a fragment shader test.""" + dirname = DIRNAME.format(params.formated_version) + safe_makedirs(dirname) + with open(os.path.join(dirname, name), 'w') as f: + f.write(FS_TEMPLATE.render_unicode(params=params)) + print(name) + + +def make_vs(name, params): + """Generate a vertex shader test.""" + dirname = DIRNAME.format(params.formated_version) + safe_makedirs(dirname) + with open(os.path.join(dirname, name), 'w') as f: + f.write(VS_TEMPLATE.render_unicode(params=params)) + print(name) + + +def main(): + """Generate the tests.""" + modes = ['temp', 'uniform', 'varying'] + array_dims = [0, 3] + matrix_dims = [2, 3, 4] + glsl_versions = [110, 120] + iter_ = itertools.product(modes, array_dims, matrix_dims, glsl_versions) + for mode, array_dim, matrix_dim, glsl_version in iter_: + if array_dim != 0: + arr = 'array-' + idx_text = 'index-' + + # TODO: This can certainly be rolled up into a loop + + make_fs( + 'fs-{mode}-{arr}mat{matrix_dim}-col-row-rd.shader_test'.format(**locals()), + TestParams(matrix_dim, array_dim, mode, 1, 'col', 'float', + glsl_version)) + + make_fs( + 'fs-{mode}-{arr}mat{matrix_dim}-row-rd.shader_test'.format(**locals()), + TestParams(matrix_dim, array_dim, mode, 1, 1, 'float', + glsl_version)) + + make_fs( + 'fs-{mode}-{arr}mat{matrix_dim}-col-rd.shader_test'.format(**locals()), + TestParams(matrix_dim, array_dim, mode, 1, 'col', + 'vec{}'.format(matrix_dim), glsl_version)) + + make_fs( + 'fs-{mode}-{arr}mat{matrix_dim}-rd.shader_test'.format(**locals()), + TestParams(matrix_dim, array_dim, mode, 1, 1, + 'vec{}'.format(matrix_dim), glsl_version)) + + make_vs( + 'vs-{mode}-{arr}mat{matrix_dim}-col-row-rd.shader_test'.format(**locals()), + TestParams(matrix_dim, array_dim, mode, 1, 'col', 'float', + glsl_version)) + + make_vs( + 'vs-{mode}-{arr}mat{matrix_dim}-row-rd.shader_test'.format(**locals()), + TestParams(matrix_dim, array_dim, mode, 1, 1, 'float', + glsl_version)) + + make_vs( + 'vs-{mode}-{arr}mat{matrix_dim}-col-rd.shader_test'.format(**locals()), + TestParams(matrix_dim, array_dim, mode, 1, 'col', + 'vec{}'.format(matrix_dim), glsl_version)) + + make_vs( + 'vs-{mode}-{arr}mat{matrix_dim}-rd.shader_test'.format(**locals()), + TestParams(matrix_dim, array_dim, mode, 1, 1, + 'vec{}'.format(matrix_dim), glsl_version)) + else: + arr = '' + idx_text = '' + + make_fs( + 'fs-{mode}-{arr}mat{matrix_dim}-{idx_text}col-row-rd.shader_test'.format(**locals()), + TestParams(matrix_dim, array_dim, mode, 'index', 'col', 'float', + glsl_version)) + + make_fs( + 'fs-{mode}-{arr}mat{matrix_dim}-{idx_text}row-rd.shader_test'.format(**locals()), + TestParams(matrix_dim, array_dim, mode, 'index', 1, 'float', + glsl_version)) + + make_fs( + 'fs-{mode}-{arr}mat{matrix_dim}-{idx_text}col-rd.shader_test'.format(**locals()), + TestParams(matrix_dim, array_dim, mode, 'index', 'col', + 'vec{}'.format(matrix_dim), glsl_version)) + + make_fs( + 'fs-{mode}-{arr}mat{matrix_dim}-{idx_text}rd.shader_test'.format(**locals()), + TestParams(matrix_dim, array_dim, mode, 'index', 1, + 'vec{}'.format(matrix_dim), glsl_version)) + + make_vs( + 'vs-{mode}-{arr}mat{matrix_dim}-{idx_text}col-row-rd.shader_test'.format(**locals()), + TestParams(matrix_dim, array_dim, mode, 'index', 'col', 'float', + glsl_version)) + + make_vs( + 'vs-{mode}-{arr}mat{matrix_dim}-{idx_text}row-rd.shader_test'.format(**locals()), + TestParams(matrix_dim, array_dim, mode, 'index', 1, 'float', + glsl_version)) + + make_vs( + 'vs-{mode}-{arr}mat{matrix_dim}-{idx_text}col-rd.shader_test'.format(**locals()), + TestParams(matrix_dim, array_dim, mode, 'index', 'col', + 'vec{}'.format(matrix_dim), glsl_version)) + + make_vs( + 'vs-{mode}-{arr}mat{matrix_dim}-{idx_text}rd.shader_test'.format(**locals()), + TestParams(matrix_dim, array_dim, mode, 'index', 1, + 'vec{}'.format(matrix_dim), glsl_version)) + + +if __name__ == '__main__': + main() diff --git a/generated_tests/modules/utils.py b/generated_tests/modules/utils.py index 28893834f..5495ad800 100644 --- a/generated_tests/modules/utils.py +++ b/generated_tests/modules/utils.py @@ -23,6 +23,7 @@ from __future__ import print_function, absolute_import import os import errno +import functools def safe_makedirs(dirs): @@ -43,3 +44,24 @@ def safe_makedirs(dirs): pass else: raise + + +class lazy_property(object): + """Decorator for lazy property loading. + + A property decorated with this class will execute it's code the first time + it's run, but will store the value after that. This is useful for values + that are either 1) expensive to compute, or 2) need to be computed only + once and then read multiple times + + """ + def __init__(self, func): + functools.wraps(func) + self.__func = func + + def __get__(self, obj, cls): + if not obj: + return self + value = self.__func(obj) + setattr(obj, self.__func.__name__, value) + return value diff --git a/generated_tests/templates/gen_variable_index_read_tests/fs.shader_test.mako b/generated_tests/templates/gen_variable_index_read_tests/fs.shader_test.mako new file mode 100644 index 000000000..39b0be5f7 --- /dev/null +++ b/generated_tests/templates/gen_variable_index_read_tests/fs.shader_test.mako @@ -0,0 +1,31 @@ +## Copyright (c) 2015 Intel Corporation +## +## Permission is hereby granted, free of charge, to any person obtaining a copy +## of this software and associated documentation files (the "Software"), to deal +## in the Software without restriction, including without limitation the rights +## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +## copies of the Software, and to permit persons to whom the Software is +## furnished to do so, subject to the following conditions: +## +## The above copyright notice and this permission notice shall be included in +## all copies or substantial portions of the Software. +## +## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +## IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +## AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +## SOFTWARE. + +<%namespace name="helpers" file="helpers.mako"/> + +${helpers.license()} + +${helpers.emit_header(params)} + +${helpers.emit_vs(params, 0)} + +${helpers.emit_fs(params, 1)} + +${helpers.emit_test_vectors(params)} diff --git a/generated_tests/templates/gen_variable_index_read_tests/helpers.mako b/generated_tests/templates/gen_variable_index_read_tests/helpers.mako new file mode 100644 index 000000000..cb0bff41e --- /dev/null +++ b/generated_tests/templates/gen_variable_index_read_tests/helpers.mako @@ -0,0 +1,238 @@ +## Copyright (c) 2015 Intel Corporation +## +## Permission is hereby granted, free of charge, to any person obtaining a copy +## of this software and associated documentation files (the "Software"), to deal +## in the Software without restriction, including without limitation the rights +## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +## copies of the Software, and to permit persons to whom the Software is +## furnished to do so, subject to the following conditions: +## +## The above copyright notice and this permission notice shall be included in +## all copies or substantial portions of the Software. +## +## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +## IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +## AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +## SOFTWARE. +<%! + from six.moves import range + + def dedent(text): + return '\n'.join(l.lstrip() for l in text.splitlines()) + + def newlines(text): + return '\n'.join(l for l in text.splitlines() if l.strip()) +%> + +<%def name="license()"> +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +</%def> + +<%def name="emit_header(params)" filter="dedent,newlines"> + ## Generated test, do not edit + [require] + GLSL >= ${params.formated_version} + % if params.mode == 'varying': + GL_MAX_VARYING_COMPONENTS >= ${params.varying_comps} + % endif +</%def> + +<%def name="matrix_data(first, dim, delim=', ')" filter="trim,dedent,newlines"> + ${delim.join(str(float(x)) for x in range(first, first + dim**2))} +</%def> + +<%def name="emit_matrix_array_initializer(matrix_dim, array_dim, base_type)" filter="trim,newlines"> + % for c in range(array_dim): +${base_type}(${matrix_data(c * matrix_dim**2 + 1, matrix_dim)})\ + % if c < array_dim - 1: +, \ + % endif + % endfor +</%def> + +<%def name="emit_set_matrix(params)" filter="dedent,newlines"> + % if params.array_dim != 0: + % if params.mode == 'temp': + % if params.glsl_version == 120: + ${params.type} m${params.dim} = ${params.type}(${emit_matrix_array_initializer(params.matrix_dim, params.array_dim, params.base_type)}); + % else: + ${params.type} m${params.dim}; + % endif + % endif + % if params.glsl_version == 110 or params.mode == 'varying': + % for i in range(params.array_dim): + m[${i}] = mat${params.matrix_dim}(${matrix_data(1 + i * params.matrix_dim**2, params.matrix_dim)}); + % endfor + % endif + % else: + % if params.mode == 'temp': + ${params.type} m = ${params.type}(${matrix_data(1, params.matrix_dim)}); + % else: + m = ${params.type}(${matrix_data(1, params.matrix_dim)}); + % endif + % endif +</%def> + +<%def name="emit_globals(params)" filter="dedent,newlines"> + % if params.array_dim != 0 and params.index_value == 'index': + uniform int index; + % endif + + % if params.col == 'col': + uniform int col; + % endif + + % if params.expect_type == 'float': + uniform int row; + % endif + + uniform ${params.expect_type} expect; + + % if params.glsl_version == 120 and params.mode == 'uniform': + % if params.array_dim == 0: + ${params.mode} ${params.type} m = ${params.type}(${matrix_data(1, params.matrix_dim)}); + % else: + ${params.mode} ${params.type} m${params.dim} = ${params.type}(${emit_matrix_array_initializer(params.matrix_dim, params.array_dim, params.base_type)}); + % endif + % elif params.mode != 'temp': + ${params.mode} ${params.type} m${params.dim}; + % endif + varying vec4 color; +</%def> + +## TODO: convert do_compare into a bool +<%def name="emit_vs(params, do_compare)" filter="newlines"> +[vertex shader] +${emit_globals(params)} + +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; + + % if params.mode == 'varying' or (params.mode == 'temp' and do_compare != 0): + ${emit_set_matrix(params)} + % endif + + % if do_compare != 0: + % if params.mode == 'varying': + /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: + * + * "A vertex shader may also read varying variables, getting back the + * same values it has written. Reading a varying variable in a vertex + * shader returns undefined values if it is read before being + * written." + */ + % endif + ## TODO: Could probably simplify this with the use of params.row + % if params.expect_type == 'float': + color = (m${params.idx}[${params.col}][row] == expect) \ + % else: + color = (m${params.idx}[${params.col}] == expect) \ + % endif + ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); + % endif +} +</%def> + +## TODO: convert do_compare into a bool +<%def name="emit_fs(params, do_compare)" filter="newlines"> +[fragment shader] +${emit_globals(params)} + +void main() +{ + % if do_compare == 0 and params.mode == 'varying': + /* There is some trickery here. The fragment shader has to actually use + * the varyings generated by the vertex shader, or the compiler (more + * likely the linker) might demote the varying outputs to just be vertex + * shader global variables. Since the point of the test is the vertex + * shader reading from a varying, that would defeat the test. + */ + % endif + % if do_compare != 0 or params.mode == 'varying': + % if params.mode == 'temp': + ${emit_set_matrix(params)} + % endif + gl_FragColor = (m${params.idx}[${params.col}]${params.row} == expect) \ + % if do_compare == 0: + ? color : vec4(1.0, 0.0, 0.0, 1.0); + % else: + ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); + % endif + % else: + gl_FragColor = color; + % endif +} +</%def> + +<%def name="emit_test_vectors(params)" filter="dedent"> + <%block filter="newlines"> + [test] + clear color 0.5 0.5 0.5 0.5 + clear + ortho + % if params.mode == 'uniform' and params.glsl_version == 110 and params.test_array_dim == 0: + uniform ${params.cxr_type} m ${matrix_data(1, params.matrix_dim, delim=' ')} + % endif + + </%block> + % for size in params.test_sizes: + <%block filter="newlines"> + % if params.mode == 'uniform' and params.glsl_version == 110 and params.test_array_dim != 0: + % for c in range(params.test_array_dim): + uniform ${params.cxr_type} m[${c}] ${matrix_data(1 + c * params.matrix_dim**2, params.matrix_dim, delim=' ')} + % endfor + % endif + % if params.test_array_dim != 0 and params.index_value == 'index': + uniform int index ${size - 1} + % endif + </%block> + <% x_base = ((size - 1) * (15 * params.matrix_dim + 10)) %> + % for column in params.test_columns: + <%block filter="newlines"> + % if params.col == 'col': + uniform int col ${column - 1} + % endif + </%block> + + % for row in params.test_rows: + <%block filter="newlines"> + <% expect = (size - 1) * params.matrix_dim**2 + (column - 1) * params.matrix_dim + row %> + % if params.expect_type == 'float': + uniform int row ${row - 1} + uniform float expect ${expect} + % else: + uniform ${params.expect_type} expect ${' '.join(str(i) for i in range(expect, expect + params.matrix_dim))} + % endif + + <% + x = x_base + 15 * column - 10 + y = 15 * row - 10 + %> + draw rect ${x} ${y} 10 10 + probe rgb ${x + 5} ${y + 5} 0.0 1.0 0.0 + </%block> + + % endfor + % endfor + % endfor +</%def> diff --git a/generated_tests/templates/gen_variable_index_read_tests/vs.shader_test.mako b/generated_tests/templates/gen_variable_index_read_tests/vs.shader_test.mako new file mode 100644 index 000000000..b2f8138f0 --- /dev/null +++ b/generated_tests/templates/gen_variable_index_read_tests/vs.shader_test.mako @@ -0,0 +1,31 @@ +## Copyright (c) 2015 Intel Corporation +## +## Permission is hereby granted, free of charge, to any person obtaining a copy +## of this software and associated documentation files (the "Software"), to deal +## in the Software without restriction, including without limitation the rights +## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +## copies of the Software, and to permit persons to whom the Software is +## furnished to do so, subject to the following conditions: +## +## The above copyright notice and this permission notice shall be included in +## all copies or substantial portions of the Software. +## +## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +## IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +## AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +## SOFTWARE. + +<%namespace name="helpers" file="helpers.mako"/> + +${helpers.license()} + +${helpers.emit_header(params)} + +${helpers.emit_vs(params, 1)} + +${helpers.emit_fs(params, 0)} + +${helpers.emit_test_vectors(params)} diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-col-rd.shader_test deleted file mode 100644 index 789fb92a2..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-col-rd.shader_test +++ /dev/null @@ -1,47 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - mat2 m[3]; - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - - gl_FragColor = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec2 expect 5 6 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-col-row-rd.shader_test deleted file mode 100644 index 223f27bc8..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-col-row-rd.shader_test +++ /dev/null @@ -1,61 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat2 m[3]; - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - - gl_FragColor = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 5 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 45 20 10 10 -probe rgb 50 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-col-rd.shader_test deleted file mode 100644 index 62dfd104d..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-col-rd.shader_test +++ /dev/null @@ -1,72 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - mat2 m[3]; - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - - gl_FragColor = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec2 expect 1 2 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec2 expect 5 6 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec2 expect 9 10 -draw rect 85 5 10 10 -probe rgb 90 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 11 12 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-col-row-rd.shader_test deleted file mode 100644 index 53d1502a2..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-col-row-rd.shader_test +++ /dev/null @@ -1,110 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat2 m[3]; - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - - gl_FragColor = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 5 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 45 20 10 10 -probe rgb 50 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 9 -draw rect 85 5 10 10 -probe rgb 90 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 85 20 10 10 -probe rgb 90 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 11 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 12 -draw rect 100 20 10 10 -probe rgb 105 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-rd.shader_test deleted file mode 100644 index 10704c910..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-rd.shader_test +++ /dev/null @@ -1,52 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - mat2 m[3]; - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - - gl_FragColor = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec2 expect 11 12 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-row-rd.shader_test deleted file mode 100644 index 2ea3dbb39..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-index-row-rd.shader_test +++ /dev/null @@ -1,72 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat2 m[3]; - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - - gl_FragColor = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 11 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 12 -draw rect 100 20 10 10 -probe rgb 105 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-rd.shader_test deleted file mode 100644 index 600ec8744..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-rd.shader_test +++ /dev/null @@ -1,39 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform vec2 expect; -varying vec4 color; - -void main() -{ - mat2 m[3]; - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - - gl_FragColor = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-row-rd.shader_test deleted file mode 100644 index 682426e37..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat2-row-rd.shader_test +++ /dev/null @@ -1,47 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat2 m[3]; - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - - gl_FragColor = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-col-rd.shader_test deleted file mode 100644 index 9421fd4db..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-col-rd.shader_test +++ /dev/null @@ -1,52 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - mat3 m[3]; - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - - gl_FragColor = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec3 expect 10 11 12 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 16 17 18 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-col-row-rd.shader_test deleted file mode 100644 index 3bda7cb83..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-col-row-rd.shader_test +++ /dev/null @@ -1,87 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat3 m[3]; - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - - gl_FragColor = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 10 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 11 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 12 -draw rect 60 35 10 10 -probe rgb 65 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 16 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 17 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 18 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-col-rd.shader_test deleted file mode 100644 index cb5b4f7dd..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-col-rd.shader_test +++ /dev/null @@ -1,87 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - mat3 m[3]; - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - - gl_FragColor = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec3 expect 1 2 3 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 7 8 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec3 expect 10 11 12 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 16 17 18 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec3 expect 19 20 21 -draw rect 115 5 10 10 -probe rgb 120 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 22 23 24 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 25 26 27 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-col-row-rd.shader_test deleted file mode 100644 index 33a26f0d8..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-col-row-rd.shader_test +++ /dev/null @@ -1,188 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat3 m[3]; - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - - gl_FragColor = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 7 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 9 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 10 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 11 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 12 -draw rect 60 35 10 10 -probe rgb 65 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 16 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 17 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 18 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 19 -draw rect 115 5 10 10 -probe rgb 120 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 20 -draw rect 115 20 10 10 -probe rgb 120 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 21 -draw rect 115 35 10 10 -probe rgb 120 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 22 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 23 -draw rect 130 20 10 10 -probe rgb 135 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 24 -draw rect 130 35 10 10 -probe rgb 135 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 145 20 10 10 -probe rgb 150 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 145 35 10 10 -probe rgb 150 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-rd.shader_test deleted file mode 100644 index b42f56768..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-rd.shader_test +++ /dev/null @@ -1,52 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - mat3 m[3]; - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - - gl_FragColor = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec3 expect 22 23 24 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-row-rd.shader_test deleted file mode 100644 index 1f0049203..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-index-row-rd.shader_test +++ /dev/null @@ -1,87 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat3 m[3]; - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - - gl_FragColor = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 22 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 23 -draw rect 130 20 10 10 -probe rgb 135 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 24 -draw rect 130 35 10 10 -probe rgb 135 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-rd.shader_test deleted file mode 100644 index 672a49622..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-rd.shader_test +++ /dev/null @@ -1,39 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform vec3 expect; -varying vec4 color; - -void main() -{ - mat3 m[3]; - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - - gl_FragColor = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-row-rd.shader_test deleted file mode 100644 index 710fcdbfe..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat3-row-rd.shader_test +++ /dev/null @@ -1,52 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat3 m[3]; - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - - gl_FragColor = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-col-rd.shader_test deleted file mode 100644 index 4d2b55898..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-col-rd.shader_test +++ /dev/null @@ -1,57 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - mat4 m[3]; - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - - gl_FragColor = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec4 expect 17 18 19 20 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 25 26 27 28 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 29 30 31 32 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-col-row-rd.shader_test deleted file mode 100644 index 52799654d..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-col-row-rd.shader_test +++ /dev/null @@ -1,123 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat4 m[3]; - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - - gl_FragColor = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 17 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 18 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 19 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 20 -draw rect 75 50 10 10 -probe rgb 80 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 105 20 10 10 -probe rgb 110 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 105 35 10 10 -probe rgb 110 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 28 -draw rect 105 50 10 10 -probe rgb 110 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 29 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 30 -draw rect 120 20 10 10 -probe rgb 125 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 31 -draw rect 120 35 10 10 -probe rgb 125 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 32 -draw rect 120 50 10 10 -probe rgb 125 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-col-rd.shader_test deleted file mode 100644 index 411370cee..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-col-rd.shader_test +++ /dev/null @@ -1,102 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - mat4 m[3]; - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - - gl_FragColor = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec4 expect 1 2 3 4 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 9 10 11 12 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 13 14 15 16 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec4 expect 17 18 19 20 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 25 26 27 28 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 29 30 31 32 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec4 expect 33 34 35 36 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 37 38 39 40 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 41 42 43 44 -draw rect 175 5 10 10 -probe rgb 180 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 45 46 47 48 -draw rect 190 5 10 10 -probe rgb 195 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-col-row-rd.shader_test deleted file mode 100644 index 839422f30..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-col-row-rd.shader_test +++ /dev/null @@ -1,296 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat4 m[3]; - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - - gl_FragColor = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 4 -draw rect 5 50 10 10 -probe rgb 10 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 11 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 12 -draw rect 35 50 10 10 -probe rgb 40 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 13 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 50 20 10 10 -probe rgb 55 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 50 35 10 10 -probe rgb 55 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 16 -draw rect 50 50 10 10 -probe rgb 55 55 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 17 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 18 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 19 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 20 -draw rect 75 50 10 10 -probe rgb 80 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 105 20 10 10 -probe rgb 110 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 105 35 10 10 -probe rgb 110 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 28 -draw rect 105 50 10 10 -probe rgb 110 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 29 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 30 -draw rect 120 20 10 10 -probe rgb 125 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 31 -draw rect 120 35 10 10 -probe rgb 125 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 32 -draw rect 120 50 10 10 -probe rgb 125 55 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 33 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 34 -draw rect 145 20 10 10 -probe rgb 150 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 35 -draw rect 145 35 10 10 -probe rgb 150 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 36 -draw rect 145 50 10 10 -probe rgb 150 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 37 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 38 -draw rect 160 20 10 10 -probe rgb 165 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 39 -draw rect 160 35 10 10 -probe rgb 165 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 40 -draw rect 160 50 10 10 -probe rgb 165 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 41 -draw rect 175 5 10 10 -probe rgb 180 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 42 -draw rect 175 20 10 10 -probe rgb 180 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 43 -draw rect 175 35 10 10 -probe rgb 180 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 44 -draw rect 175 50 10 10 -probe rgb 180 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 45 -draw rect 190 5 10 10 -probe rgb 195 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 46 -draw rect 190 20 10 10 -probe rgb 195 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 47 -draw rect 190 35 10 10 -probe rgb 195 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 48 -draw rect 190 50 10 10 -probe rgb 195 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-rd.shader_test deleted file mode 100644 index 52a62a9fb..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-rd.shader_test +++ /dev/null @@ -1,52 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - mat4 m[3]; - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - - gl_FragColor = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec4 expect 37 38 39 40 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-row-rd.shader_test deleted file mode 100644 index 681215df2..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-index-row-rd.shader_test +++ /dev/null @@ -1,102 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat4 m[3]; - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - - gl_FragColor = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 37 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 38 -draw rect 160 20 10 10 -probe rgb 165 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 39 -draw rect 160 35 10 10 -probe rgb 165 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 40 -draw rect 160 50 10 10 -probe rgb 165 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-rd.shader_test deleted file mode 100644 index 2994055dd..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-rd.shader_test +++ /dev/null @@ -1,39 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform vec4 expect; -varying vec4 color; - -void main() -{ - mat4 m[3]; - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - - gl_FragColor = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-row-rd.shader_test deleted file mode 100644 index 85f4a1545..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-array-mat4-row-rd.shader_test +++ /dev/null @@ -1,57 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat4 m[3]; - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - - gl_FragColor = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-col-rd.shader_test deleted file mode 100644 index 2520a0d64..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-col-rd.shader_test +++ /dev/null @@ -1,44 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - mat2 m = mat2(1.0, 2.0, 3.0, 4.0); - - gl_FragColor = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec2 expect 1 2 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-col-row-rd.shader_test deleted file mode 100644 index ff170a6e8..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-col-row-rd.shader_test +++ /dev/null @@ -1,58 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat2 m = mat2(1.0, 2.0, 3.0, 4.0); - - gl_FragColor = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-rd.shader_test deleted file mode 100644 index a74c2bf8b..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-rd.shader_test +++ /dev/null @@ -1,36 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform vec2 expect; -varying vec4 color; - -void main() -{ - mat2 m = mat2(1.0, 2.0, 3.0, 4.0); - - gl_FragColor = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-row-rd.shader_test deleted file mode 100644 index 1ca631437..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat2-row-rd.shader_test +++ /dev/null @@ -1,44 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat2 m = mat2(1.0, 2.0, 3.0, 4.0); - - gl_FragColor = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-col-rd.shader_test deleted file mode 100644 index 58ba94a1f..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-col-rd.shader_test +++ /dev/null @@ -1,49 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - mat3 m = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - - gl_FragColor = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec3 expect 1 2 3 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 7 8 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-col-row-rd.shader_test deleted file mode 100644 index 4815ec89f..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-col-row-rd.shader_test +++ /dev/null @@ -1,84 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat3 m = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - - gl_FragColor = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 7 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 9 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-rd.shader_test deleted file mode 100644 index a7d108bfb..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-rd.shader_test +++ /dev/null @@ -1,36 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform vec3 expect; -varying vec4 color; - -void main() -{ - mat3 m = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - - gl_FragColor = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-row-rd.shader_test deleted file mode 100644 index a6226080c..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat3-row-rd.shader_test +++ /dev/null @@ -1,49 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat3 m = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - - gl_FragColor = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-col-rd.shader_test deleted file mode 100644 index 7db671ebf..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-col-rd.shader_test +++ /dev/null @@ -1,54 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - mat4 m = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - - gl_FragColor = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec4 expect 1 2 3 4 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 9 10 11 12 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 13 14 15 16 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-col-row-rd.shader_test deleted file mode 100644 index 9e838a81d..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-col-row-rd.shader_test +++ /dev/null @@ -1,120 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat4 m = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - - gl_FragColor = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 4 -draw rect 5 50 10 10 -probe rgb 10 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 11 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 12 -draw rect 35 50 10 10 -probe rgb 40 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 13 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 50 20 10 10 -probe rgb 55 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 50 35 10 10 -probe rgb 55 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 16 -draw rect 50 50 10 10 -probe rgb 55 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-rd.shader_test deleted file mode 100644 index b8c807f70..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-rd.shader_test +++ /dev/null @@ -1,36 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform vec4 expect; -varying vec4 color; - -void main() -{ - mat4 m = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - - gl_FragColor = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-row-rd.shader_test deleted file mode 100644 index 3849da4f1..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-temp-mat4-row-rd.shader_test +++ /dev/null @@ -1,54 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat4 m = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - - gl_FragColor = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-col-rd.shader_test deleted file mode 100644 index d640d667d..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-col-rd.shader_test +++ /dev/null @@ -1,46 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform vec2 expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform vec2 expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform int col 0 -uniform vec2 expect 5 6 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-col-row-rd.shader_test deleted file mode 100644 index eff7102c5..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-col-row-rd.shader_test +++ /dev/null @@ -1,60 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform int col 0 -uniform int row 0 -uniform float expect 5 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 45 20 10 10 -probe rgb 50 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-col-rd.shader_test deleted file mode 100644 index e4a33a424..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-col-rd.shader_test +++ /dev/null @@ -1,78 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec2 expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec2 expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform mat2x2 m[2] 9.0 10.0 11.0 12.0 -uniform int index 0 -uniform int col 0 -uniform vec2 expect 1 2 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform mat2x2 m[2] 9.0 10.0 11.0 12.0 -uniform int index 1 -uniform int col 0 -uniform vec2 expect 5 6 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform mat2x2 m[2] 9.0 10.0 11.0 12.0 -uniform int index 2 -uniform int col 0 -uniform vec2 expect 9 10 -draw rect 85 5 10 10 -probe rgb 90 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 11 12 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-col-row-rd.shader_test deleted file mode 100644 index baf1124c5..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-col-row-rd.shader_test +++ /dev/null @@ -1,116 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform mat2x2 m[2] 9.0 10.0 11.0 12.0 -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform mat2x2 m[2] 9.0 10.0 11.0 12.0 -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 5 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 45 20 10 10 -probe rgb 50 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform mat2x2 m[2] 9.0 10.0 11.0 12.0 -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 9 -draw rect 85 5 10 10 -probe rgb 90 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 85 20 10 10 -probe rgb 90 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 11 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 12 -draw rect 100 20 10 10 -probe rgb 105 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-rd.shader_test deleted file mode 100644 index 54993272d..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-rd.shader_test +++ /dev/null @@ -1,58 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform vec2 expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform vec2 expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform mat2x2 m[2] 9.0 10.0 11.0 12.0 -uniform int index 0 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform mat2x2 m[2] 9.0 10.0 11.0 12.0 -uniform int index 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform mat2x2 m[2] 9.0 10.0 11.0 12.0 -uniform int index 2 -uniform vec2 expect 11 12 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-row-rd.shader_test deleted file mode 100644 index 79c6d7469..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-index-row-rd.shader_test +++ /dev/null @@ -1,78 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform mat2x2 m[2] 9.0 10.0 11.0 12.0 -uniform int index 0 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform mat2x2 m[2] 9.0 10.0 11.0 12.0 -uniform int index 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform mat2x2 m[2] 9.0 10.0 11.0 12.0 -uniform int index 2 -uniform int row 0 -uniform float expect 11 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 12 -draw rect 100 20 10 10 -probe rgb 105 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-rd.shader_test deleted file mode 100644 index 900a3f3b6..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-rd.shader_test +++ /dev/null @@ -1,38 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform vec2 expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform vec2 expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-row-rd.shader_test deleted file mode 100644 index eabf87354..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat2-row-rd.shader_test +++ /dev/null @@ -1,46 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int row; -uniform float expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int row; -uniform float expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-col-rd.shader_test deleted file mode 100644 index b1666643a..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-col-rd.shader_test +++ /dev/null @@ -1,51 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform vec3 expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform vec3 expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform int col 0 -uniform vec3 expect 10 11 12 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 16 17 18 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-col-row-rd.shader_test deleted file mode 100644 index 3c8dd0985..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-col-row-rd.shader_test +++ /dev/null @@ -1,86 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform int col 0 -uniform int row 0 -uniform float expect 10 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 11 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 12 -draw rect 60 35 10 10 -probe rgb 65 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 16 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 17 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 18 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-col-rd.shader_test deleted file mode 100644 index 3083001d6..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-col-rd.shader_test +++ /dev/null @@ -1,93 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec3 expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec3 expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 -uniform int index 0 -uniform int col 0 -uniform vec3 expect 1 2 3 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 7 8 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 -uniform int index 1 -uniform int col 0 -uniform vec3 expect 10 11 12 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 16 17 18 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 -uniform int index 2 -uniform int col 0 -uniform vec3 expect 19 20 21 -draw rect 115 5 10 10 -probe rgb 120 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 22 23 24 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 25 26 27 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-col-row-rd.shader_test deleted file mode 100644 index f7783a9eb..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-col-row-rd.shader_test +++ /dev/null @@ -1,194 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 7 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 9 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 10 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 11 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 12 -draw rect 60 35 10 10 -probe rgb 65 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 16 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 17 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 18 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 19 -draw rect 115 5 10 10 -probe rgb 120 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 20 -draw rect 115 20 10 10 -probe rgb 120 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 21 -draw rect 115 35 10 10 -probe rgb 120 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 22 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 23 -draw rect 130 20 10 10 -probe rgb 135 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 24 -draw rect 130 35 10 10 -probe rgb 135 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 145 20 10 10 -probe rgb 150 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 145 35 10 10 -probe rgb 150 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-rd.shader_test deleted file mode 100644 index 227a83eb3..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-rd.shader_test +++ /dev/null @@ -1,58 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform vec3 expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform vec3 expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 -uniform int index 0 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 -uniform int index 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 -uniform int index 2 -uniform vec3 expect 22 23 24 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-row-rd.shader_test deleted file mode 100644 index 1d88b4658..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-index-row-rd.shader_test +++ /dev/null @@ -1,93 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 -uniform int index 0 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 -uniform int index 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 -uniform int index 2 -uniform int row 0 -uniform float expect 22 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 23 -draw rect 130 20 10 10 -probe rgb 135 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 24 -draw rect 130 35 10 10 -probe rgb 135 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-rd.shader_test deleted file mode 100644 index 971aa6e20..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-rd.shader_test +++ /dev/null @@ -1,38 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform vec3 expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform vec3 expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-row-rd.shader_test deleted file mode 100644 index 20669fa01..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat3-row-rd.shader_test +++ /dev/null @@ -1,51 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int row; -uniform float expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int row; -uniform float expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-col-rd.shader_test deleted file mode 100644 index 1d361388a..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-col-rd.shader_test +++ /dev/null @@ -1,56 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform vec4 expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform vec4 expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform int col 0 -uniform vec4 expect 17 18 19 20 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 25 26 27 28 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 29 30 31 32 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-col-row-rd.shader_test deleted file mode 100644 index 1cc158686..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-col-row-rd.shader_test +++ /dev/null @@ -1,122 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform int col 0 -uniform int row 0 -uniform float expect 17 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 18 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 19 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 20 -draw rect 75 50 10 10 -probe rgb 80 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 105 20 10 10 -probe rgb 110 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 105 35 10 10 -probe rgb 110 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 28 -draw rect 105 50 10 10 -probe rgb 110 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 29 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 30 -draw rect 120 20 10 10 -probe rgb 125 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 31 -draw rect 120 35 10 10 -probe rgb 125 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 32 -draw rect 120 50 10 10 -probe rgb 125 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-col-rd.shader_test deleted file mode 100644 index cb7401fcc..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-col-rd.shader_test +++ /dev/null @@ -1,108 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec4 expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec4 expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform mat4x4 m[2] 33.0 34.0 35.0 36.0 37.0 38.0 39.0 40.0 41.0 42.0 43.0 44.0 45.0 46.0 47.0 48.0 -uniform int index 0 -uniform int col 0 -uniform vec4 expect 1 2 3 4 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 9 10 11 12 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 13 14 15 16 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform mat4x4 m[2] 33.0 34.0 35.0 36.0 37.0 38.0 39.0 40.0 41.0 42.0 43.0 44.0 45.0 46.0 47.0 48.0 -uniform int index 1 -uniform int col 0 -uniform vec4 expect 17 18 19 20 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 25 26 27 28 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 29 30 31 32 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform mat4x4 m[2] 33.0 34.0 35.0 36.0 37.0 38.0 39.0 40.0 41.0 42.0 43.0 44.0 45.0 46.0 47.0 48.0 -uniform int index 2 -uniform int col 0 -uniform vec4 expect 33 34 35 36 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 37 38 39 40 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 41 42 43 44 -draw rect 175 5 10 10 -probe rgb 180 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 45 46 47 48 -draw rect 190 5 10 10 -probe rgb 195 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-col-row-rd.shader_test deleted file mode 100644 index f6d5d39f4..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-col-row-rd.shader_test +++ /dev/null @@ -1,302 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform mat4x4 m[2] 33.0 34.0 35.0 36.0 37.0 38.0 39.0 40.0 41.0 42.0 43.0 44.0 45.0 46.0 47.0 48.0 -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 4 -draw rect 5 50 10 10 -probe rgb 10 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 11 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 12 -draw rect 35 50 10 10 -probe rgb 40 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 13 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 50 20 10 10 -probe rgb 55 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 50 35 10 10 -probe rgb 55 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 16 -draw rect 50 50 10 10 -probe rgb 55 55 0.0 1.0 0.0 - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform mat4x4 m[2] 33.0 34.0 35.0 36.0 37.0 38.0 39.0 40.0 41.0 42.0 43.0 44.0 45.0 46.0 47.0 48.0 -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 17 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 18 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 19 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 20 -draw rect 75 50 10 10 -probe rgb 80 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 105 20 10 10 -probe rgb 110 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 105 35 10 10 -probe rgb 110 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 28 -draw rect 105 50 10 10 -probe rgb 110 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 29 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 30 -draw rect 120 20 10 10 -probe rgb 125 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 31 -draw rect 120 35 10 10 -probe rgb 125 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 32 -draw rect 120 50 10 10 -probe rgb 125 55 0.0 1.0 0.0 - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform mat4x4 m[2] 33.0 34.0 35.0 36.0 37.0 38.0 39.0 40.0 41.0 42.0 43.0 44.0 45.0 46.0 47.0 48.0 -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 33 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 34 -draw rect 145 20 10 10 -probe rgb 150 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 35 -draw rect 145 35 10 10 -probe rgb 150 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 36 -draw rect 145 50 10 10 -probe rgb 150 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 37 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 38 -draw rect 160 20 10 10 -probe rgb 165 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 39 -draw rect 160 35 10 10 -probe rgb 165 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 40 -draw rect 160 50 10 10 -probe rgb 165 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 41 -draw rect 175 5 10 10 -probe rgb 180 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 42 -draw rect 175 20 10 10 -probe rgb 180 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 43 -draw rect 175 35 10 10 -probe rgb 180 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 44 -draw rect 175 50 10 10 -probe rgb 180 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 45 -draw rect 190 5 10 10 -probe rgb 195 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 46 -draw rect 190 20 10 10 -probe rgb 195 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 47 -draw rect 190 35 10 10 -probe rgb 195 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 48 -draw rect 190 50 10 10 -probe rgb 195 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-rd.shader_test deleted file mode 100644 index 859952fda..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-rd.shader_test +++ /dev/null @@ -1,58 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform vec4 expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform vec4 expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform mat4x4 m[2] 33.0 34.0 35.0 36.0 37.0 38.0 39.0 40.0 41.0 42.0 43.0 44.0 45.0 46.0 47.0 48.0 -uniform int index 0 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform mat4x4 m[2] 33.0 34.0 35.0 36.0 37.0 38.0 39.0 40.0 41.0 42.0 43.0 44.0 45.0 46.0 47.0 48.0 -uniform int index 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform mat4x4 m[2] 33.0 34.0 35.0 36.0 37.0 38.0 39.0 40.0 41.0 42.0 43.0 44.0 45.0 46.0 47.0 48.0 -uniform int index 2 -uniform vec4 expect 37 38 39 40 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-row-rd.shader_test deleted file mode 100644 index 55c396d92..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-index-row-rd.shader_test +++ /dev/null @@ -1,108 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform mat4x4 m[2] 33.0 34.0 35.0 36.0 37.0 38.0 39.0 40.0 41.0 42.0 43.0 44.0 45.0 46.0 47.0 48.0 -uniform int index 0 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform mat4x4 m[2] 33.0 34.0 35.0 36.0 37.0 38.0 39.0 40.0 41.0 42.0 43.0 44.0 45.0 46.0 47.0 48.0 -uniform int index 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform mat4x4 m[2] 33.0 34.0 35.0 36.0 37.0 38.0 39.0 40.0 41.0 42.0 43.0 44.0 45.0 46.0 47.0 48.0 -uniform int index 2 -uniform int row 0 -uniform float expect 37 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 38 -draw rect 160 20 10 10 -probe rgb 165 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 39 -draw rect 160 35 10 10 -probe rgb 165 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 40 -draw rect 160 50 10 10 -probe rgb 165 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-rd.shader_test deleted file mode 100644 index 715cc2a40..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-rd.shader_test +++ /dev/null @@ -1,38 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform vec4 expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform vec4 expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-row-rd.shader_test deleted file mode 100644 index 72d5efcfc..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-array-mat4-row-rd.shader_test +++ /dev/null @@ -1,56 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int row; -uniform float expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int row; -uniform float expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-col-rd.shader_test deleted file mode 100644 index b804dd82f..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-col-rd.shader_test +++ /dev/null @@ -1,45 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform vec2 expect; -uniform mat2 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform vec2 expect; -uniform mat2 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat2x2 m 1.0 2.0 3.0 4.0 -uniform int col 0 -uniform vec2 expect 1 2 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-col-row-rd.shader_test deleted file mode 100644 index 140b00c89..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-col-row-rd.shader_test +++ /dev/null @@ -1,59 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat2 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat2 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat2x2 m 1.0 2.0 3.0 4.0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-rd.shader_test deleted file mode 100644 index d55ef3ace..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-rd.shader_test +++ /dev/null @@ -1,37 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform vec2 expect; -uniform mat2 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform vec2 expect; -uniform mat2 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat2x2 m 1.0 2.0 3.0 4.0 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-row-rd.shader_test deleted file mode 100644 index eac0f52e0..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat2-row-rd.shader_test +++ /dev/null @@ -1,45 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int row; -uniform float expect; -uniform mat2 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int row; -uniform float expect; -uniform mat2 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat2x2 m 1.0 2.0 3.0 4.0 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-col-rd.shader_test deleted file mode 100644 index 19e36e18c..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-col-rd.shader_test +++ /dev/null @@ -1,50 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform vec3 expect; -uniform mat3 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform vec3 expect; -uniform mat3 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat3x3 m 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform int col 0 -uniform vec3 expect 1 2 3 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 7 8 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-col-row-rd.shader_test deleted file mode 100644 index abe09daeb..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-col-row-rd.shader_test +++ /dev/null @@ -1,85 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat3 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat3 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat3x3 m 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 7 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 9 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-rd.shader_test deleted file mode 100644 index a96acf78a..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-rd.shader_test +++ /dev/null @@ -1,37 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform vec3 expect; -uniform mat3 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform vec3 expect; -uniform mat3 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat3x3 m 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-row-rd.shader_test deleted file mode 100644 index 4e8d3e604..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat3-row-rd.shader_test +++ /dev/null @@ -1,50 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int row; -uniform float expect; -uniform mat3 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int row; -uniform float expect; -uniform mat3 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat3x3 m 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-col-rd.shader_test deleted file mode 100644 index 3986b5575..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-col-rd.shader_test +++ /dev/null @@ -1,55 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform vec4 expect; -uniform mat4 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform vec4 expect; -uniform mat4 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat4x4 m 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform int col 0 -uniform vec4 expect 1 2 3 4 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 9 10 11 12 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 13 14 15 16 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-col-row-rd.shader_test deleted file mode 100644 index 9212cd895..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-col-row-rd.shader_test +++ /dev/null @@ -1,121 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat4 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat4 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat4x4 m 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 4 -draw rect 5 50 10 10 -probe rgb 10 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 11 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 12 -draw rect 35 50 10 10 -probe rgb 40 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 13 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 50 20 10 10 -probe rgb 55 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 50 35 10 10 -probe rgb 55 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 16 -draw rect 50 50 10 10 -probe rgb 55 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-rd.shader_test deleted file mode 100644 index 4b6c013c3..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-rd.shader_test +++ /dev/null @@ -1,37 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform vec4 expect; -uniform mat4 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform vec4 expect; -uniform mat4 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat4x4 m 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-row-rd.shader_test deleted file mode 100644 index d858ca545..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-uniform-mat4-row-rd.shader_test +++ /dev/null @@ -1,55 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int row; -uniform float expect; -uniform mat4 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int row; -uniform float expect; -uniform mat4 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat4x4 m 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-col-rd.shader_test deleted file mode 100644 index ab6873298..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-col-rd.shader_test +++ /dev/null @@ -1,49 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int col; -uniform vec2 expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); -} - -[fragment shader] -uniform int col; -uniform vec2 expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec2 expect 5 6 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-col-row-rd.shader_test deleted file mode 100644 index 5d69521d4..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-col-row-rd.shader_test +++ /dev/null @@ -1,63 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 5 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 45 20 10 10 -probe rgb 50 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-col-rd.shader_test deleted file mode 100644 index f5ce0afd8..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-col-rd.shader_test +++ /dev/null @@ -1,74 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec2 expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec2 expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec2 expect 1 2 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec2 expect 5 6 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec2 expect 9 10 -draw rect 85 5 10 10 -probe rgb 90 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 11 12 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-col-row-rd.shader_test deleted file mode 100644 index 3fee0f2a5..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-col-row-rd.shader_test +++ /dev/null @@ -1,112 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 5 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 45 20 10 10 -probe rgb 50 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 9 -draw rect 85 5 10 10 -probe rgb 90 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 85 20 10 10 -probe rgb 90 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 11 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 12 -draw rect 100 20 10 10 -probe rgb 105 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-rd.shader_test deleted file mode 100644 index 9f1b25cc4..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-rd.shader_test +++ /dev/null @@ -1,54 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int index; -uniform vec2 expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); -} - -[fragment shader] -uniform int index; -uniform vec2 expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec2 expect 11 12 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-row-rd.shader_test deleted file mode 100644 index d4b58c5d1..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-index-row-rd.shader_test +++ /dev/null @@ -1,74 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 11 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 12 -draw rect 100 20 10 10 -probe rgb 105 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-rd.shader_test deleted file mode 100644 index 841e362b6..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-rd.shader_test +++ /dev/null @@ -1,41 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform vec2 expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); -} - -[fragment shader] -uniform vec2 expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-row-rd.shader_test deleted file mode 100644 index c446ca7c8..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat2-row-rd.shader_test +++ /dev/null @@ -1,49 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int row; -uniform float expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-col-rd.shader_test deleted file mode 100644 index 87f276da6..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-col-rd.shader_test +++ /dev/null @@ -1,54 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int col; -uniform vec3 expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); -} - -[fragment shader] -uniform int col; -uniform vec3 expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec3 expect 10 11 12 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 16 17 18 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-col-row-rd.shader_test deleted file mode 100644 index 17a804393..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-col-row-rd.shader_test +++ /dev/null @@ -1,89 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 10 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 11 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 12 -draw rect 60 35 10 10 -probe rgb 65 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 16 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 17 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 18 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-col-rd.shader_test deleted file mode 100644 index ec20f3e5c..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-col-rd.shader_test +++ /dev/null @@ -1,89 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec3 expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec3 expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec3 expect 1 2 3 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 7 8 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec3 expect 10 11 12 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 16 17 18 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec3 expect 19 20 21 -draw rect 115 5 10 10 -probe rgb 120 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 22 23 24 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 25 26 27 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-col-row-rd.shader_test deleted file mode 100644 index 57cc5cfca..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-col-row-rd.shader_test +++ /dev/null @@ -1,190 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 7 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 9 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 10 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 11 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 12 -draw rect 60 35 10 10 -probe rgb 65 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 16 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 17 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 18 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 19 -draw rect 115 5 10 10 -probe rgb 120 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 20 -draw rect 115 20 10 10 -probe rgb 120 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 21 -draw rect 115 35 10 10 -probe rgb 120 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 22 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 23 -draw rect 130 20 10 10 -probe rgb 135 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 24 -draw rect 130 35 10 10 -probe rgb 135 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 145 20 10 10 -probe rgb 150 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 145 35 10 10 -probe rgb 150 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-rd.shader_test deleted file mode 100644 index 74954b44c..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-rd.shader_test +++ /dev/null @@ -1,54 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int index; -uniform vec3 expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); -} - -[fragment shader] -uniform int index; -uniform vec3 expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec3 expect 22 23 24 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-row-rd.shader_test deleted file mode 100644 index 0eeaeb8e3..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-index-row-rd.shader_test +++ /dev/null @@ -1,89 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 22 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 23 -draw rect 130 20 10 10 -probe rgb 135 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 24 -draw rect 130 35 10 10 -probe rgb 135 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-rd.shader_test deleted file mode 100644 index c7b40d720..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-rd.shader_test +++ /dev/null @@ -1,41 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform vec3 expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); -} - -[fragment shader] -uniform vec3 expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-row-rd.shader_test deleted file mode 100644 index d8ccb0641..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat3-row-rd.shader_test +++ /dev/null @@ -1,54 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int row; -uniform float expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-col-rd.shader_test deleted file mode 100644 index 809e95b2c..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-col-rd.shader_test +++ /dev/null @@ -1,59 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int col; -uniform vec4 expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); -} - -[fragment shader] -uniform int col; -uniform vec4 expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec4 expect 17 18 19 20 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 25 26 27 28 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 29 30 31 32 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-col-row-rd.shader_test deleted file mode 100644 index 93f0fe448..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-col-row-rd.shader_test +++ /dev/null @@ -1,125 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 17 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 18 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 19 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 20 -draw rect 75 50 10 10 -probe rgb 80 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 105 20 10 10 -probe rgb 110 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 105 35 10 10 -probe rgb 110 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 28 -draw rect 105 50 10 10 -probe rgb 110 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 29 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 30 -draw rect 120 20 10 10 -probe rgb 125 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 31 -draw rect 120 35 10 10 -probe rgb 125 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 32 -draw rect 120 50 10 10 -probe rgb 125 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-col-rd.shader_test deleted file mode 100644 index 4b181cf4a..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-col-rd.shader_test +++ /dev/null @@ -1,104 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec4 expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec4 expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec4 expect 1 2 3 4 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 9 10 11 12 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 13 14 15 16 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec4 expect 17 18 19 20 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 25 26 27 28 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 29 30 31 32 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec4 expect 33 34 35 36 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 37 38 39 40 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 41 42 43 44 -draw rect 175 5 10 10 -probe rgb 180 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 45 46 47 48 -draw rect 190 5 10 10 -probe rgb 195 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-col-row-rd.shader_test deleted file mode 100644 index d73bc386b..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-col-row-rd.shader_test +++ /dev/null @@ -1,298 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 4 -draw rect 5 50 10 10 -probe rgb 10 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 11 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 12 -draw rect 35 50 10 10 -probe rgb 40 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 13 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 50 20 10 10 -probe rgb 55 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 50 35 10 10 -probe rgb 55 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 16 -draw rect 50 50 10 10 -probe rgb 55 55 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 17 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 18 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 19 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 20 -draw rect 75 50 10 10 -probe rgb 80 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 105 20 10 10 -probe rgb 110 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 105 35 10 10 -probe rgb 110 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 28 -draw rect 105 50 10 10 -probe rgb 110 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 29 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 30 -draw rect 120 20 10 10 -probe rgb 125 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 31 -draw rect 120 35 10 10 -probe rgb 125 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 32 -draw rect 120 50 10 10 -probe rgb 125 55 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 33 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 34 -draw rect 145 20 10 10 -probe rgb 150 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 35 -draw rect 145 35 10 10 -probe rgb 150 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 36 -draw rect 145 50 10 10 -probe rgb 150 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 37 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 38 -draw rect 160 20 10 10 -probe rgb 165 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 39 -draw rect 160 35 10 10 -probe rgb 165 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 40 -draw rect 160 50 10 10 -probe rgb 165 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 41 -draw rect 175 5 10 10 -probe rgb 180 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 42 -draw rect 175 20 10 10 -probe rgb 180 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 43 -draw rect 175 35 10 10 -probe rgb 180 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 44 -draw rect 175 50 10 10 -probe rgb 180 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 45 -draw rect 190 5 10 10 -probe rgb 195 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 46 -draw rect 190 20 10 10 -probe rgb 195 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 47 -draw rect 190 35 10 10 -probe rgb 195 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 48 -draw rect 190 50 10 10 -probe rgb 195 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-rd.shader_test deleted file mode 100644 index 3232fee22..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-rd.shader_test +++ /dev/null @@ -1,54 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int index; -uniform vec4 expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); -} - -[fragment shader] -uniform int index; -uniform vec4 expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec4 expect 37 38 39 40 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-row-rd.shader_test deleted file mode 100644 index 58c204f1a..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-index-row-rd.shader_test +++ /dev/null @@ -1,104 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 37 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 38 -draw rect 160 20 10 10 -probe rgb 165 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 39 -draw rect 160 35 10 10 -probe rgb 165 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 40 -draw rect 160 50 10 10 -probe rgb 165 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-rd.shader_test deleted file mode 100644 index 096d9db84..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-rd.shader_test +++ /dev/null @@ -1,41 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform vec4 expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); -} - -[fragment shader] -uniform vec4 expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-row-rd.shader_test deleted file mode 100644 index 6a938b53e..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-array-mat4-row-rd.shader_test +++ /dev/null @@ -1,59 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int row; -uniform float expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-col-rd.shader_test deleted file mode 100644 index 0852a1c93..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-col-rd.shader_test +++ /dev/null @@ -1,47 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 8 - -[vertex shader] -uniform int col; -uniform vec2 expect; -varying mat2 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat2(1.0, 2.0, 3.0, 4.0); -} - -[fragment shader] -uniform int col; -uniform vec2 expect; -varying mat2 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec2 expect 1 2 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-col-row-rd.shader_test deleted file mode 100644 index 62f5c57cd..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-col-row-rd.shader_test +++ /dev/null @@ -1,61 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 8 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat2 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat2(1.0, 2.0, 3.0, 4.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat2 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-rd.shader_test deleted file mode 100644 index f47061cc0..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-rd.shader_test +++ /dev/null @@ -1,39 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 8 - -[vertex shader] -uniform vec2 expect; -varying mat2 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat2(1.0, 2.0, 3.0, 4.0); -} - -[fragment shader] -uniform vec2 expect; -varying mat2 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-row-rd.shader_test deleted file mode 100644 index be5d7a631..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat2-row-rd.shader_test +++ /dev/null @@ -1,47 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 8 - -[vertex shader] -uniform int row; -uniform float expect; -varying mat2 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat2(1.0, 2.0, 3.0, 4.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying mat2 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-col-rd.shader_test deleted file mode 100644 index 16e3a85c1..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-col-rd.shader_test +++ /dev/null @@ -1,52 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 13 - -[vertex shader] -uniform int col; -uniform vec3 expect; -varying mat3 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); -} - -[fragment shader] -uniform int col; -uniform vec3 expect; -varying mat3 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec3 expect 1 2 3 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 7 8 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-col-row-rd.shader_test deleted file mode 100644 index 2d51503d5..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-col-row-rd.shader_test +++ /dev/null @@ -1,87 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 13 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat3 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat3 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 7 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 9 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-rd.shader_test deleted file mode 100644 index b80233b3a..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-rd.shader_test +++ /dev/null @@ -1,39 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 13 - -[vertex shader] -uniform vec3 expect; -varying mat3 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); -} - -[fragment shader] -uniform vec3 expect; -varying mat3 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-row-rd.shader_test deleted file mode 100644 index eaf240ffc..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat3-row-rd.shader_test +++ /dev/null @@ -1,52 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 13 - -[vertex shader] -uniform int row; -uniform float expect; -varying mat3 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying mat3 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-col-rd.shader_test deleted file mode 100644 index 2b49710ff..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-col-rd.shader_test +++ /dev/null @@ -1,57 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 20 - -[vertex shader] -uniform int col; -uniform vec4 expect; -varying mat4 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); -} - -[fragment shader] -uniform int col; -uniform vec4 expect; -varying mat4 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec4 expect 1 2 3 4 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 9 10 11 12 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 13 14 15 16 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-col-row-rd.shader_test deleted file mode 100644 index 5270d076c..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-col-row-rd.shader_test +++ /dev/null @@ -1,123 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat4 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat4 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 4 -draw rect 5 50 10 10 -probe rgb 10 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 11 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 12 -draw rect 35 50 10 10 -probe rgb 40 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 13 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 50 20 10 10 -probe rgb 55 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 50 35 10 10 -probe rgb 55 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 16 -draw rect 50 50 10 10 -probe rgb 55 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-rd.shader_test deleted file mode 100644 index c23ba8934..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-rd.shader_test +++ /dev/null @@ -1,39 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 20 - -[vertex shader] -uniform vec4 expect; -varying mat4 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); -} - -[fragment shader] -uniform vec4 expect; -varying mat4 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-row-rd.shader_test deleted file mode 100644 index d86c759cb..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/fs-varying-mat4-row-rd.shader_test +++ /dev/null @@ -1,57 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 20 - -[vertex shader] -uniform int row; -uniform float expect; -varying mat4 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying mat4 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-col-rd.shader_test deleted file mode 100644 index f2ef2b972..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-col-rd.shader_test +++ /dev/null @@ -1,48 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat2 m[3]; - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - color = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec2 expect 5 6 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-col-row-rd.shader_test deleted file mode 100644 index 6696fd34e..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-col-row-rd.shader_test +++ /dev/null @@ -1,62 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat2 m[3]; - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - color = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 5 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 45 20 10 10 -probe rgb 50 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-col-rd.shader_test deleted file mode 100644 index aeede5829..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-col-rd.shader_test +++ /dev/null @@ -1,73 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat2 m[3]; - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - color = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec2 expect 1 2 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec2 expect 5 6 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec2 expect 9 10 -draw rect 85 5 10 10 -probe rgb 90 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 11 12 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-col-row-rd.shader_test deleted file mode 100644 index 7f2ce85af..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-col-row-rd.shader_test +++ /dev/null @@ -1,111 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat2 m[3]; - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - color = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 5 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 45 20 10 10 -probe rgb 50 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 9 -draw rect 85 5 10 10 -probe rgb 90 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 85 20 10 10 -probe rgb 90 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 11 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 12 -draw rect 100 20 10 10 -probe rgb 105 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-rd.shader_test deleted file mode 100644 index 7ee9bdaca..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-rd.shader_test +++ /dev/null @@ -1,53 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat2 m[3]; - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - color = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec2 expect 11 12 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-row-rd.shader_test deleted file mode 100644 index dedcbdeaf..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-index-row-rd.shader_test +++ /dev/null @@ -1,73 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat2 m[3]; - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - color = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 11 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 12 -draw rect 100 20 10 10 -probe rgb 105 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-rd.shader_test deleted file mode 100644 index 427693fe2..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-rd.shader_test +++ /dev/null @@ -1,40 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat2 m[3]; - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - color = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-row-rd.shader_test deleted file mode 100644 index 449d32454..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat2-row-rd.shader_test +++ /dev/null @@ -1,48 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat2 m[3]; - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - color = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-col-rd.shader_test deleted file mode 100644 index 36a79a25b..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-col-rd.shader_test +++ /dev/null @@ -1,53 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat3 m[3]; - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - color = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec3 expect 10 11 12 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 16 17 18 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-col-row-rd.shader_test deleted file mode 100644 index 1a6df3d05..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-col-row-rd.shader_test +++ /dev/null @@ -1,88 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat3 m[3]; - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - color = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 10 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 11 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 12 -draw rect 60 35 10 10 -probe rgb 65 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 16 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 17 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 18 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-col-rd.shader_test deleted file mode 100644 index e12ff327e..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-col-rd.shader_test +++ /dev/null @@ -1,88 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat3 m[3]; - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - color = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec3 expect 1 2 3 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 7 8 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec3 expect 10 11 12 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 16 17 18 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec3 expect 19 20 21 -draw rect 115 5 10 10 -probe rgb 120 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 22 23 24 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 25 26 27 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-col-row-rd.shader_test deleted file mode 100644 index 79376ab12..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-col-row-rd.shader_test +++ /dev/null @@ -1,189 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat3 m[3]; - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - color = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 7 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 9 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 10 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 11 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 12 -draw rect 60 35 10 10 -probe rgb 65 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 16 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 17 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 18 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 19 -draw rect 115 5 10 10 -probe rgb 120 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 20 -draw rect 115 20 10 10 -probe rgb 120 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 21 -draw rect 115 35 10 10 -probe rgb 120 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 22 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 23 -draw rect 130 20 10 10 -probe rgb 135 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 24 -draw rect 130 35 10 10 -probe rgb 135 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 145 20 10 10 -probe rgb 150 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 145 35 10 10 -probe rgb 150 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-rd.shader_test deleted file mode 100644 index 6c106dde8..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-rd.shader_test +++ /dev/null @@ -1,53 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat3 m[3]; - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - color = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec3 expect 22 23 24 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-row-rd.shader_test deleted file mode 100644 index 738ee8065..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-index-row-rd.shader_test +++ /dev/null @@ -1,88 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat3 m[3]; - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - color = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 22 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 23 -draw rect 130 20 10 10 -probe rgb 135 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 24 -draw rect 130 35 10 10 -probe rgb 135 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-rd.shader_test deleted file mode 100644 index 2ffe44a0f..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-rd.shader_test +++ /dev/null @@ -1,40 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat3 m[3]; - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - color = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-row-rd.shader_test deleted file mode 100644 index c479f2eb7..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat3-row-rd.shader_test +++ /dev/null @@ -1,53 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat3 m[3]; - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - color = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-col-rd.shader_test deleted file mode 100644 index b99a9f4ae..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-col-rd.shader_test +++ /dev/null @@ -1,58 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat4 m[3]; - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - color = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec4 expect 17 18 19 20 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 25 26 27 28 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 29 30 31 32 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-col-row-rd.shader_test deleted file mode 100644 index d10168b84..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-col-row-rd.shader_test +++ /dev/null @@ -1,124 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat4 m[3]; - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - color = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 17 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 18 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 19 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 20 -draw rect 75 50 10 10 -probe rgb 80 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 105 20 10 10 -probe rgb 110 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 105 35 10 10 -probe rgb 110 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 28 -draw rect 105 50 10 10 -probe rgb 110 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 29 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 30 -draw rect 120 20 10 10 -probe rgb 125 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 31 -draw rect 120 35 10 10 -probe rgb 125 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 32 -draw rect 120 50 10 10 -probe rgb 125 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-col-rd.shader_test deleted file mode 100644 index 986d54c95..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-col-rd.shader_test +++ /dev/null @@ -1,103 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat4 m[3]; - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - color = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec4 expect 1 2 3 4 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 9 10 11 12 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 13 14 15 16 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec4 expect 17 18 19 20 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 25 26 27 28 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 29 30 31 32 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec4 expect 33 34 35 36 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 37 38 39 40 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 41 42 43 44 -draw rect 175 5 10 10 -probe rgb 180 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 45 46 47 48 -draw rect 190 5 10 10 -probe rgb 195 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-col-row-rd.shader_test deleted file mode 100644 index 993f754c4..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-col-row-rd.shader_test +++ /dev/null @@ -1,297 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat4 m[3]; - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - color = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 4 -draw rect 5 50 10 10 -probe rgb 10 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 11 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 12 -draw rect 35 50 10 10 -probe rgb 40 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 13 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 50 20 10 10 -probe rgb 55 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 50 35 10 10 -probe rgb 55 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 16 -draw rect 50 50 10 10 -probe rgb 55 55 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 17 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 18 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 19 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 20 -draw rect 75 50 10 10 -probe rgb 80 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 105 20 10 10 -probe rgb 110 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 105 35 10 10 -probe rgb 110 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 28 -draw rect 105 50 10 10 -probe rgb 110 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 29 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 30 -draw rect 120 20 10 10 -probe rgb 125 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 31 -draw rect 120 35 10 10 -probe rgb 125 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 32 -draw rect 120 50 10 10 -probe rgb 125 55 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 33 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 34 -draw rect 145 20 10 10 -probe rgb 150 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 35 -draw rect 145 35 10 10 -probe rgb 150 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 36 -draw rect 145 50 10 10 -probe rgb 150 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 37 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 38 -draw rect 160 20 10 10 -probe rgb 165 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 39 -draw rect 160 35 10 10 -probe rgb 165 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 40 -draw rect 160 50 10 10 -probe rgb 165 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 41 -draw rect 175 5 10 10 -probe rgb 180 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 42 -draw rect 175 20 10 10 -probe rgb 180 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 43 -draw rect 175 35 10 10 -probe rgb 180 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 44 -draw rect 175 50 10 10 -probe rgb 180 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 45 -draw rect 190 5 10 10 -probe rgb 195 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 46 -draw rect 190 20 10 10 -probe rgb 195 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 47 -draw rect 190 35 10 10 -probe rgb 195 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 48 -draw rect 190 50 10 10 -probe rgb 195 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-rd.shader_test deleted file mode 100644 index ec32a0639..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-rd.shader_test +++ /dev/null @@ -1,53 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat4 m[3]; - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - color = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec4 expect 37 38 39 40 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-row-rd.shader_test deleted file mode 100644 index 71d30b0c2..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-index-row-rd.shader_test +++ /dev/null @@ -1,103 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat4 m[3]; - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - color = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 37 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 38 -draw rect 160 20 10 10 -probe rgb 165 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 39 -draw rect 160 35 10 10 -probe rgb 165 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 40 -draw rect 160 50 10 10 -probe rgb 165 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-rd.shader_test deleted file mode 100644 index 73317b318..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-rd.shader_test +++ /dev/null @@ -1,40 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat4 m[3]; - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - color = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-row-rd.shader_test deleted file mode 100644 index 9a917dad3..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-array-mat4-row-rd.shader_test +++ /dev/null @@ -1,58 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat4 m[3]; - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - color = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-col-rd.shader_test deleted file mode 100644 index f2c91e5e8..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-col-rd.shader_test +++ /dev/null @@ -1,45 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat2 m = mat2(1.0, 2.0, 3.0, 4.0); - color = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec2 expect 1 2 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-col-row-rd.shader_test deleted file mode 100644 index ce7980731..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-col-row-rd.shader_test +++ /dev/null @@ -1,59 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat2 m = mat2(1.0, 2.0, 3.0, 4.0); - color = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-rd.shader_test deleted file mode 100644 index ab121dbe7..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-rd.shader_test +++ /dev/null @@ -1,37 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat2 m = mat2(1.0, 2.0, 3.0, 4.0); - color = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-row-rd.shader_test deleted file mode 100644 index 2e4206c63..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat2-row-rd.shader_test +++ /dev/null @@ -1,45 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat2 m = mat2(1.0, 2.0, 3.0, 4.0); - color = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-col-rd.shader_test deleted file mode 100644 index f5ad796c3..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-col-rd.shader_test +++ /dev/null @@ -1,50 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat3 m = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - color = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec3 expect 1 2 3 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 7 8 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-col-row-rd.shader_test deleted file mode 100644 index 069e68b5e..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-col-row-rd.shader_test +++ /dev/null @@ -1,85 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat3 m = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - color = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 7 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 9 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-rd.shader_test deleted file mode 100644 index 7c3b650fb..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-rd.shader_test +++ /dev/null @@ -1,37 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat3 m = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - color = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-row-rd.shader_test deleted file mode 100644 index 30c7a54dd..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat3-row-rd.shader_test +++ /dev/null @@ -1,50 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat3 m = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - color = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-col-rd.shader_test deleted file mode 100644 index 608edfe9e..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-col-rd.shader_test +++ /dev/null @@ -1,55 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat4 m = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - color = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec4 expect 1 2 3 4 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 9 10 11 12 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 13 14 15 16 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-col-row-rd.shader_test deleted file mode 100644 index 70985b6d8..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-col-row-rd.shader_test +++ /dev/null @@ -1,121 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat4 m = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - color = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 4 -draw rect 5 50 10 10 -probe rgb 10 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 11 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 12 -draw rect 35 50 10 10 -probe rgb 40 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 13 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 50 20 10 10 -probe rgb 55 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 50 35 10 10 -probe rgb 55 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 16 -draw rect 50 50 10 10 -probe rgb 55 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-rd.shader_test deleted file mode 100644 index c8d2908cd..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-rd.shader_test +++ /dev/null @@ -1,37 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat4 m = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - color = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-row-rd.shader_test deleted file mode 100644 index cacfeca5c..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-temp-mat4-row-rd.shader_test +++ /dev/null @@ -1,55 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat4 m = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - color = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-col-rd.shader_test deleted file mode 100644 index 6f4aba50d..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-col-rd.shader_test +++ /dev/null @@ -1,47 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform vec2 expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec2 expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform int col 0 -uniform vec2 expect 5 6 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-col-row-rd.shader_test deleted file mode 100644 index 1ab8c6689..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-col-row-rd.shader_test +++ /dev/null @@ -1,61 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform int col 0 -uniform int row 0 -uniform float expect 5 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 45 20 10 10 -probe rgb 50 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-col-rd.shader_test deleted file mode 100644 index 99f70a1ec..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-col-rd.shader_test +++ /dev/null @@ -1,79 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec2 expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec2 expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform mat2x2 m[2] 9.0 10.0 11.0 12.0 -uniform int index 0 -uniform int col 0 -uniform vec2 expect 1 2 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform mat2x2 m[2] 9.0 10.0 11.0 12.0 -uniform int index 1 -uniform int col 0 -uniform vec2 expect 5 6 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform mat2x2 m[2] 9.0 10.0 11.0 12.0 -uniform int index 2 -uniform int col 0 -uniform vec2 expect 9 10 -draw rect 85 5 10 10 -probe rgb 90 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 11 12 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-col-row-rd.shader_test deleted file mode 100644 index 192b95101..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-col-row-rd.shader_test +++ /dev/null @@ -1,117 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform mat2x2 m[2] 9.0 10.0 11.0 12.0 -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform mat2x2 m[2] 9.0 10.0 11.0 12.0 -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 5 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 45 20 10 10 -probe rgb 50 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform mat2x2 m[2] 9.0 10.0 11.0 12.0 -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 9 -draw rect 85 5 10 10 -probe rgb 90 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 85 20 10 10 -probe rgb 90 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 11 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 12 -draw rect 100 20 10 10 -probe rgb 105 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-rd.shader_test deleted file mode 100644 index b9e2d87cd..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-rd.shader_test +++ /dev/null @@ -1,59 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform vec2 expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform vec2 expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform mat2x2 m[2] 9.0 10.0 11.0 12.0 -uniform int index 0 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform mat2x2 m[2] 9.0 10.0 11.0 12.0 -uniform int index 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform mat2x2 m[2] 9.0 10.0 11.0 12.0 -uniform int index 2 -uniform vec2 expect 11 12 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-row-rd.shader_test deleted file mode 100644 index 0b59f773c..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-index-row-rd.shader_test +++ /dev/null @@ -1,79 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform mat2x2 m[2] 9.0 10.0 11.0 12.0 -uniform int index 0 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform mat2x2 m[2] 9.0 10.0 11.0 12.0 -uniform int index 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform mat2x2 m[2] 9.0 10.0 11.0 12.0 -uniform int index 2 -uniform int row 0 -uniform float expect 11 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 12 -draw rect 100 20 10 10 -probe rgb 105 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-rd.shader_test deleted file mode 100644 index fe0042934..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-rd.shader_test +++ /dev/null @@ -1,39 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform vec2 expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec2 expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-row-rd.shader_test deleted file mode 100644 index 04684daee..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat2-row-rd.shader_test +++ /dev/null @@ -1,47 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int row; -uniform float expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -uniform mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat2x2 m[0] 1.0 2.0 3.0 4.0 -uniform mat2x2 m[1] 5.0 6.0 7.0 8.0 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-col-rd.shader_test deleted file mode 100644 index 8fce20df9..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-col-rd.shader_test +++ /dev/null @@ -1,52 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform vec3 expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec3 expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform int col 0 -uniform vec3 expect 10 11 12 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 16 17 18 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-col-row-rd.shader_test deleted file mode 100644 index 28fe49702..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-col-row-rd.shader_test +++ /dev/null @@ -1,87 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform int col 0 -uniform int row 0 -uniform float expect 10 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 11 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 12 -draw rect 60 35 10 10 -probe rgb 65 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 16 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 17 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 18 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-col-rd.shader_test deleted file mode 100644 index 506b9d40f..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-col-rd.shader_test +++ /dev/null @@ -1,94 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec3 expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec3 expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 -uniform int index 0 -uniform int col 0 -uniform vec3 expect 1 2 3 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 7 8 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 -uniform int index 1 -uniform int col 0 -uniform vec3 expect 10 11 12 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 16 17 18 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 -uniform int index 2 -uniform int col 0 -uniform vec3 expect 19 20 21 -draw rect 115 5 10 10 -probe rgb 120 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 22 23 24 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 25 26 27 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-col-row-rd.shader_test deleted file mode 100644 index 0489e5943..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-col-row-rd.shader_test +++ /dev/null @@ -1,195 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 7 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 9 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 10 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 11 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 12 -draw rect 60 35 10 10 -probe rgb 65 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 16 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 17 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 18 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 19 -draw rect 115 5 10 10 -probe rgb 120 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 20 -draw rect 115 20 10 10 -probe rgb 120 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 21 -draw rect 115 35 10 10 -probe rgb 120 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 22 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 23 -draw rect 130 20 10 10 -probe rgb 135 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 24 -draw rect 130 35 10 10 -probe rgb 135 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 145 20 10 10 -probe rgb 150 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 145 35 10 10 -probe rgb 150 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-rd.shader_test deleted file mode 100644 index 3f6aacca4..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-rd.shader_test +++ /dev/null @@ -1,59 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform vec3 expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform vec3 expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 -uniform int index 0 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 -uniform int index 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 -uniform int index 2 -uniform vec3 expect 22 23 24 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-row-rd.shader_test deleted file mode 100644 index 595f9c996..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-index-row-rd.shader_test +++ /dev/null @@ -1,94 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 -uniform int index 0 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 -uniform int index 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform mat3x3 m[2] 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 -uniform int index 2 -uniform int row 0 -uniform float expect 22 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 23 -draw rect 130 20 10 10 -probe rgb 135 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 24 -draw rect 130 35 10 10 -probe rgb 135 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-rd.shader_test deleted file mode 100644 index 6ec1c9831..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-rd.shader_test +++ /dev/null @@ -1,39 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform vec3 expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec3 expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-row-rd.shader_test deleted file mode 100644 index 4bb8ac40f..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat3-row-rd.shader_test +++ /dev/null @@ -1,52 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int row; -uniform float expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -uniform mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat3x3 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform mat3x3 m[1] 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-col-rd.shader_test deleted file mode 100644 index afdaba1b7..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-col-rd.shader_test +++ /dev/null @@ -1,57 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform vec4 expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec4 expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform int col 0 -uniform vec4 expect 17 18 19 20 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 25 26 27 28 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 29 30 31 32 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-col-row-rd.shader_test deleted file mode 100644 index 7576be197..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-col-row-rd.shader_test +++ /dev/null @@ -1,123 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform int col 0 -uniform int row 0 -uniform float expect 17 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 18 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 19 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 20 -draw rect 75 50 10 10 -probe rgb 80 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 105 20 10 10 -probe rgb 110 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 105 35 10 10 -probe rgb 110 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 28 -draw rect 105 50 10 10 -probe rgb 110 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 29 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 30 -draw rect 120 20 10 10 -probe rgb 125 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 31 -draw rect 120 35 10 10 -probe rgb 125 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 32 -draw rect 120 50 10 10 -probe rgb 125 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-col-rd.shader_test deleted file mode 100644 index f21000133..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-col-rd.shader_test +++ /dev/null @@ -1,109 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec4 expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec4 expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform mat4x4 m[2] 33.0 34.0 35.0 36.0 37.0 38.0 39.0 40.0 41.0 42.0 43.0 44.0 45.0 46.0 47.0 48.0 -uniform int index 0 -uniform int col 0 -uniform vec4 expect 1 2 3 4 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 9 10 11 12 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 13 14 15 16 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform mat4x4 m[2] 33.0 34.0 35.0 36.0 37.0 38.0 39.0 40.0 41.0 42.0 43.0 44.0 45.0 46.0 47.0 48.0 -uniform int index 1 -uniform int col 0 -uniform vec4 expect 17 18 19 20 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 25 26 27 28 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 29 30 31 32 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform mat4x4 m[2] 33.0 34.0 35.0 36.0 37.0 38.0 39.0 40.0 41.0 42.0 43.0 44.0 45.0 46.0 47.0 48.0 -uniform int index 2 -uniform int col 0 -uniform vec4 expect 33 34 35 36 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 37 38 39 40 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 41 42 43 44 -draw rect 175 5 10 10 -probe rgb 180 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 45 46 47 48 -draw rect 190 5 10 10 -probe rgb 195 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-col-row-rd.shader_test deleted file mode 100644 index ab7f16daa..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-col-row-rd.shader_test +++ /dev/null @@ -1,303 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform mat4x4 m[2] 33.0 34.0 35.0 36.0 37.0 38.0 39.0 40.0 41.0 42.0 43.0 44.0 45.0 46.0 47.0 48.0 -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 4 -draw rect 5 50 10 10 -probe rgb 10 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 11 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 12 -draw rect 35 50 10 10 -probe rgb 40 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 13 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 50 20 10 10 -probe rgb 55 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 50 35 10 10 -probe rgb 55 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 16 -draw rect 50 50 10 10 -probe rgb 55 55 0.0 1.0 0.0 - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform mat4x4 m[2] 33.0 34.0 35.0 36.0 37.0 38.0 39.0 40.0 41.0 42.0 43.0 44.0 45.0 46.0 47.0 48.0 -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 17 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 18 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 19 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 20 -draw rect 75 50 10 10 -probe rgb 80 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 105 20 10 10 -probe rgb 110 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 105 35 10 10 -probe rgb 110 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 28 -draw rect 105 50 10 10 -probe rgb 110 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 29 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 30 -draw rect 120 20 10 10 -probe rgb 125 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 31 -draw rect 120 35 10 10 -probe rgb 125 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 32 -draw rect 120 50 10 10 -probe rgb 125 55 0.0 1.0 0.0 - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform mat4x4 m[2] 33.0 34.0 35.0 36.0 37.0 38.0 39.0 40.0 41.0 42.0 43.0 44.0 45.0 46.0 47.0 48.0 -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 33 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 34 -draw rect 145 20 10 10 -probe rgb 150 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 35 -draw rect 145 35 10 10 -probe rgb 150 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 36 -draw rect 145 50 10 10 -probe rgb 150 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 37 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 38 -draw rect 160 20 10 10 -probe rgb 165 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 39 -draw rect 160 35 10 10 -probe rgb 165 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 40 -draw rect 160 50 10 10 -probe rgb 165 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 41 -draw rect 175 5 10 10 -probe rgb 180 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 42 -draw rect 175 20 10 10 -probe rgb 180 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 43 -draw rect 175 35 10 10 -probe rgb 180 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 44 -draw rect 175 50 10 10 -probe rgb 180 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 45 -draw rect 190 5 10 10 -probe rgb 195 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 46 -draw rect 190 20 10 10 -probe rgb 195 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 47 -draw rect 190 35 10 10 -probe rgb 195 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 48 -draw rect 190 50 10 10 -probe rgb 195 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-rd.shader_test deleted file mode 100644 index c78f738fb..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-rd.shader_test +++ /dev/null @@ -1,59 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform vec4 expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform vec4 expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform mat4x4 m[2] 33.0 34.0 35.0 36.0 37.0 38.0 39.0 40.0 41.0 42.0 43.0 44.0 45.0 46.0 47.0 48.0 -uniform int index 0 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform mat4x4 m[2] 33.0 34.0 35.0 36.0 37.0 38.0 39.0 40.0 41.0 42.0 43.0 44.0 45.0 46.0 47.0 48.0 -uniform int index 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform mat4x4 m[2] 33.0 34.0 35.0 36.0 37.0 38.0 39.0 40.0 41.0 42.0 43.0 44.0 45.0 46.0 47.0 48.0 -uniform int index 2 -uniform vec4 expect 37 38 39 40 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-row-rd.shader_test deleted file mode 100644 index 2341e881e..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-index-row-rd.shader_test +++ /dev/null @@ -1,109 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform mat4x4 m[2] 33.0 34.0 35.0 36.0 37.0 38.0 39.0 40.0 41.0 42.0 43.0 44.0 45.0 46.0 47.0 48.0 -uniform int index 0 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform mat4x4 m[2] 33.0 34.0 35.0 36.0 37.0 38.0 39.0 40.0 41.0 42.0 43.0 44.0 45.0 46.0 47.0 48.0 -uniform int index 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform mat4x4 m[2] 33.0 34.0 35.0 36.0 37.0 38.0 39.0 40.0 41.0 42.0 43.0 44.0 45.0 46.0 47.0 48.0 -uniform int index 2 -uniform int row 0 -uniform float expect 37 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 38 -draw rect 160 20 10 10 -probe rgb 165 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 39 -draw rect 160 35 10 10 -probe rgb 165 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 40 -draw rect 160 50 10 10 -probe rgb 165 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-rd.shader_test deleted file mode 100644 index 9989782e3..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-rd.shader_test +++ /dev/null @@ -1,39 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform vec4 expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec4 expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-row-rd.shader_test deleted file mode 100644 index 4bf92f363..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-array-mat4-row-rd.shader_test +++ /dev/null @@ -1,57 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int row; -uniform float expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -uniform mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat4x4 m[0] 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform mat4x4 m[1] 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0 30.0 31.0 32.0 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-col-rd.shader_test deleted file mode 100644 index a9dd5c182..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-col-rd.shader_test +++ /dev/null @@ -1,46 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform vec2 expect; -uniform mat2 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec2 expect; -uniform mat2 m; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat2x2 m 1.0 2.0 3.0 4.0 -uniform int col 0 -uniform vec2 expect 1 2 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-col-row-rd.shader_test deleted file mode 100644 index 5b24098fc..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-col-row-rd.shader_test +++ /dev/null @@ -1,60 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat2 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat2 m; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat2x2 m 1.0 2.0 3.0 4.0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-rd.shader_test deleted file mode 100644 index 3fd7a80f0..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-rd.shader_test +++ /dev/null @@ -1,38 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform vec2 expect; -uniform mat2 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec2 expect; -uniform mat2 m; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat2x2 m 1.0 2.0 3.0 4.0 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-row-rd.shader_test deleted file mode 100644 index 8c1ad98ff..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat2-row-rd.shader_test +++ /dev/null @@ -1,46 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int row; -uniform float expect; -uniform mat2 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -uniform mat2 m; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat2x2 m 1.0 2.0 3.0 4.0 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-col-rd.shader_test deleted file mode 100644 index 8954fd20b..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-col-rd.shader_test +++ /dev/null @@ -1,51 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform vec3 expect; -uniform mat3 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec3 expect; -uniform mat3 m; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat3x3 m 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform int col 0 -uniform vec3 expect 1 2 3 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 7 8 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-col-row-rd.shader_test deleted file mode 100644 index ab3e35736..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-col-row-rd.shader_test +++ /dev/null @@ -1,86 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat3 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat3 m; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat3x3 m 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 7 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 9 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-rd.shader_test deleted file mode 100644 index ffb908409..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-rd.shader_test +++ /dev/null @@ -1,38 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform vec3 expect; -uniform mat3 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec3 expect; -uniform mat3 m; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat3x3 m 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-row-rd.shader_test deleted file mode 100644 index de843da96..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat3-row-rd.shader_test +++ /dev/null @@ -1,51 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int row; -uniform float expect; -uniform mat3 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -uniform mat3 m; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat3x3 m 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-col-rd.shader_test deleted file mode 100644 index cc9a6a7c6..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-col-rd.shader_test +++ /dev/null @@ -1,56 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform vec4 expect; -uniform mat4 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec4 expect; -uniform mat4 m; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat4x4 m 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform int col 0 -uniform vec4 expect 1 2 3 4 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 9 10 11 12 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 13 14 15 16 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-col-row-rd.shader_test deleted file mode 100644 index 8581ec35e..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-col-row-rd.shader_test +++ /dev/null @@ -1,122 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat4 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat4 m; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat4x4 m 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 4 -draw rect 5 50 10 10 -probe rgb 10 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 11 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 12 -draw rect 35 50 10 10 -probe rgb 40 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 13 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 50 20 10 10 -probe rgb 55 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 50 35 10 10 -probe rgb 55 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 16 -draw rect 50 50 10 10 -probe rgb 55 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-rd.shader_test deleted file mode 100644 index 33cad921a..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-rd.shader_test +++ /dev/null @@ -1,38 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform vec4 expect; -uniform mat4 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec4 expect; -uniform mat4 m; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat4x4 m 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-row-rd.shader_test deleted file mode 100644 index a5f350820..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-uniform-mat4-row-rd.shader_test +++ /dev/null @@ -1,56 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 - -[vertex shader] -uniform int row; -uniform float expect; -uniform mat4 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -uniform mat4 m; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform mat4x4 m 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-col-rd.shader_test deleted file mode 100644 index 396810b11..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-col-rd.shader_test +++ /dev/null @@ -1,65 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int col; -uniform vec2 expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec2 expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][col] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec2 expect 5 6 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-col-row-rd.shader_test deleted file mode 100644 index 1319d999f..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-col-row-rd.shader_test +++ /dev/null @@ -1,79 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][col][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 5 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 45 20 10 10 -probe rgb 50 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-col-rd.shader_test deleted file mode 100644 index 435f91122..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-col-rd.shader_test +++ /dev/null @@ -1,90 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec2 expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec2 expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[index][col] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec2 expect 1 2 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec2 expect 5 6 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec2 expect 9 10 -draw rect 85 5 10 10 -probe rgb 90 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 11 12 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-col-row-rd.shader_test deleted file mode 100644 index 86a6d4d7a..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-col-row-rd.shader_test +++ /dev/null @@ -1,128 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[index][col][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 5 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 45 20 10 10 -probe rgb 50 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 9 -draw rect 85 5 10 10 -probe rgb 90 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 85 20 10 10 -probe rgb 90 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 11 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 12 -draw rect 100 20 10 10 -probe rgb 105 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-rd.shader_test deleted file mode 100644 index 7acf786f3..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-rd.shader_test +++ /dev/null @@ -1,70 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int index; -uniform vec2 expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform vec2 expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[index][1] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec2 expect 11 12 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-row-rd.shader_test deleted file mode 100644 index b3a3fbbd9..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-index-row-rd.shader_test +++ /dev/null @@ -1,90 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[index][1][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 11 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 12 -draw rect 100 20 10 10 -probe rgb 105 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-rd.shader_test deleted file mode 100644 index 3fd5281ed..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-rd.shader_test +++ /dev/null @@ -1,57 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform vec2 expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec2 expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][1] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-row-rd.shader_test deleted file mode 100644 index 17243b065..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat2-row-rd.shader_test +++ /dev/null @@ -1,65 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int row; -uniform float expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying mat2 m[3]; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][1][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-col-rd.shader_test deleted file mode 100644 index 4abf62664..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-col-rd.shader_test +++ /dev/null @@ -1,70 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int col; -uniform vec3 expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec3 expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][col] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec3 expect 10 11 12 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 16 17 18 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-col-row-rd.shader_test deleted file mode 100644 index a6852c3db..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-col-row-rd.shader_test +++ /dev/null @@ -1,105 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][col][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 10 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 11 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 12 -draw rect 60 35 10 10 -probe rgb 65 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 16 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 17 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 18 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-col-rd.shader_test deleted file mode 100644 index 8899facc5..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-col-rd.shader_test +++ /dev/null @@ -1,105 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec3 expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec3 expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[index][col] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec3 expect 1 2 3 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 7 8 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec3 expect 10 11 12 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 16 17 18 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec3 expect 19 20 21 -draw rect 115 5 10 10 -probe rgb 120 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 22 23 24 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 25 26 27 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-col-row-rd.shader_test deleted file mode 100644 index 5b8b5f89e..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-col-row-rd.shader_test +++ /dev/null @@ -1,206 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[index][col][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 7 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 9 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 10 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 11 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 12 -draw rect 60 35 10 10 -probe rgb 65 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 16 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 17 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 18 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 19 -draw rect 115 5 10 10 -probe rgb 120 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 20 -draw rect 115 20 10 10 -probe rgb 120 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 21 -draw rect 115 35 10 10 -probe rgb 120 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 22 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 23 -draw rect 130 20 10 10 -probe rgb 135 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 24 -draw rect 130 35 10 10 -probe rgb 135 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 145 20 10 10 -probe rgb 150 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 145 35 10 10 -probe rgb 150 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-rd.shader_test deleted file mode 100644 index 6e4c85ad5..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-rd.shader_test +++ /dev/null @@ -1,70 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int index; -uniform vec3 expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform vec3 expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[index][1] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec3 expect 22 23 24 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-row-rd.shader_test deleted file mode 100644 index 418c2fa9c..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-index-row-rd.shader_test +++ /dev/null @@ -1,105 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[index][1][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 22 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 23 -draw rect 130 20 10 10 -probe rgb 135 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 24 -draw rect 130 35 10 10 -probe rgb 135 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-rd.shader_test deleted file mode 100644 index b32136d87..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-rd.shader_test +++ /dev/null @@ -1,57 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform vec3 expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec3 expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][1] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-row-rd.shader_test deleted file mode 100644 index 3d8620d65..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat3-row-rd.shader_test +++ /dev/null @@ -1,70 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int row; -uniform float expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying mat3 m[3]; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][1][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-col-rd.shader_test deleted file mode 100644 index 73484210c..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-col-rd.shader_test +++ /dev/null @@ -1,75 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int col; -uniform vec4 expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec4 expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][col] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec4 expect 17 18 19 20 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 25 26 27 28 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 29 30 31 32 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-col-row-rd.shader_test deleted file mode 100644 index a60546daa..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-col-row-rd.shader_test +++ /dev/null @@ -1,141 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][col][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 17 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 18 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 19 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 20 -draw rect 75 50 10 10 -probe rgb 80 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 105 20 10 10 -probe rgb 110 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 105 35 10 10 -probe rgb 110 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 28 -draw rect 105 50 10 10 -probe rgb 110 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 29 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 30 -draw rect 120 20 10 10 -probe rgb 125 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 31 -draw rect 120 35 10 10 -probe rgb 125 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 32 -draw rect 120 50 10 10 -probe rgb 125 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-col-rd.shader_test deleted file mode 100644 index a4af1acf7..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-col-rd.shader_test +++ /dev/null @@ -1,120 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec4 expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec4 expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[index][col] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec4 expect 1 2 3 4 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 9 10 11 12 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 13 14 15 16 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec4 expect 17 18 19 20 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 25 26 27 28 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 29 30 31 32 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec4 expect 33 34 35 36 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 37 38 39 40 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 41 42 43 44 -draw rect 175 5 10 10 -probe rgb 180 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 45 46 47 48 -draw rect 190 5 10 10 -probe rgb 195 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-col-row-rd.shader_test deleted file mode 100644 index 327e885c5..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-col-row-rd.shader_test +++ /dev/null @@ -1,314 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[index][col][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 4 -draw rect 5 50 10 10 -probe rgb 10 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 11 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 12 -draw rect 35 50 10 10 -probe rgb 40 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 13 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 50 20 10 10 -probe rgb 55 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 50 35 10 10 -probe rgb 55 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 16 -draw rect 50 50 10 10 -probe rgb 55 55 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 17 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 18 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 19 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 20 -draw rect 75 50 10 10 -probe rgb 80 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 105 20 10 10 -probe rgb 110 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 105 35 10 10 -probe rgb 110 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 28 -draw rect 105 50 10 10 -probe rgb 110 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 29 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 30 -draw rect 120 20 10 10 -probe rgb 125 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 31 -draw rect 120 35 10 10 -probe rgb 125 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 32 -draw rect 120 50 10 10 -probe rgb 125 55 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 33 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 34 -draw rect 145 20 10 10 -probe rgb 150 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 35 -draw rect 145 35 10 10 -probe rgb 150 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 36 -draw rect 145 50 10 10 -probe rgb 150 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 37 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 38 -draw rect 160 20 10 10 -probe rgb 165 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 39 -draw rect 160 35 10 10 -probe rgb 165 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 40 -draw rect 160 50 10 10 -probe rgb 165 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 41 -draw rect 175 5 10 10 -probe rgb 180 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 42 -draw rect 175 20 10 10 -probe rgb 180 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 43 -draw rect 175 35 10 10 -probe rgb 180 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 44 -draw rect 175 50 10 10 -probe rgb 180 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 45 -draw rect 190 5 10 10 -probe rgb 195 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 46 -draw rect 190 20 10 10 -probe rgb 195 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 47 -draw rect 190 35 10 10 -probe rgb 195 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 48 -draw rect 190 50 10 10 -probe rgb 195 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-rd.shader_test deleted file mode 100644 index 3cd0305ee..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-rd.shader_test +++ /dev/null @@ -1,70 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int index; -uniform vec4 expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform vec4 expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[index][1] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec4 expect 37 38 39 40 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-row-rd.shader_test deleted file mode 100644 index 2dbc379ae..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-index-row-rd.shader_test +++ /dev/null @@ -1,120 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[index][1][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 37 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 38 -draw rect 160 20 10 10 -probe rgb 165 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 39 -draw rect 160 35 10 10 -probe rgb 165 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 40 -draw rect 160 50 10 10 -probe rgb 165 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-rd.shader_test deleted file mode 100644 index a77b48de2..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-rd.shader_test +++ /dev/null @@ -1,57 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform vec4 expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec4 expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][1] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-row-rd.shader_test deleted file mode 100644 index d1221d7a0..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-array-mat4-row-rd.shader_test +++ /dev/null @@ -1,75 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int row; -uniform float expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying mat4 m[3]; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][1][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-col-rd.shader_test deleted file mode 100644 index fa016d951..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-col-rd.shader_test +++ /dev/null @@ -1,63 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 8 - -[vertex shader] -uniform int col; -uniform vec2 expect; -varying mat2 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat2(1.0, 2.0, 3.0, 4.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec2 expect; -varying mat2 m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[col] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec2 expect 1 2 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-col-row-rd.shader_test deleted file mode 100644 index 12ad2ee38..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-col-row-rd.shader_test +++ /dev/null @@ -1,77 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 8 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat2 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat2(1.0, 2.0, 3.0, 4.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat2 m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[col][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-rd.shader_test deleted file mode 100644 index c23f9fed1..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-rd.shader_test +++ /dev/null @@ -1,55 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 8 - -[vertex shader] -uniform vec2 expect; -varying mat2 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat2(1.0, 2.0, 3.0, 4.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec2 expect; -varying mat2 m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-row-rd.shader_test deleted file mode 100644 index 3020be60f..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat2-row-rd.shader_test +++ /dev/null @@ -1,63 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 8 - -[vertex shader] -uniform int row; -uniform float expect; -varying mat2 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat2(1.0, 2.0, 3.0, 4.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying mat2 m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-col-rd.shader_test deleted file mode 100644 index e3732e363..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-col-rd.shader_test +++ /dev/null @@ -1,68 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 13 - -[vertex shader] -uniform int col; -uniform vec3 expect; -varying mat3 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec3 expect; -varying mat3 m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[col] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec3 expect 1 2 3 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 7 8 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-col-row-rd.shader_test deleted file mode 100644 index 50e2355fe..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-col-row-rd.shader_test +++ /dev/null @@ -1,103 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 13 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat3 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat3 m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[col][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 7 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 9 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-rd.shader_test deleted file mode 100644 index 1ae53ecb8..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-rd.shader_test +++ /dev/null @@ -1,55 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 13 - -[vertex shader] -uniform vec3 expect; -varying mat3 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec3 expect; -varying mat3 m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-row-rd.shader_test deleted file mode 100644 index eea7be373..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat3-row-rd.shader_test +++ /dev/null @@ -1,68 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 13 - -[vertex shader] -uniform int row; -uniform float expect; -varying mat3 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying mat3 m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-col-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-col-rd.shader_test deleted file mode 100644 index d57c9bfeb..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-col-rd.shader_test +++ /dev/null @@ -1,73 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 20 - -[vertex shader] -uniform int col; -uniform vec4 expect; -varying mat4 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec4 expect; -varying mat4 m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[col] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec4 expect 1 2 3 4 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 9 10 11 12 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 13 14 15 16 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-col-row-rd.shader_test deleted file mode 100644 index 232c1e2b2..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-col-row-rd.shader_test +++ /dev/null @@ -1,139 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat4 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat4 m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[col][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 4 -draw rect 5 50 10 10 -probe rgb 10 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 11 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 12 -draw rect 35 50 10 10 -probe rgb 40 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 13 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 50 20 10 10 -probe rgb 55 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 50 35 10 10 -probe rgb 55 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 16 -draw rect 50 50 10 10 -probe rgb 55 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-rd.shader_test deleted file mode 100644 index b3093c323..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-rd.shader_test +++ /dev/null @@ -1,55 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 20 - -[vertex shader] -uniform vec4 expect; -varying mat4 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec4 expect; -varying mat4 m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-row-rd.shader_test b/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-row-rd.shader_test deleted file mode 100644 index 71b94fdf7..000000000 --- a/tests/spec/glsl-1.10/execution/variable-indexing/vs-varying-mat4-row-rd.shader_test +++ /dev/null @@ -1,73 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.10 - -[require] -GLSL >= 1.10 -GL_MAX_VARYING_COMPONENTS >= 20 - -[vertex shader] -uniform int row; -uniform float expect; -varying mat4 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying mat4 m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.10/variable-index-read.sh b/tests/spec/glsl-1.10/variable-index-read.sh deleted file mode 100755 index 2fdf9805b..000000000 --- a/tests/spec/glsl-1.10/variable-index-read.sh +++ /dev/null @@ -1,521 +0,0 @@ -#!/bin/bash - -# Generate a set of data for a sized matrix. Elements start with a specified -# value and increment by 1.0 for each element. -function matrix_data -{ - first=$1 - dim=$2 - - last=$(($first + $dim * $dim - 1)) - seq $first $last | tr '\n' ' ' | sed 's/ /.0, /g;s/, $//;s/ *$//g' -} - - -function emit_matrix_array_initializer -{ - matrix_dim=$1 - array_dim=$2 - base_type=$3 - indent=$4 - - for c in $(seq $array_dim); do - if [ $c -ne 1 ]; then - echo "," - fi - - first=$(((c - 1) * matrix_dim * matrix_dim + 1)) - echo -n "${indent} ${base_type}(" - matrix_data $first $matrix_dim - echo -n ")" - done - -} - - -# Emit global variable declarations for either the vertex shader or the -# fragment shader. -function emit_globals -{ - matrix_dim=$1 - array_dim=$2 - mode=$3 - index_value=$4 - col=$5 - expect_type=$6 - - v=${version/./} - if [ $v -ge 120 ]; then - base_type="mat${matrix_dim}x${matrix_dim}" - else - base_type="mat${matrix_dim}" - fi - - type=$base_type - dim="" - if [ $array_dim -ne 0 ]; then - if [ $v -ge 120 ]; then - type="${type}[$array_dim]" - else - dim="[${array_dim}]" - fi - fi - - if [ $array_dim -ne 0 -a "x$index_value" = "xindex" ]; then - echo "uniform int index;" - fi - - if [ "x$col" = "xcol" ]; then - echo "uniform int col;" - fi - - if [ "x$expect_type" == "xfloat" ]; then - echo "uniform int row;" - fi - - echo "uniform ${expect_type} expect;" - - if [ $v -ge 120 -a "x$mode" = "xuniform" ]; then - if [ $array_dim -eq 0 ]; then - echo -n "${mode} ${type} m = ${type}(" - matrix_data 1 $matrix_dim - echo ");" - else - echo "${mode} ${type} m${dim} = ${type}(" - emit_matrix_array_initializer $matrix_dim $array_dim $base_type "" - echo ");" - fi - elif [ "x$mode" != "xtemp" ]; then - echo "${mode} ${type} m${dim};" - fi - echo "varying vec4 color;" - echo -} - - -function emit_set_matrix -{ - matrix_dim=$1 - array_dim=$2 - mode=$3 - - v=${version/./} - if [ $v -ge 120 ]; then - base_type="mat${matrix_dim}x${matrix_dim}" - else - base_type="mat${matrix_dim}" - fi - - type=$base_type - dim="" - if [ $array_dim -ne 0 ]; then - if [ $v -ge 120 ]; then - type="${type}[$array_dim]" - else - dim="[${array_dim}]" - fi - fi - - if [ $array_dim -ne 0 ]; then - if [ "x$mode" = "xtemp" ]; then - if [ $v -ge 120 ]; then - echo " ${type} m${dim} = ${type}(" - emit_matrix_array_initializer $matrix_dim $array_dim $base_type " " - echo ");" - else - echo " ${type} m${dim};" - fi - fi - - if [ $v -lt 120 -o "x$mode" = "xvarying" ]; then - for i in $(seq 0 $(($array_dim - 1))); do - first=$((1 + $i * $matrix_dim * $matrix_dim)) - echo -n " m[$i] = mat${matrix_dim}(" - matrix_data $first $matrix_dim - echo ");" - done - fi - else - matrix_values=$(matrix_data 1 $matrix_dim) - - if [ "x$mode" = "xtemp" ] ; then - echo " ${type} m = ${type}(${matrix_values});" - else - echo " m = ${type}(${matrix_values});" - fi - fi -} - - -function emit_vs -{ - matrix_dim=$1 - array_dim=$2 - mode=$3 - index_value=$4 - col=$5 - expect_type=$6 - do_compare=$7 - - if [ $array_dim -ne 0 ]; then - idx="[${index_value}]" - else - idx="" - fi - - echo "[vertex shader]" - emit_globals $* - - echo "void main()" - echo "{" - echo " gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;" - - # Only emit the code to set the matrix if the vertex shader is generating - # varyings for a fragment shader or the matrix is in local storage and the - # vertex shader is doing the comparison. - if [ "x$mode" = "xvarying" -o \( "x$mode" = "xtemp" -a $do_compare -ne 0 \) ]; then - echo - emit_set_matrix $matrix_dim $array_dim $mode - fi - - if [ $do_compare -ne 0 ]; then - # Many people thing that a vertex shader cannot read a varying. Quote - # some bits from the GLSL spec so that people won't get the wrong idea - # when reading the test. - if [ "x$mode" = "xvarying" ]; then - cat <<EOF - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ -EOF - fi - - if [ "x$expect_type" = "xfloat" ]; then - echo " color = (m${idx}[$col][row] == expect)" - else - echo " color = (m${idx}[$col] == expect)" - fi - echo " ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);" - fi - echo -e "}\n" -} - - -emit_fs() -{ - matrix_dim=$1 - array_dim=$2 - mode=$3 - index_value=$4 - col=$5 - expect_type=$6 - do_compare=$7 - - echo "[fragment shader]" - emit_globals $* - - echo "void main()" - echo "{" - - if [ $do_compare -eq 0 -a "x$mode" = "xvarying" ]; then - cat <<EOF - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ -EOF - fi - - if [ $do_compare -ne 0 -o "x$mode" = "xvarying" ]; then - if [ "x$mode" = "xtemp" ]; then - emit_set_matrix $matrix_dim $array_dim $mode - echo - fi - - if [ $array_dim -ne 0 ]; then - idx="[$index_value]" - else - idx="" - fi - - if [ "x$expect_type" = "xfloat" ]; then - row="[row]" - else - row="" - fi - - echo " gl_FragColor = (m${idx}[${col}]${row} == expect)" - - if [ $do_compare -eq 0 ]; then - echo " ? color : vec4(1.0, 0.0, 0.0, 1.0);" - else - echo " ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);" - fi - else - echo " gl_FragColor = color;" - fi - - echo "}" - echo -} - - -function emit_test_vectors -{ - matrix_dim=$1 - local array_dim=$2 - mode=$3 - index_value=$4 - col=$5 - expect_type=$6 - - # Optimizing GLSL linkers may reduce the size of the uniform array if tail - # elements are not accessed. Shader runner will fail the test if one of - # the set uniforms doesn't have a location. - if [ "x$mode" = "xuniform" -a $v -le 110 -a $array_dim -ne 0 -a "x$index_value" != "xindex" ]; then - array_dim=$((index_value+1)) - fi - - cat <<EOF -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -EOF - - # NOTE: shader_runner uses the matCxR names even for GLSL 1.10 - v=${version/./} - type="mat${matrix_dim}x${matrix_dim}" - if [ "x$mode" = "xuniform" -a $v -le 110 ]; then - if [ $array_dim -eq 0 ]; then - echo -n "uniform ${type} m " - matrix_data 1 $matrix_dim | sed 's/,//g' - echo - fi - fi - - if [ $array_dim -eq 0 ]; then - sizes="1" - elif [ "x$index_value" = "xindex" ]; then - sizes=$(seq $array_dim) - else - sizes="2" - fi - - if [ "x$col" = "xcol" ]; then - columns=$(seq $matrix_dim) - else - columns=2 - fi - - if [ "x$expect_type" = "xfloat" ]; then - rows=$(seq $matrix_dim) - else - rows=1 - fi - - for i in $sizes; do - if [ "x$mode" = "xuniform" -a $v -le 110 ]; then - if [ $array_dim -ne 0 ]; then - for c in $(seq 0 $(($array_dim - 1))); do - first=$((1 + c * matrix_dim * matrix_dim)) - echo -n "uniform ${type} m[$c] " - matrix_data $first $matrix_dim | sed 's/,//g' - echo - done - fi - fi - - if [ $array_dim -ne 0 -a "x$index_value" = "xindex" ]; then - echo "uniform int index $((i - 1))" - fi - - x_base=$(((i - 1) * (15 * matrix_dim + 10))) - for c in $columns; do - if [ "x$col" = "xcol" ]; then - echo "uniform int col $((c - 1))" - fi - - for r in $rows; do - expect=$(((i - 1) * (matrix_dim * matrix_dim) + (c - 1) * matrix_dim + r)) - if [ "x$expect_type" = "xfloat" ]; then - echo "uniform int row $((r - 1))" - echo "uniform float expect $expect" - else - e=$(seq $expect $((expect + matrix_dim - 1)) | tr '\n' ' ' | sed 's/[[:space:]]*$//g') - echo "uniform ${expect_type} expect $e" - fi - - x=$((x_base + 15 * c - 10)) - y=$((15 * r - 10)) - echo "draw rect $x $y 10 10" - - x=$((x + 5)) - y=$((y + 5)) - echo "probe rgb $x $y 0.0 1.0 0.0" - echo - done - done - done -} - -# Generate a test that read from an (array of) matrix using a non-constant -# index in the fragment shader. -function emit_fs_rd_test -{ - echo "# Test generated by:" - echo "# ${cmd}" - echo - echo "[require]" - echo "GLSL >= $version" - if [ "x$mode" = "xvarying" ]; then - echo "GL_MAX_VARYING_COMPONENTS >= $varying_comps" - fi - echo - - emit_vs $* 0 - emit_fs $* 1 - - emit_test_vectors $* -} - - -# Generate a test that read from an (array of) matrix using a non-constant -# index in the fragment shader. -function emit_vs_rd_test -{ - echo "# Test generated by:" - echo "# ${cmd}" - echo - echo "[require]" - echo "GLSL >= $version" - if [ "x$mode" = "xvarying" ]; then - echo "GL_MAX_VARYING_COMPONENTS >= $varying_comps" - fi - echo - - emit_vs $* 1 - emit_fs $* 0 - - emit_test_vectors $* -} - -cmd="$0 $*" - -if [ "x$1" = "x" ]; then - version="1.10" -else - case "$1" in - 1.[12]0) version="$1";; - *) - echo "Bogus GLSL version \"$1\" specified." - exit 1 - ;; - esac -fi - -for mode in temp uniform varying; do - # More than 3 is unlikely to work for the varying tests due to using too - # many varying vectors. mat4[3] uses 12 varying vectors by itself. - for array_dim in 0 3; do - for matrix_dim in 2 3 4; do - if [ $array_dim -ne 0 ]; then - varying_comps=$((4 + matrix_dim * matrix_dim * array_dim)) - arr="array-" - idx_txt="index-" - - name="fs-${mode}-${arr}mat${matrix_dim}-col-row-rd.shader_test" - emit_fs_rd_test $matrix_dim $array_dim $mode 1 col float \ - > $name - echo $name - - name="fs-${mode}-${arr}mat${matrix_dim}-row-rd.shader_test" - emit_fs_rd_test $matrix_dim $array_dim $mode 1 1 float \ - > $name - echo $name - - name="fs-${mode}-${arr}mat${matrix_dim}-col-rd.shader_test" - emit_fs_rd_test $matrix_dim $array_dim $mode 1 col vec${matrix_dim} \ - > $name - echo $name - - name="fs-${mode}-${arr}mat${matrix_dim}-rd.shader_test" - emit_fs_rd_test $matrix_dim $array_dim $mode 1 1 vec${matrix_dim} \ - > $name - echo $name - - name="vs-${mode}-${arr}mat${matrix_dim}-col-row-rd.shader_test" - emit_vs_rd_test $matrix_dim $array_dim $mode 1 col float \ - > $name - echo $name - - name="vs-${mode}-${arr}mat${matrix_dim}-row-rd.shader_test" - emit_vs_rd_test $matrix_dim $array_dim $mode 1 1 float \ - > $name - echo $name - - name="vs-${mode}-${arr}mat${matrix_dim}-col-rd.shader_test" - emit_vs_rd_test $matrix_dim $array_dim $mode 1 col vec${matrix_dim} \ - > $name - echo $name - - name="vs-${mode}-${arr}mat${matrix_dim}-rd.shader_test" - emit_vs_rd_test $matrix_dim $array_dim $mode 1 1 vec${matrix_dim} \ - > $name - echo $name - else - varying_comps=$((4 + matrix_dim * matrix_dim)) - arr="" - idx_txt="" - fi - - name="fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-row-rd.shader_test" - emit_fs_rd_test $matrix_dim $array_dim $mode index col float \ - > $name - echo $name - - name="fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}row-rd.shader_test" - emit_fs_rd_test $matrix_dim $array_dim $mode index 1 float \ - > $name - echo $name - - name="fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-rd.shader_test" - emit_fs_rd_test $matrix_dim $array_dim $mode index col vec${matrix_dim} \ - > $name - echo $name - - name="fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}rd.shader_test" - emit_fs_rd_test $matrix_dim $array_dim $mode index 1 vec${matrix_dim} \ - > $name - echo $name - - name="vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-row-rd.shader_test" - emit_vs_rd_test $matrix_dim $array_dim $mode index col float \ - > $name - echo $name - - name="vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}row-rd.shader_test" - emit_vs_rd_test $matrix_dim $array_dim $mode index 1 float \ - > $name - echo $name - - name="vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-rd.shader_test" - emit_vs_rd_test $matrix_dim $array_dim $mode index col vec${matrix_dim} \ - > $name - echo $name - - name="vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}rd.shader_test" - emit_vs_rd_test $matrix_dim $array_dim $mode index 1 vec${matrix_dim} \ - > $name - echo $name - done - done -done diff --git a/tests/spec/glsl-1.10/variable-index-regen.sh b/tests/spec/glsl-1.10/variable-index-regen.sh index 3df808241..f1fcfc25d 100755 --- a/tests/spec/glsl-1.10/variable-index-regen.sh +++ b/tests/spec/glsl-1.10/variable-index-regen.sh @@ -4,9 +4,7 @@ # variable-indexing scripts. (cd execution/variable-indexing && - ../../../glsl-1.10/variable-index-read.sh 1.10 && ../../../glsl-1.10/variable-index-write.sh 1.10) (cd ../glsl-1.20/execution/variable-indexing && - ../../../glsl-1.10/variable-index-read.sh 1.20 && ../../../glsl-1.10/variable-index-write.sh 1.20) diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-rd.shader_test deleted file mode 100644 index 0f39fad9c..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-rd.shader_test +++ /dev/null @@ -1,47 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); - - gl_FragColor = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec2 expect 5 6 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-row-rd.shader_test deleted file mode 100644 index 279a8fdea..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-col-row-rd.shader_test +++ /dev/null @@ -1,61 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); - - gl_FragColor = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 5 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 45 20 10 10 -probe rgb 50 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-rd.shader_test deleted file mode 100644 index bbe315cd8..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-rd.shader_test +++ /dev/null @@ -1,72 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); - - gl_FragColor = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec2 expect 1 2 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec2 expect 5 6 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec2 expect 9 10 -draw rect 85 5 10 10 -probe rgb 90 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 11 12 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-row-rd.shader_test deleted file mode 100644 index 6195594f9..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-col-row-rd.shader_test +++ /dev/null @@ -1,110 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); - - gl_FragColor = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 5 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 45 20 10 10 -probe rgb 50 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 9 -draw rect 85 5 10 10 -probe rgb 90 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 85 20 10 10 -probe rgb 90 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 11 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 12 -draw rect 100 20 10 10 -probe rgb 105 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-rd.shader_test deleted file mode 100644 index fd9fe9096..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-rd.shader_test +++ /dev/null @@ -1,52 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); - - gl_FragColor = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec2 expect 11 12 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-row-rd.shader_test deleted file mode 100644 index c72fe6615..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-index-row-rd.shader_test +++ /dev/null @@ -1,72 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); - - gl_FragColor = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 11 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 12 -draw rect 100 20 10 10 -probe rgb 105 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-rd.shader_test deleted file mode 100644 index aa1b3d9f8..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-rd.shader_test +++ /dev/null @@ -1,39 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform vec2 expect; -varying vec4 color; - -void main() -{ - mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); - - gl_FragColor = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-row-rd.shader_test deleted file mode 100644 index cd244ebfb..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat2-row-rd.shader_test +++ /dev/null @@ -1,47 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); - - gl_FragColor = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-rd.shader_test deleted file mode 100644 index 382cd6886..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-rd.shader_test +++ /dev/null @@ -1,52 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); - - gl_FragColor = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec3 expect 10 11 12 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 16 17 18 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-row-rd.shader_test deleted file mode 100644 index d33a6f8de..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-col-row-rd.shader_test +++ /dev/null @@ -1,87 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); - - gl_FragColor = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 10 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 11 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 12 -draw rect 60 35 10 10 -probe rgb 65 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 16 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 17 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 18 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-rd.shader_test deleted file mode 100644 index 0fe205cae..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-rd.shader_test +++ /dev/null @@ -1,87 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); - - gl_FragColor = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec3 expect 1 2 3 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 7 8 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec3 expect 10 11 12 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 16 17 18 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec3 expect 19 20 21 -draw rect 115 5 10 10 -probe rgb 120 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 22 23 24 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 25 26 27 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-row-rd.shader_test deleted file mode 100644 index 8829d3f85..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-col-row-rd.shader_test +++ /dev/null @@ -1,188 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); - - gl_FragColor = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 7 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 9 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 10 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 11 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 12 -draw rect 60 35 10 10 -probe rgb 65 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 16 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 17 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 18 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 19 -draw rect 115 5 10 10 -probe rgb 120 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 20 -draw rect 115 20 10 10 -probe rgb 120 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 21 -draw rect 115 35 10 10 -probe rgb 120 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 22 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 23 -draw rect 130 20 10 10 -probe rgb 135 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 24 -draw rect 130 35 10 10 -probe rgb 135 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 145 20 10 10 -probe rgb 150 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 145 35 10 10 -probe rgb 150 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-rd.shader_test deleted file mode 100644 index 41881cd11..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-rd.shader_test +++ /dev/null @@ -1,52 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); - - gl_FragColor = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec3 expect 22 23 24 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-row-rd.shader_test deleted file mode 100644 index f4f1aa31c..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-index-row-rd.shader_test +++ /dev/null @@ -1,87 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); - - gl_FragColor = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 22 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 23 -draw rect 130 20 10 10 -probe rgb 135 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 24 -draw rect 130 35 10 10 -probe rgb 135 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-rd.shader_test deleted file mode 100644 index f5d437998..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-rd.shader_test +++ /dev/null @@ -1,39 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform vec3 expect; -varying vec4 color; - -void main() -{ - mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); - - gl_FragColor = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-row-rd.shader_test deleted file mode 100644 index e7ca492ac..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat3-row-rd.shader_test +++ /dev/null @@ -1,52 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); - - gl_FragColor = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-rd.shader_test deleted file mode 100644 index 950ef1903..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-rd.shader_test +++ /dev/null @@ -1,57 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); - - gl_FragColor = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec4 expect 17 18 19 20 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 25 26 27 28 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 29 30 31 32 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-row-rd.shader_test deleted file mode 100644 index c8cda8b4b..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-col-row-rd.shader_test +++ /dev/null @@ -1,123 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); - - gl_FragColor = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 17 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 18 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 19 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 20 -draw rect 75 50 10 10 -probe rgb 80 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 105 20 10 10 -probe rgb 110 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 105 35 10 10 -probe rgb 110 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 28 -draw rect 105 50 10 10 -probe rgb 110 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 29 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 30 -draw rect 120 20 10 10 -probe rgb 125 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 31 -draw rect 120 35 10 10 -probe rgb 125 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 32 -draw rect 120 50 10 10 -probe rgb 125 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-rd.shader_test deleted file mode 100644 index 3c8126703..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-rd.shader_test +++ /dev/null @@ -1,102 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); - - gl_FragColor = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec4 expect 1 2 3 4 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 9 10 11 12 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 13 14 15 16 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec4 expect 17 18 19 20 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 25 26 27 28 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 29 30 31 32 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec4 expect 33 34 35 36 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 37 38 39 40 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 41 42 43 44 -draw rect 175 5 10 10 -probe rgb 180 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 45 46 47 48 -draw rect 190 5 10 10 -probe rgb 195 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-row-rd.shader_test deleted file mode 100644 index f380dd88d..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-col-row-rd.shader_test +++ /dev/null @@ -1,296 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); - - gl_FragColor = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 4 -draw rect 5 50 10 10 -probe rgb 10 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 11 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 12 -draw rect 35 50 10 10 -probe rgb 40 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 13 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 50 20 10 10 -probe rgb 55 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 50 35 10 10 -probe rgb 55 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 16 -draw rect 50 50 10 10 -probe rgb 55 55 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 17 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 18 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 19 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 20 -draw rect 75 50 10 10 -probe rgb 80 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 105 20 10 10 -probe rgb 110 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 105 35 10 10 -probe rgb 110 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 28 -draw rect 105 50 10 10 -probe rgb 110 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 29 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 30 -draw rect 120 20 10 10 -probe rgb 125 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 31 -draw rect 120 35 10 10 -probe rgb 125 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 32 -draw rect 120 50 10 10 -probe rgb 125 55 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 33 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 34 -draw rect 145 20 10 10 -probe rgb 150 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 35 -draw rect 145 35 10 10 -probe rgb 150 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 36 -draw rect 145 50 10 10 -probe rgb 150 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 37 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 38 -draw rect 160 20 10 10 -probe rgb 165 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 39 -draw rect 160 35 10 10 -probe rgb 165 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 40 -draw rect 160 50 10 10 -probe rgb 165 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 41 -draw rect 175 5 10 10 -probe rgb 180 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 42 -draw rect 175 20 10 10 -probe rgb 180 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 43 -draw rect 175 35 10 10 -probe rgb 180 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 44 -draw rect 175 50 10 10 -probe rgb 180 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 45 -draw rect 190 5 10 10 -probe rgb 195 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 46 -draw rect 190 20 10 10 -probe rgb 195 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 47 -draw rect 190 35 10 10 -probe rgb 195 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 48 -draw rect 190 50 10 10 -probe rgb 195 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-rd.shader_test deleted file mode 100644 index 288204d7e..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-rd.shader_test +++ /dev/null @@ -1,52 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); - - gl_FragColor = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec4 expect 37 38 39 40 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-row-rd.shader_test deleted file mode 100644 index f7af13db8..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-index-row-rd.shader_test +++ /dev/null @@ -1,102 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); - - gl_FragColor = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 37 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 38 -draw rect 160 20 10 10 -probe rgb 165 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 39 -draw rect 160 35 10 10 -probe rgb 165 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 40 -draw rect 160 50 10 10 -probe rgb 165 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-rd.shader_test deleted file mode 100644 index 7ac10449c..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-rd.shader_test +++ /dev/null @@ -1,39 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform vec4 expect; -varying vec4 color; - -void main() -{ - mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); - - gl_FragColor = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-row-rd.shader_test deleted file mode 100644 index c688a8c52..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-array-mat4-row-rd.shader_test +++ /dev/null @@ -1,57 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); - - gl_FragColor = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-rd.shader_test deleted file mode 100644 index 2e135e8db..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-rd.shader_test +++ /dev/null @@ -1,44 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); - - gl_FragColor = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec2 expect 1 2 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-row-rd.shader_test deleted file mode 100644 index e5b350081..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-col-row-rd.shader_test +++ /dev/null @@ -1,58 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); - - gl_FragColor = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-rd.shader_test deleted file mode 100644 index 94d0b55b8..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-rd.shader_test +++ /dev/null @@ -1,36 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform vec2 expect; -varying vec4 color; - -void main() -{ - mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); - - gl_FragColor = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-row-rd.shader_test deleted file mode 100644 index c891d61c4..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat2-row-rd.shader_test +++ /dev/null @@ -1,44 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); - - gl_FragColor = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-rd.shader_test deleted file mode 100644 index 352b98364..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-rd.shader_test +++ /dev/null @@ -1,49 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - - gl_FragColor = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec3 expect 1 2 3 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 7 8 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-row-rd.shader_test deleted file mode 100644 index fb1f02860..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-col-row-rd.shader_test +++ /dev/null @@ -1,84 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - - gl_FragColor = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 7 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 9 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-rd.shader_test deleted file mode 100644 index fb89c7a46..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-rd.shader_test +++ /dev/null @@ -1,36 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform vec3 expect; -varying vec4 color; - -void main() -{ - mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - - gl_FragColor = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-row-rd.shader_test deleted file mode 100644 index d205c331c..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat3-row-rd.shader_test +++ /dev/null @@ -1,49 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - - gl_FragColor = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-rd.shader_test deleted file mode 100644 index ca511812c..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-rd.shader_test +++ /dev/null @@ -1,54 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - - gl_FragColor = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec4 expect 1 2 3 4 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 9 10 11 12 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 13 14 15 16 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-row-rd.shader_test deleted file mode 100644 index 934150a23..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-col-row-rd.shader_test +++ /dev/null @@ -1,120 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - - gl_FragColor = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 4 -draw rect 5 50 10 10 -probe rgb 10 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 11 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 12 -draw rect 35 50 10 10 -probe rgb 40 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 13 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 50 20 10 10 -probe rgb 55 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 50 35 10 10 -probe rgb 55 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 16 -draw rect 50 50 10 10 -probe rgb 55 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-rd.shader_test deleted file mode 100644 index 69a2ea579..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-rd.shader_test +++ /dev/null @@ -1,36 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform vec4 expect; -varying vec4 color; - -void main() -{ - mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - - gl_FragColor = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-row-rd.shader_test deleted file mode 100644 index 782815857..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-temp-mat4-row-rd.shader_test +++ /dev/null @@ -1,54 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - - gl_FragColor = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-col-rd.shader_test deleted file mode 100644 index 943b312c4..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-col-rd.shader_test +++ /dev/null @@ -1,50 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform vec2 expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform vec2 expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec2 expect 5 6 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-col-row-rd.shader_test deleted file mode 100644 index 06468cdde..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-col-row-rd.shader_test +++ /dev/null @@ -1,64 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 5 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 45 20 10 10 -probe rgb 50 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-col-rd.shader_test deleted file mode 100644 index 8f11e54bb..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-col-rd.shader_test +++ /dev/null @@ -1,75 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec2 expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec2 expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec2 expect 1 2 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec2 expect 5 6 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec2 expect 9 10 -draw rect 85 5 10 10 -probe rgb 90 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 11 12 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-col-row-rd.shader_test deleted file mode 100644 index 96d8b46ed..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-col-row-rd.shader_test +++ /dev/null @@ -1,113 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 5 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 45 20 10 10 -probe rgb 50 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 9 -draw rect 85 5 10 10 -probe rgb 90 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 85 20 10 10 -probe rgb 90 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 11 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 12 -draw rect 100 20 10 10 -probe rgb 105 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-rd.shader_test deleted file mode 100644 index d84e4b4a5..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-rd.shader_test +++ /dev/null @@ -1,55 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform vec2 expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform vec2 expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec2 expect 11 12 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-row-rd.shader_test deleted file mode 100644 index c8ea690b3..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-index-row-rd.shader_test +++ /dev/null @@ -1,75 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 11 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 12 -draw rect 100 20 10 10 -probe rgb 105 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-rd.shader_test deleted file mode 100644 index a0e6b3d27..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-rd.shader_test +++ /dev/null @@ -1,42 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform vec2 expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform vec2 expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-row-rd.shader_test deleted file mode 100644 index ea334661e..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat2-row-rd.shader_test +++ /dev/null @@ -1,50 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int row; -uniform float expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int row; -uniform float expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-col-rd.shader_test deleted file mode 100644 index ac46c7264..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-col-rd.shader_test +++ /dev/null @@ -1,55 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform vec3 expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform vec3 expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec3 expect 10 11 12 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 16 17 18 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-col-row-rd.shader_test deleted file mode 100644 index 3b98b00d7..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-col-row-rd.shader_test +++ /dev/null @@ -1,90 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 10 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 11 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 12 -draw rect 60 35 10 10 -probe rgb 65 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 16 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 17 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 18 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-col-rd.shader_test deleted file mode 100644 index abe4252c2..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-col-rd.shader_test +++ /dev/null @@ -1,90 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec3 expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec3 expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec3 expect 1 2 3 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 7 8 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec3 expect 10 11 12 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 16 17 18 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec3 expect 19 20 21 -draw rect 115 5 10 10 -probe rgb 120 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 22 23 24 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 25 26 27 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-col-row-rd.shader_test deleted file mode 100644 index 7b22586f6..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-col-row-rd.shader_test +++ /dev/null @@ -1,191 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 7 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 9 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 10 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 11 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 12 -draw rect 60 35 10 10 -probe rgb 65 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 16 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 17 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 18 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 19 -draw rect 115 5 10 10 -probe rgb 120 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 20 -draw rect 115 20 10 10 -probe rgb 120 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 21 -draw rect 115 35 10 10 -probe rgb 120 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 22 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 23 -draw rect 130 20 10 10 -probe rgb 135 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 24 -draw rect 130 35 10 10 -probe rgb 135 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 145 20 10 10 -probe rgb 150 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 145 35 10 10 -probe rgb 150 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-rd.shader_test deleted file mode 100644 index 4cd2d26d6..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-rd.shader_test +++ /dev/null @@ -1,55 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform vec3 expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform vec3 expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec3 expect 22 23 24 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-row-rd.shader_test deleted file mode 100644 index a7e27657b..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-index-row-rd.shader_test +++ /dev/null @@ -1,90 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 22 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 23 -draw rect 130 20 10 10 -probe rgb 135 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 24 -draw rect 130 35 10 10 -probe rgb 135 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-rd.shader_test deleted file mode 100644 index eff125697..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-rd.shader_test +++ /dev/null @@ -1,42 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform vec3 expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform vec3 expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-row-rd.shader_test deleted file mode 100644 index b231faa2b..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat3-row-rd.shader_test +++ /dev/null @@ -1,55 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int row; -uniform float expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int row; -uniform float expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-col-rd.shader_test deleted file mode 100644 index 2039e2584..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-col-rd.shader_test +++ /dev/null @@ -1,60 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform vec4 expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform vec4 expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec4 expect 17 18 19 20 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 25 26 27 28 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 29 30 31 32 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-col-row-rd.shader_test deleted file mode 100644 index 2aa60f12c..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-col-row-rd.shader_test +++ /dev/null @@ -1,126 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 17 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 18 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 19 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 20 -draw rect 75 50 10 10 -probe rgb 80 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 105 20 10 10 -probe rgb 110 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 105 35 10 10 -probe rgb 110 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 28 -draw rect 105 50 10 10 -probe rgb 110 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 29 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 30 -draw rect 120 20 10 10 -probe rgb 125 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 31 -draw rect 120 35 10 10 -probe rgb 125 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 32 -draw rect 120 50 10 10 -probe rgb 125 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-col-rd.shader_test deleted file mode 100644 index e95785acb..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-col-rd.shader_test +++ /dev/null @@ -1,105 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec4 expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec4 expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec4 expect 1 2 3 4 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 9 10 11 12 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 13 14 15 16 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec4 expect 17 18 19 20 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 25 26 27 28 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 29 30 31 32 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec4 expect 33 34 35 36 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 37 38 39 40 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 41 42 43 44 -draw rect 175 5 10 10 -probe rgb 180 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 45 46 47 48 -draw rect 190 5 10 10 -probe rgb 195 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-col-row-rd.shader_test deleted file mode 100644 index 09eba56c4..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-col-row-rd.shader_test +++ /dev/null @@ -1,299 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 4 -draw rect 5 50 10 10 -probe rgb 10 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 11 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 12 -draw rect 35 50 10 10 -probe rgb 40 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 13 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 50 20 10 10 -probe rgb 55 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 50 35 10 10 -probe rgb 55 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 16 -draw rect 50 50 10 10 -probe rgb 55 55 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 17 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 18 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 19 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 20 -draw rect 75 50 10 10 -probe rgb 80 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 105 20 10 10 -probe rgb 110 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 105 35 10 10 -probe rgb 110 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 28 -draw rect 105 50 10 10 -probe rgb 110 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 29 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 30 -draw rect 120 20 10 10 -probe rgb 125 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 31 -draw rect 120 35 10 10 -probe rgb 125 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 32 -draw rect 120 50 10 10 -probe rgb 125 55 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 33 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 34 -draw rect 145 20 10 10 -probe rgb 150 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 35 -draw rect 145 35 10 10 -probe rgb 150 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 36 -draw rect 145 50 10 10 -probe rgb 150 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 37 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 38 -draw rect 160 20 10 10 -probe rgb 165 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 39 -draw rect 160 35 10 10 -probe rgb 165 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 40 -draw rect 160 50 10 10 -probe rgb 165 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 41 -draw rect 175 5 10 10 -probe rgb 180 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 42 -draw rect 175 20 10 10 -probe rgb 180 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 43 -draw rect 175 35 10 10 -probe rgb 180 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 44 -draw rect 175 50 10 10 -probe rgb 180 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 45 -draw rect 190 5 10 10 -probe rgb 195 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 46 -draw rect 190 20 10 10 -probe rgb 195 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 47 -draw rect 190 35 10 10 -probe rgb 195 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 48 -draw rect 190 50 10 10 -probe rgb 195 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-rd.shader_test deleted file mode 100644 index 6716a5fda..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-rd.shader_test +++ /dev/null @@ -1,55 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform vec4 expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform vec4 expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec4 expect 37 38 39 40 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-row-rd.shader_test deleted file mode 100644 index a83df7c17..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-index-row-rd.shader_test +++ /dev/null @@ -1,105 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 37 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 38 -draw rect 160 20 10 10 -probe rgb 165 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 39 -draw rect 160 35 10 10 -probe rgb 165 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 40 -draw rect 160 50 10 10 -probe rgb 165 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-rd.shader_test deleted file mode 100644 index c3eb37357..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-rd.shader_test +++ /dev/null @@ -1,42 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform vec4 expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform vec4 expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-row-rd.shader_test deleted file mode 100644 index c41545bf0..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-array-mat4-row-rd.shader_test +++ /dev/null @@ -1,60 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int row; -uniform float expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int row; -uniform float expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-col-rd.shader_test deleted file mode 100644 index f02f3ec3c..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-col-rd.shader_test +++ /dev/null @@ -1,44 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform vec2 expect; -uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform vec2 expect; -uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec2 expect 1 2 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-col-row-rd.shader_test deleted file mode 100644 index 79051eedc..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-col-row-rd.shader_test +++ /dev/null @@ -1,58 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-rd.shader_test deleted file mode 100644 index 2924935f3..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-rd.shader_test +++ /dev/null @@ -1,36 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform vec2 expect; -uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform vec2 expect; -uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-row-rd.shader_test deleted file mode 100644 index 8912c48f2..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat2-row-rd.shader_test +++ /dev/null @@ -1,44 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int row; -uniform float expect; -uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int row; -uniform float expect; -uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-col-rd.shader_test deleted file mode 100644 index f8141b823..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-col-rd.shader_test +++ /dev/null @@ -1,49 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform vec3 expect; -uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform vec3 expect; -uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec3 expect 1 2 3 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 7 8 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-col-row-rd.shader_test deleted file mode 100644 index cc1418e52..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-col-row-rd.shader_test +++ /dev/null @@ -1,84 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 7 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 9 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-rd.shader_test deleted file mode 100644 index 93cc20ac2..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-rd.shader_test +++ /dev/null @@ -1,36 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform vec3 expect; -uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform vec3 expect; -uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-row-rd.shader_test deleted file mode 100644 index 8eecf9886..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat3-row-rd.shader_test +++ /dev/null @@ -1,49 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int row; -uniform float expect; -uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int row; -uniform float expect; -uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-col-rd.shader_test deleted file mode 100644 index b3b98f95a..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-col-rd.shader_test +++ /dev/null @@ -1,54 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform vec4 expect; -uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform vec4 expect; -uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec4 expect 1 2 3 4 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 9 10 11 12 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 13 14 15 16 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-col-row-rd.shader_test deleted file mode 100644 index 7434c0a37..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-col-row-rd.shader_test +++ /dev/null @@ -1,120 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 4 -draw rect 5 50 10 10 -probe rgb 10 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 11 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 12 -draw rect 35 50 10 10 -probe rgb 40 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 13 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 50 20 10 10 -probe rgb 55 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 50 35 10 10 -probe rgb 55 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 16 -draw rect 50 50 10 10 -probe rgb 55 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-rd.shader_test deleted file mode 100644 index e8fcbd163..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-rd.shader_test +++ /dev/null @@ -1,36 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform vec4 expect; -uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform vec4 expect; -uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-row-rd.shader_test deleted file mode 100644 index 2d63b8f38..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-uniform-mat4-row-rd.shader_test +++ /dev/null @@ -1,54 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int row; -uniform float expect; -uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -} - -[fragment shader] -uniform int row; -uniform float expect; -uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-col-rd.shader_test deleted file mode 100644 index 79a31cbc8..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-col-rd.shader_test +++ /dev/null @@ -1,49 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int col; -uniform vec2 expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); -} - -[fragment shader] -uniform int col; -uniform vec2 expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec2 expect 5 6 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-col-row-rd.shader_test deleted file mode 100644 index 393667f42..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-col-row-rd.shader_test +++ /dev/null @@ -1,63 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 5 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 45 20 10 10 -probe rgb 50 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-col-rd.shader_test deleted file mode 100644 index 9bcce28ed..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-col-rd.shader_test +++ /dev/null @@ -1,74 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec2 expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec2 expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec2 expect 1 2 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec2 expect 5 6 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec2 expect 9 10 -draw rect 85 5 10 10 -probe rgb 90 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 11 12 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-col-row-rd.shader_test deleted file mode 100644 index 78291cb50..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-col-row-rd.shader_test +++ /dev/null @@ -1,112 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 5 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 45 20 10 10 -probe rgb 50 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 9 -draw rect 85 5 10 10 -probe rgb 90 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 85 20 10 10 -probe rgb 90 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 11 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 12 -draw rect 100 20 10 10 -probe rgb 105 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-rd.shader_test deleted file mode 100644 index 823cfab71..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-rd.shader_test +++ /dev/null @@ -1,54 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int index; -uniform vec2 expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); -} - -[fragment shader] -uniform int index; -uniform vec2 expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec2 expect 11 12 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-row-rd.shader_test deleted file mode 100644 index 19395ef4f..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-index-row-rd.shader_test +++ /dev/null @@ -1,74 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 11 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 12 -draw rect 100 20 10 10 -probe rgb 105 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-rd.shader_test deleted file mode 100644 index e18aed4bc..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-rd.shader_test +++ /dev/null @@ -1,41 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform vec2 expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); -} - -[fragment shader] -uniform vec2 expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-row-rd.shader_test deleted file mode 100644 index 9b9d63ad3..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat2-row-rd.shader_test +++ /dev/null @@ -1,49 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int row; -uniform float expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-col-rd.shader_test deleted file mode 100644 index 1583f7115..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-col-rd.shader_test +++ /dev/null @@ -1,54 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int col; -uniform vec3 expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); -} - -[fragment shader] -uniform int col; -uniform vec3 expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec3 expect 10 11 12 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 16 17 18 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-col-row-rd.shader_test deleted file mode 100644 index 23769fdb5..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-col-row-rd.shader_test +++ /dev/null @@ -1,89 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 10 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 11 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 12 -draw rect 60 35 10 10 -probe rgb 65 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 16 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 17 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 18 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-col-rd.shader_test deleted file mode 100644 index c470b312d..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-col-rd.shader_test +++ /dev/null @@ -1,89 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec3 expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec3 expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec3 expect 1 2 3 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 7 8 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec3 expect 10 11 12 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 16 17 18 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec3 expect 19 20 21 -draw rect 115 5 10 10 -probe rgb 120 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 22 23 24 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 25 26 27 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-col-row-rd.shader_test deleted file mode 100644 index b1f0d8e3a..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-col-row-rd.shader_test +++ /dev/null @@ -1,190 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 7 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 9 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 10 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 11 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 12 -draw rect 60 35 10 10 -probe rgb 65 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 16 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 17 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 18 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 19 -draw rect 115 5 10 10 -probe rgb 120 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 20 -draw rect 115 20 10 10 -probe rgb 120 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 21 -draw rect 115 35 10 10 -probe rgb 120 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 22 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 23 -draw rect 130 20 10 10 -probe rgb 135 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 24 -draw rect 130 35 10 10 -probe rgb 135 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 145 20 10 10 -probe rgb 150 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 145 35 10 10 -probe rgb 150 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-rd.shader_test deleted file mode 100644 index a59cf4037..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-rd.shader_test +++ /dev/null @@ -1,54 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int index; -uniform vec3 expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); -} - -[fragment shader] -uniform int index; -uniform vec3 expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec3 expect 22 23 24 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-row-rd.shader_test deleted file mode 100644 index 4086759f7..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-index-row-rd.shader_test +++ /dev/null @@ -1,89 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 22 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 23 -draw rect 130 20 10 10 -probe rgb 135 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 24 -draw rect 130 35 10 10 -probe rgb 135 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-rd.shader_test deleted file mode 100644 index 17889c2b6..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-rd.shader_test +++ /dev/null @@ -1,41 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform vec3 expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); -} - -[fragment shader] -uniform vec3 expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-row-rd.shader_test deleted file mode 100644 index 4ba12f026..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat3-row-rd.shader_test +++ /dev/null @@ -1,54 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int row; -uniform float expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-col-rd.shader_test deleted file mode 100644 index 46a74c0e5..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-col-rd.shader_test +++ /dev/null @@ -1,59 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int col; -uniform vec4 expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); -} - -[fragment shader] -uniform int col; -uniform vec4 expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec4 expect 17 18 19 20 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 25 26 27 28 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 29 30 31 32 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-col-row-rd.shader_test deleted file mode 100644 index 05fa3ea14..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-col-row-rd.shader_test +++ /dev/null @@ -1,125 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 17 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 18 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 19 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 20 -draw rect 75 50 10 10 -probe rgb 80 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 105 20 10 10 -probe rgb 110 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 105 35 10 10 -probe rgb 110 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 28 -draw rect 105 50 10 10 -probe rgb 110 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 29 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 30 -draw rect 120 20 10 10 -probe rgb 125 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 31 -draw rect 120 35 10 10 -probe rgb 125 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 32 -draw rect 120 50 10 10 -probe rgb 125 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-col-rd.shader_test deleted file mode 100644 index db7acb7a5..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-col-rd.shader_test +++ /dev/null @@ -1,104 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec4 expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec4 expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec4 expect 1 2 3 4 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 9 10 11 12 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 13 14 15 16 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec4 expect 17 18 19 20 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 25 26 27 28 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 29 30 31 32 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec4 expect 33 34 35 36 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 37 38 39 40 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 41 42 43 44 -draw rect 175 5 10 10 -probe rgb 180 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 45 46 47 48 -draw rect 190 5 10 10 -probe rgb 195 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-col-row-rd.shader_test deleted file mode 100644 index 2465eef21..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-col-row-rd.shader_test +++ /dev/null @@ -1,298 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 4 -draw rect 5 50 10 10 -probe rgb 10 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 11 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 12 -draw rect 35 50 10 10 -probe rgb 40 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 13 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 50 20 10 10 -probe rgb 55 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 50 35 10 10 -probe rgb 55 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 16 -draw rect 50 50 10 10 -probe rgb 55 55 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 17 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 18 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 19 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 20 -draw rect 75 50 10 10 -probe rgb 80 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 105 20 10 10 -probe rgb 110 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 105 35 10 10 -probe rgb 110 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 28 -draw rect 105 50 10 10 -probe rgb 110 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 29 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 30 -draw rect 120 20 10 10 -probe rgb 125 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 31 -draw rect 120 35 10 10 -probe rgb 125 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 32 -draw rect 120 50 10 10 -probe rgb 125 55 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 33 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 34 -draw rect 145 20 10 10 -probe rgb 150 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 35 -draw rect 145 35 10 10 -probe rgb 150 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 36 -draw rect 145 50 10 10 -probe rgb 150 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 37 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 38 -draw rect 160 20 10 10 -probe rgb 165 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 39 -draw rect 160 35 10 10 -probe rgb 165 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 40 -draw rect 160 50 10 10 -probe rgb 165 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 41 -draw rect 175 5 10 10 -probe rgb 180 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 42 -draw rect 175 20 10 10 -probe rgb 180 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 43 -draw rect 175 35 10 10 -probe rgb 180 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 44 -draw rect 175 50 10 10 -probe rgb 180 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 45 -draw rect 190 5 10 10 -probe rgb 195 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 46 -draw rect 190 20 10 10 -probe rgb 195 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 47 -draw rect 190 35 10 10 -probe rgb 195 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 48 -draw rect 190 50 10 10 -probe rgb 195 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-rd.shader_test deleted file mode 100644 index d8ce85a74..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-rd.shader_test +++ /dev/null @@ -1,54 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int index; -uniform vec4 expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); -} - -[fragment shader] -uniform int index; -uniform vec4 expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec4 expect 37 38 39 40 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-row-rd.shader_test deleted file mode 100644 index f4781e016..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-index-row-rd.shader_test +++ /dev/null @@ -1,104 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 37 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 38 -draw rect 160 20 10 10 -probe rgb 165 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 39 -draw rect 160 35 10 10 -probe rgb 165 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 40 -draw rect 160 50 10 10 -probe rgb 165 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-rd.shader_test deleted file mode 100644 index fbf6a212e..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-rd.shader_test +++ /dev/null @@ -1,41 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform vec4 expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); -} - -[fragment shader] -uniform vec4 expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-row-rd.shader_test deleted file mode 100644 index 7ebe31716..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-array-mat4-row-rd.shader_test +++ /dev/null @@ -1,59 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int row; -uniform float expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-col-rd.shader_test deleted file mode 100644 index 4dac5d06b..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-col-rd.shader_test +++ /dev/null @@ -1,47 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 8 - -[vertex shader] -uniform int col; -uniform vec2 expect; -varying mat2x2 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat2x2(1.0, 2.0, 3.0, 4.0); -} - -[fragment shader] -uniform int col; -uniform vec2 expect; -varying mat2x2 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec2 expect 1 2 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-col-row-rd.shader_test deleted file mode 100644 index d7c552ab5..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-col-row-rd.shader_test +++ /dev/null @@ -1,61 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 8 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat2x2 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat2x2(1.0, 2.0, 3.0, 4.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat2x2 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-rd.shader_test deleted file mode 100644 index 0776170e5..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-rd.shader_test +++ /dev/null @@ -1,39 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 8 - -[vertex shader] -uniform vec2 expect; -varying mat2x2 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat2x2(1.0, 2.0, 3.0, 4.0); -} - -[fragment shader] -uniform vec2 expect; -varying mat2x2 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-row-rd.shader_test deleted file mode 100644 index 8cabc16f6..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat2-row-rd.shader_test +++ /dev/null @@ -1,47 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 8 - -[vertex shader] -uniform int row; -uniform float expect; -varying mat2x2 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat2x2(1.0, 2.0, 3.0, 4.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying mat2x2 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-col-rd.shader_test deleted file mode 100644 index ecf2f5d48..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-col-rd.shader_test +++ /dev/null @@ -1,52 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 13 - -[vertex shader] -uniform int col; -uniform vec3 expect; -varying mat3x3 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); -} - -[fragment shader] -uniform int col; -uniform vec3 expect; -varying mat3x3 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec3 expect 1 2 3 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 7 8 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-col-row-rd.shader_test deleted file mode 100644 index 0962e0322..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-col-row-rd.shader_test +++ /dev/null @@ -1,87 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 13 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat3x3 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat3x3 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 7 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 9 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-rd.shader_test deleted file mode 100644 index 27c8424e1..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-rd.shader_test +++ /dev/null @@ -1,39 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 13 - -[vertex shader] -uniform vec3 expect; -varying mat3x3 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); -} - -[fragment shader] -uniform vec3 expect; -varying mat3x3 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-row-rd.shader_test deleted file mode 100644 index 8709e261a..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat3-row-rd.shader_test +++ /dev/null @@ -1,52 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 13 - -[vertex shader] -uniform int row; -uniform float expect; -varying mat3x3 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying mat3x3 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-col-rd.shader_test deleted file mode 100644 index 74ad10687..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-col-rd.shader_test +++ /dev/null @@ -1,57 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 20 - -[vertex shader] -uniform int col; -uniform vec4 expect; -varying mat4x4 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); -} - -[fragment shader] -uniform int col; -uniform vec4 expect; -varying mat4x4 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec4 expect 1 2 3 4 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 9 10 11 12 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 13 14 15 16 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-col-row-rd.shader_test deleted file mode 100644 index 4c9bf7590..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-col-row-rd.shader_test +++ /dev/null @@ -1,123 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat4x4 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat4x4 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 4 -draw rect 5 50 10 10 -probe rgb 10 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 11 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 12 -draw rect 35 50 10 10 -probe rgb 40 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 13 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 50 20 10 10 -probe rgb 55 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 50 35 10 10 -probe rgb 55 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 16 -draw rect 50 50 10 10 -probe rgb 55 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-rd.shader_test deleted file mode 100644 index 4ff233d6c..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-rd.shader_test +++ /dev/null @@ -1,39 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 20 - -[vertex shader] -uniform vec4 expect; -varying mat4x4 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); -} - -[fragment shader] -uniform vec4 expect; -varying mat4x4 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-row-rd.shader_test deleted file mode 100644 index 4a77e0ccb..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/fs-varying-mat4-row-rd.shader_test +++ /dev/null @@ -1,57 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 20 - -[vertex shader] -uniform int row; -uniform float expect; -varying mat4x4 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying mat4x4 m; -varying vec4 color; - -void main() -{ - gl_FragColor = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-col-rd.shader_test deleted file mode 100644 index 98aa6f84c..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-col-rd.shader_test +++ /dev/null @@ -1,48 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); - color = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec2 expect 5 6 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-col-row-rd.shader_test deleted file mode 100644 index 953d59f16..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-col-row-rd.shader_test +++ /dev/null @@ -1,62 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); - color = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 5 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 45 20 10 10 -probe rgb 50 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-col-rd.shader_test deleted file mode 100644 index 9d02ac43e..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-col-rd.shader_test +++ /dev/null @@ -1,73 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); - color = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec2 expect 1 2 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec2 expect 5 6 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec2 expect 9 10 -draw rect 85 5 10 10 -probe rgb 90 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 11 12 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-col-row-rd.shader_test deleted file mode 100644 index 8cef49c6a..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-col-row-rd.shader_test +++ /dev/null @@ -1,111 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); - color = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 5 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 45 20 10 10 -probe rgb 50 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 9 -draw rect 85 5 10 10 -probe rgb 90 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 85 20 10 10 -probe rgb 90 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 11 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 12 -draw rect 100 20 10 10 -probe rgb 105 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-rd.shader_test deleted file mode 100644 index d8819f330..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-rd.shader_test +++ /dev/null @@ -1,53 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); - color = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec2 expect 11 12 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-row-rd.shader_test deleted file mode 100644 index 353a5394d..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-index-row-rd.shader_test +++ /dev/null @@ -1,73 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); - color = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 11 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 12 -draw rect 100 20 10 10 -probe rgb 105 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-rd.shader_test deleted file mode 100644 index de95b7453..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-rd.shader_test +++ /dev/null @@ -1,40 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); - color = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-row-rd.shader_test deleted file mode 100644 index 16b96dd49..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat2-row-rd.shader_test +++ /dev/null @@ -1,48 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); - color = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-col-rd.shader_test deleted file mode 100644 index 97009cd6e..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-col-rd.shader_test +++ /dev/null @@ -1,53 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); - color = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec3 expect 10 11 12 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 16 17 18 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-col-row-rd.shader_test deleted file mode 100644 index 4a40ee414..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-col-row-rd.shader_test +++ /dev/null @@ -1,88 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); - color = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 10 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 11 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 12 -draw rect 60 35 10 10 -probe rgb 65 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 16 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 17 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 18 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-col-rd.shader_test deleted file mode 100644 index 952679427..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-col-rd.shader_test +++ /dev/null @@ -1,88 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); - color = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec3 expect 1 2 3 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 7 8 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec3 expect 10 11 12 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 16 17 18 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec3 expect 19 20 21 -draw rect 115 5 10 10 -probe rgb 120 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 22 23 24 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 25 26 27 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-col-row-rd.shader_test deleted file mode 100644 index dee34fc1d..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-col-row-rd.shader_test +++ /dev/null @@ -1,189 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); - color = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 7 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 9 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 10 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 11 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 12 -draw rect 60 35 10 10 -probe rgb 65 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 16 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 17 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 18 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 19 -draw rect 115 5 10 10 -probe rgb 120 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 20 -draw rect 115 20 10 10 -probe rgb 120 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 21 -draw rect 115 35 10 10 -probe rgb 120 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 22 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 23 -draw rect 130 20 10 10 -probe rgb 135 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 24 -draw rect 130 35 10 10 -probe rgb 135 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 145 20 10 10 -probe rgb 150 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 145 35 10 10 -probe rgb 150 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-rd.shader_test deleted file mode 100644 index 63380f9c4..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-rd.shader_test +++ /dev/null @@ -1,53 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); - color = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec3 expect 22 23 24 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-row-rd.shader_test deleted file mode 100644 index 5aa096c3d..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-index-row-rd.shader_test +++ /dev/null @@ -1,88 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); - color = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 22 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 23 -draw rect 130 20 10 10 -probe rgb 135 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 24 -draw rect 130 35 10 10 -probe rgb 135 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-rd.shader_test deleted file mode 100644 index a7af03832..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-rd.shader_test +++ /dev/null @@ -1,40 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); - color = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-row-rd.shader_test deleted file mode 100644 index 5a198a98b..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat3-row-rd.shader_test +++ /dev/null @@ -1,53 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); - color = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-col-rd.shader_test deleted file mode 100644 index 2f5eb1b0f..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-col-rd.shader_test +++ /dev/null @@ -1,58 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); - color = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec4 expect 17 18 19 20 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 25 26 27 28 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 29 30 31 32 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-col-row-rd.shader_test deleted file mode 100644 index 724fca20a..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-col-row-rd.shader_test +++ /dev/null @@ -1,124 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); - color = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 17 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 18 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 19 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 20 -draw rect 75 50 10 10 -probe rgb 80 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 105 20 10 10 -probe rgb 110 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 105 35 10 10 -probe rgb 110 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 28 -draw rect 105 50 10 10 -probe rgb 110 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 29 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 30 -draw rect 120 20 10 10 -probe rgb 125 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 31 -draw rect 120 35 10 10 -probe rgb 125 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 32 -draw rect 120 50 10 10 -probe rgb 125 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-col-rd.shader_test deleted file mode 100644 index 60a8813ee..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-col-rd.shader_test +++ /dev/null @@ -1,103 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); - color = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec4 expect 1 2 3 4 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 9 10 11 12 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 13 14 15 16 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec4 expect 17 18 19 20 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 25 26 27 28 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 29 30 31 32 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec4 expect 33 34 35 36 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 37 38 39 40 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 41 42 43 44 -draw rect 175 5 10 10 -probe rgb 180 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 45 46 47 48 -draw rect 190 5 10 10 -probe rgb 195 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-col-row-rd.shader_test deleted file mode 100644 index 1185a2074..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-col-row-rd.shader_test +++ /dev/null @@ -1,297 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); - color = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 4 -draw rect 5 50 10 10 -probe rgb 10 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 11 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 12 -draw rect 35 50 10 10 -probe rgb 40 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 13 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 50 20 10 10 -probe rgb 55 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 50 35 10 10 -probe rgb 55 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 16 -draw rect 50 50 10 10 -probe rgb 55 55 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 17 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 18 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 19 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 20 -draw rect 75 50 10 10 -probe rgb 80 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 105 20 10 10 -probe rgb 110 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 105 35 10 10 -probe rgb 110 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 28 -draw rect 105 50 10 10 -probe rgb 110 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 29 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 30 -draw rect 120 20 10 10 -probe rgb 125 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 31 -draw rect 120 35 10 10 -probe rgb 125 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 32 -draw rect 120 50 10 10 -probe rgb 125 55 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 33 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 34 -draw rect 145 20 10 10 -probe rgb 150 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 35 -draw rect 145 35 10 10 -probe rgb 150 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 36 -draw rect 145 50 10 10 -probe rgb 150 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 37 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 38 -draw rect 160 20 10 10 -probe rgb 165 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 39 -draw rect 160 35 10 10 -probe rgb 165 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 40 -draw rect 160 50 10 10 -probe rgb 165 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 41 -draw rect 175 5 10 10 -probe rgb 180 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 42 -draw rect 175 20 10 10 -probe rgb 180 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 43 -draw rect 175 35 10 10 -probe rgb 180 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 44 -draw rect 175 50 10 10 -probe rgb 180 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 45 -draw rect 190 5 10 10 -probe rgb 195 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 46 -draw rect 190 20 10 10 -probe rgb 195 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 47 -draw rect 190 35 10 10 -probe rgb 195 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 48 -draw rect 190 50 10 10 -probe rgb 195 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-rd.shader_test deleted file mode 100644 index 4b93c4d03..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-rd.shader_test +++ /dev/null @@ -1,53 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); - color = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec4 expect 37 38 39 40 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-row-rd.shader_test deleted file mode 100644 index 40a1c2160..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-index-row-rd.shader_test +++ /dev/null @@ -1,103 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); - color = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 37 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 38 -draw rect 160 20 10 10 -probe rgb 165 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 39 -draw rect 160 35 10 10 -probe rgb 165 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 40 -draw rect 160 50 10 10 -probe rgb 165 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-rd.shader_test deleted file mode 100644 index 502d5dc51..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-rd.shader_test +++ /dev/null @@ -1,40 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); - color = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-row-rd.shader_test deleted file mode 100644 index 07038ef7c..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-array-mat4-row-rd.shader_test +++ /dev/null @@ -1,58 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); - color = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-col-rd.shader_test deleted file mode 100644 index 78238f2dd..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-col-rd.shader_test +++ /dev/null @@ -1,45 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); - color = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec2 expect 1 2 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-col-row-rd.shader_test deleted file mode 100644 index c5008fffe..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-col-row-rd.shader_test +++ /dev/null @@ -1,59 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); - color = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-rd.shader_test deleted file mode 100644 index 45a4a87c5..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-rd.shader_test +++ /dev/null @@ -1,37 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); - color = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec2 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-row-rd.shader_test deleted file mode 100644 index 6d3a2eee3..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat2-row-rd.shader_test +++ /dev/null @@ -1,45 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); - color = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-col-rd.shader_test deleted file mode 100644 index 032a523f2..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-col-rd.shader_test +++ /dev/null @@ -1,50 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - color = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec3 expect 1 2 3 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 7 8 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-col-row-rd.shader_test deleted file mode 100644 index d7c38227b..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-col-row-rd.shader_test +++ /dev/null @@ -1,85 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - color = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 7 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 9 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-rd.shader_test deleted file mode 100644 index 3fceb28cd..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-rd.shader_test +++ /dev/null @@ -1,37 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - color = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec3 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-row-rd.shader_test deleted file mode 100644 index d296911e9..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat3-row-rd.shader_test +++ /dev/null @@ -1,50 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - color = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-col-rd.shader_test deleted file mode 100644 index cfe9858bf..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-col-rd.shader_test +++ /dev/null @@ -1,55 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - color = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec4 expect 1 2 3 4 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 9 10 11 12 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 13 14 15 16 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-col-row-rd.shader_test deleted file mode 100644 index 770537385..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-col-row-rd.shader_test +++ /dev/null @@ -1,121 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - color = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 4 -draw rect 5 50 10 10 -probe rgb 10 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 11 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 12 -draw rect 35 50 10 10 -probe rgb 40 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 13 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 50 20 10 10 -probe rgb 55 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 50 35 10 10 -probe rgb 55 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 16 -draw rect 50 50 10 10 -probe rgb 55 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-rd.shader_test deleted file mode 100644 index 3859cff3c..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-rd.shader_test +++ /dev/null @@ -1,37 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - color = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec4 expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-row-rd.shader_test deleted file mode 100644 index 3cbca9d4a..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-temp-mat4-row-rd.shader_test +++ /dev/null @@ -1,55 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - color = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-col-rd.shader_test deleted file mode 100644 index 5179b2219..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-col-rd.shader_test +++ /dev/null @@ -1,51 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform vec2 expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec2 expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec2 expect 5 6 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-col-row-rd.shader_test deleted file mode 100644 index 15fa69b6f..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-col-row-rd.shader_test +++ /dev/null @@ -1,65 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 5 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 45 20 10 10 -probe rgb 50 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-col-rd.shader_test deleted file mode 100644 index 404448166..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-col-rd.shader_test +++ /dev/null @@ -1,76 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec2 expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec2 expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec2 expect 1 2 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec2 expect 5 6 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec2 expect 9 10 -draw rect 85 5 10 10 -probe rgb 90 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 11 12 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-col-row-rd.shader_test deleted file mode 100644 index 7b6482297..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-col-row-rd.shader_test +++ /dev/null @@ -1,114 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 5 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 45 20 10 10 -probe rgb 50 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 9 -draw rect 85 5 10 10 -probe rgb 90 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 85 20 10 10 -probe rgb 90 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 11 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 12 -draw rect 100 20 10 10 -probe rgb 105 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-rd.shader_test deleted file mode 100644 index 64c0c6f32..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-rd.shader_test +++ /dev/null @@ -1,56 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform vec2 expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform vec2 expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec2 expect 11 12 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-row-rd.shader_test deleted file mode 100644 index 5f26e0788..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-index-row-rd.shader_test +++ /dev/null @@ -1,76 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 11 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 12 -draw rect 100 20 10 10 -probe rgb 105 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-rd.shader_test deleted file mode 100644 index 36abf2454..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-rd.shader_test +++ /dev/null @@ -1,43 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform vec2 expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec2 expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-row-rd.shader_test deleted file mode 100644 index ba3fb32d8..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat2-row-rd.shader_test +++ /dev/null @@ -1,51 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int row; -uniform float expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -uniform mat2x2[3] m = mat2x2[3]( - mat2x2(1.0, 2.0, 3.0, 4.0), - mat2x2(5.0, 6.0, 7.0, 8.0), - mat2x2(9.0, 10.0, 11.0, 12.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-col-rd.shader_test deleted file mode 100644 index d579506d6..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-col-rd.shader_test +++ /dev/null @@ -1,56 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform vec3 expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec3 expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec3 expect 10 11 12 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 16 17 18 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-col-row-rd.shader_test deleted file mode 100644 index f85987fcd..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-col-row-rd.shader_test +++ /dev/null @@ -1,91 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 10 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 11 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 12 -draw rect 60 35 10 10 -probe rgb 65 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 16 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 17 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 18 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-col-rd.shader_test deleted file mode 100644 index 612ad20f8..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-col-rd.shader_test +++ /dev/null @@ -1,91 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec3 expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec3 expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec3 expect 1 2 3 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 7 8 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec3 expect 10 11 12 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 16 17 18 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec3 expect 19 20 21 -draw rect 115 5 10 10 -probe rgb 120 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 22 23 24 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 25 26 27 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-col-row-rd.shader_test deleted file mode 100644 index 9a768b850..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-col-row-rd.shader_test +++ /dev/null @@ -1,192 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 7 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 9 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 10 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 11 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 12 -draw rect 60 35 10 10 -probe rgb 65 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 16 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 17 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 18 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 19 -draw rect 115 5 10 10 -probe rgb 120 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 20 -draw rect 115 20 10 10 -probe rgb 120 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 21 -draw rect 115 35 10 10 -probe rgb 120 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 22 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 23 -draw rect 130 20 10 10 -probe rgb 135 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 24 -draw rect 130 35 10 10 -probe rgb 135 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 145 20 10 10 -probe rgb 150 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 145 35 10 10 -probe rgb 150 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-rd.shader_test deleted file mode 100644 index 02b016689..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-rd.shader_test +++ /dev/null @@ -1,56 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform vec3 expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform vec3 expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec3 expect 22 23 24 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-row-rd.shader_test deleted file mode 100644 index ddd8dafe1..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-index-row-rd.shader_test +++ /dev/null @@ -1,91 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 22 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 23 -draw rect 130 20 10 10 -probe rgb 135 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 24 -draw rect 130 35 10 10 -probe rgb 135 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-rd.shader_test deleted file mode 100644 index bdba71f59..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-rd.shader_test +++ /dev/null @@ -1,43 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform vec3 expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec3 expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-row-rd.shader_test deleted file mode 100644 index 468875a2b..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat3-row-rd.shader_test +++ /dev/null @@ -1,56 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int row; -uniform float expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -uniform mat3x3[3] m = mat3x3[3]( - mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0), - mat3x3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0), - mat3x3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-col-rd.shader_test deleted file mode 100644 index 34107fe52..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-col-rd.shader_test +++ /dev/null @@ -1,61 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform vec4 expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec4 expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec4 expect 17 18 19 20 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 25 26 27 28 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 29 30 31 32 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-col-row-rd.shader_test deleted file mode 100644 index 9979e064a..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-col-row-rd.shader_test +++ /dev/null @@ -1,127 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 17 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 18 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 19 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 20 -draw rect 75 50 10 10 -probe rgb 80 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 105 20 10 10 -probe rgb 110 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 105 35 10 10 -probe rgb 110 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 28 -draw rect 105 50 10 10 -probe rgb 110 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 29 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 30 -draw rect 120 20 10 10 -probe rgb 125 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 31 -draw rect 120 35 10 10 -probe rgb 125 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 32 -draw rect 120 50 10 10 -probe rgb 125 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-col-rd.shader_test deleted file mode 100644 index f83c38a6c..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-col-rd.shader_test +++ /dev/null @@ -1,106 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec4 expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec4 expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec4 expect 1 2 3 4 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 9 10 11 12 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 13 14 15 16 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec4 expect 17 18 19 20 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 25 26 27 28 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 29 30 31 32 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec4 expect 33 34 35 36 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 37 38 39 40 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 41 42 43 44 -draw rect 175 5 10 10 -probe rgb 180 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 45 46 47 48 -draw rect 190 5 10 10 -probe rgb 195 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-col-row-rd.shader_test deleted file mode 100644 index 830c3f5bb..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-col-row-rd.shader_test +++ /dev/null @@ -1,300 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 4 -draw rect 5 50 10 10 -probe rgb 10 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 11 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 12 -draw rect 35 50 10 10 -probe rgb 40 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 13 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 50 20 10 10 -probe rgb 55 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 50 35 10 10 -probe rgb 55 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 16 -draw rect 50 50 10 10 -probe rgb 55 55 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 17 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 18 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 19 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 20 -draw rect 75 50 10 10 -probe rgb 80 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 105 20 10 10 -probe rgb 110 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 105 35 10 10 -probe rgb 110 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 28 -draw rect 105 50 10 10 -probe rgb 110 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 29 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 30 -draw rect 120 20 10 10 -probe rgb 125 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 31 -draw rect 120 35 10 10 -probe rgb 125 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 32 -draw rect 120 50 10 10 -probe rgb 125 55 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 33 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 34 -draw rect 145 20 10 10 -probe rgb 150 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 35 -draw rect 145 35 10 10 -probe rgb 150 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 36 -draw rect 145 50 10 10 -probe rgb 150 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 37 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 38 -draw rect 160 20 10 10 -probe rgb 165 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 39 -draw rect 160 35 10 10 -probe rgb 165 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 40 -draw rect 160 50 10 10 -probe rgb 165 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 41 -draw rect 175 5 10 10 -probe rgb 180 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 42 -draw rect 175 20 10 10 -probe rgb 180 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 43 -draw rect 175 35 10 10 -probe rgb 180 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 44 -draw rect 175 50 10 10 -probe rgb 180 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 45 -draw rect 190 5 10 10 -probe rgb 195 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 46 -draw rect 190 20 10 10 -probe rgb 195 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 47 -draw rect 190 35 10 10 -probe rgb 195 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 48 -draw rect 190 50 10 10 -probe rgb 195 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-rd.shader_test deleted file mode 100644 index 13d1cbfb4..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-rd.shader_test +++ /dev/null @@ -1,56 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform vec4 expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform vec4 expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec4 expect 37 38 39 40 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-row-rd.shader_test deleted file mode 100644 index 73689b155..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-index-row-rd.shader_test +++ /dev/null @@ -1,106 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 37 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 38 -draw rect 160 20 10 10 -probe rgb 165 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 39 -draw rect 160 35 10 10 -probe rgb 165 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 40 -draw rect 160 50 10 10 -probe rgb 165 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-rd.shader_test deleted file mode 100644 index ccdec23a2..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-rd.shader_test +++ /dev/null @@ -1,43 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform vec4 expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec4 expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-row-rd.shader_test deleted file mode 100644 index 0b0cbf3d6..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-array-mat4-row-rd.shader_test +++ /dev/null @@ -1,61 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int row; -uniform float expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -uniform mat4x4[3] m = mat4x4[3]( - mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0), - mat4x4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0), - mat4x4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0)); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-col-rd.shader_test deleted file mode 100644 index 2aae55511..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-col-rd.shader_test +++ /dev/null @@ -1,45 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform vec2 expect; -uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec2 expect; -uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec2 expect 1 2 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-col-row-rd.shader_test deleted file mode 100644 index bca0fe952..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-col-row-rd.shader_test +++ /dev/null @@ -1,59 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-rd.shader_test deleted file mode 100644 index 576432879..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-rd.shader_test +++ /dev/null @@ -1,37 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform vec2 expect; -uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec2 expect; -uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-row-rd.shader_test deleted file mode 100644 index 30bd0870c..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat2-row-rd.shader_test +++ /dev/null @@ -1,45 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int row; -uniform float expect; -uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -uniform mat2x2 m = mat2x2(1.0, 2.0, 3.0, 4.0); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-col-rd.shader_test deleted file mode 100644 index de94a1dbd..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-col-rd.shader_test +++ /dev/null @@ -1,50 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform vec3 expect; -uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec3 expect; -uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec3 expect 1 2 3 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 7 8 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-col-row-rd.shader_test deleted file mode 100644 index 123dbf254..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-col-row-rd.shader_test +++ /dev/null @@ -1,85 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 7 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 9 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-rd.shader_test deleted file mode 100644 index 7c65df34a..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-rd.shader_test +++ /dev/null @@ -1,37 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform vec3 expect; -uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec3 expect; -uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-row-rd.shader_test deleted file mode 100644 index 287b0a870..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat3-row-rd.shader_test +++ /dev/null @@ -1,50 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int row; -uniform float expect; -uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -uniform mat3x3 m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-col-rd.shader_test deleted file mode 100644 index 5961db594..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-col-rd.shader_test +++ /dev/null @@ -1,55 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform vec4 expect; -uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec4 expect; -uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec4 expect 1 2 3 4 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 9 10 11 12 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 13 14 15 16 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-col-row-rd.shader_test deleted file mode 100644 index 43d536f93..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-col-row-rd.shader_test +++ /dev/null @@ -1,121 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 4 -draw rect 5 50 10 10 -probe rgb 10 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 11 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 12 -draw rect 35 50 10 10 -probe rgb 40 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 13 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 50 20 10 10 -probe rgb 55 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 50 35 10 10 -probe rgb 55 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 16 -draw rect 50 50 10 10 -probe rgb 55 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-rd.shader_test deleted file mode 100644 index 9a06d65b4..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-rd.shader_test +++ /dev/null @@ -1,37 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform vec4 expect; -uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec4 expect; -uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-row-rd.shader_test deleted file mode 100644 index 5eaa33557..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-uniform-mat4-row-rd.shader_test +++ /dev/null @@ -1,55 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 - -[vertex shader] -uniform int row; -uniform float expect; -uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - color = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -uniform mat4x4 m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); -varying vec4 color; - -void main() -{ - gl_FragColor = color; -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-rd.shader_test deleted file mode 100644 index 6a9561f08..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-rd.shader_test +++ /dev/null @@ -1,65 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int col; -uniform vec2 expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec2 expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][col] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec2 expect 5 6 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-row-rd.shader_test deleted file mode 100644 index d1c91e1b2..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-col-row-rd.shader_test +++ /dev/null @@ -1,79 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][col][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 5 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 45 20 10 10 -probe rgb 50 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-rd.shader_test deleted file mode 100644 index 4280109d8..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-rd.shader_test +++ /dev/null @@ -1,90 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec2 expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec2 expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[index][col] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec2 expect 1 2 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec2 expect 5 6 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec2 expect 9 10 -draw rect 85 5 10 10 -probe rgb 90 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 11 12 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-row-rd.shader_test deleted file mode 100644 index 4d4542b00..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-col-row-rd.shader_test +++ /dev/null @@ -1,128 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[index][col][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 5 -draw rect 45 5 10 10 -probe rgb 50 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 45 20 10 10 -probe rgb 50 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 9 -draw rect 85 5 10 10 -probe rgb 90 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 85 20 10 10 -probe rgb 90 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 11 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 12 -draw rect 100 20 10 10 -probe rgb 105 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-rd.shader_test deleted file mode 100644 index 528819d3e..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-rd.shader_test +++ /dev/null @@ -1,70 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int index; -uniform vec2 expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform vec2 expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[index][1] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec2 expect 11 12 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-row-rd.shader_test deleted file mode 100644 index 2a11d3549..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-index-row-rd.shader_test +++ /dev/null @@ -1,90 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[index][1][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 11 -draw rect 100 5 10 10 -probe rgb 105 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 12 -draw rect 100 20 10 10 -probe rgb 105 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-rd.shader_test deleted file mode 100644 index e7f12a20c..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-rd.shader_test +++ /dev/null @@ -1,57 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform vec2 expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec2 expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][1] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec2 expect 7 8 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-row-rd.shader_test deleted file mode 100644 index 75b3c69b9..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat2-row-rd.shader_test +++ /dev/null @@ -1,65 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 16 - -[vertex shader] -uniform int row; -uniform float expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat2(1.0, 2.0, 3.0, 4.0); - m[1] = mat2(5.0, 6.0, 7.0, 8.0); - m[2] = mat2(9.0, 10.0, 11.0, 12.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying mat2x2[3] m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][1][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 7 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-rd.shader_test deleted file mode 100644 index 2d2c939e8..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-rd.shader_test +++ /dev/null @@ -1,70 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int col; -uniform vec3 expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec3 expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][col] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec3 expect 10 11 12 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 16 17 18 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-row-rd.shader_test deleted file mode 100644 index 7fe84b776..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-col-row-rd.shader_test +++ /dev/null @@ -1,105 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][col][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 10 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 11 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 12 -draw rect 60 35 10 10 -probe rgb 65 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 16 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 17 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 18 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-rd.shader_test deleted file mode 100644 index 56611d09c..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-rd.shader_test +++ /dev/null @@ -1,105 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec3 expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec3 expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[index][col] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec3 expect 1 2 3 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 7 8 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec3 expect 10 11 12 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 16 17 18 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec3 expect 19 20 21 -draw rect 115 5 10 10 -probe rgb 120 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 22 23 24 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 25 26 27 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-row-rd.shader_test deleted file mode 100644 index 763f9935b..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-col-row-rd.shader_test +++ /dev/null @@ -1,206 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[index][col][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 7 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 9 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 10 -draw rect 60 5 10 10 -probe rgb 65 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 11 -draw rect 60 20 10 10 -probe rgb 65 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 12 -draw rect 60 35 10 10 -probe rgb 65 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 16 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 17 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 18 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 19 -draw rect 115 5 10 10 -probe rgb 120 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 20 -draw rect 115 20 10 10 -probe rgb 120 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 21 -draw rect 115 35 10 10 -probe rgb 120 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 22 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 23 -draw rect 130 20 10 10 -probe rgb 135 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 24 -draw rect 130 35 10 10 -probe rgb 135 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 145 20 10 10 -probe rgb 150 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 145 35 10 10 -probe rgb 150 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-rd.shader_test deleted file mode 100644 index 90e4bedc4..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-rd.shader_test +++ /dev/null @@ -1,70 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int index; -uniform vec3 expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform vec3 expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[index][1] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec3 expect 22 23 24 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-row-rd.shader_test deleted file mode 100644 index 3ab09092e..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-index-row-rd.shader_test +++ /dev/null @@ -1,105 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[index][1][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 22 -draw rect 130 5 10 10 -probe rgb 135 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 23 -draw rect 130 20 10 10 -probe rgb 135 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 24 -draw rect 130 35 10 10 -probe rgb 135 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-rd.shader_test deleted file mode 100644 index c87ce8a83..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-rd.shader_test +++ /dev/null @@ -1,57 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform vec3 expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec3 expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][1] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec3 expect 13 14 15 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-row-rd.shader_test deleted file mode 100644 index 1300e1f44..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat3-row-rd.shader_test +++ /dev/null @@ -1,70 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 31 - -[vertex shader] -uniform int row; -uniform float expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - m[1] = mat3(10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0); - m[2] = mat3(19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying mat3x3[3] m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][1][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 13 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-rd.shader_test deleted file mode 100644 index 975cbe385..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-rd.shader_test +++ /dev/null @@ -1,75 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int col; -uniform vec4 expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec4 expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][col] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec4 expect 17 18 19 20 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 25 26 27 28 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 29 30 31 32 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-row-rd.shader_test deleted file mode 100644 index cac073380..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-col-row-rd.shader_test +++ /dev/null @@ -1,141 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][col][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 17 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 18 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 19 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 20 -draw rect 75 50 10 10 -probe rgb 80 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 105 20 10 10 -probe rgb 110 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 105 35 10 10 -probe rgb 110 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 28 -draw rect 105 50 10 10 -probe rgb 110 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 29 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 30 -draw rect 120 20 10 10 -probe rgb 125 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 31 -draw rect 120 35 10 10 -probe rgb 125 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 32 -draw rect 120 50 10 10 -probe rgb 125 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-rd.shader_test deleted file mode 100644 index 4d94141b7..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-rd.shader_test +++ /dev/null @@ -1,120 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int index; -uniform int col; -uniform vec4 expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[index][col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform vec4 expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[index][col] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform vec4 expect 1 2 3 4 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 9 10 11 12 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 13 14 15 16 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform vec4 expect 17 18 19 20 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 25 26 27 28 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 29 30 31 32 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform vec4 expect 33 34 35 36 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 37 38 39 40 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 41 42 43 44 -draw rect 175 5 10 10 -probe rgb 180 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 45 46 47 48 -draw rect 190 5 10 10 -probe rgb 195 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-row-rd.shader_test deleted file mode 100644 index 1d72df23a..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-col-row-rd.shader_test +++ /dev/null @@ -1,314 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[index][col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int col; -uniform int row; -uniform float expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[index][col][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 4 -draw rect 5 50 10 10 -probe rgb 10 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 11 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 12 -draw rect 35 50 10 10 -probe rgb 40 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 13 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 50 20 10 10 -probe rgb 55 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 50 35 10 10 -probe rgb 55 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 16 -draw rect 50 50 10 10 -probe rgb 55 55 0.0 1.0 0.0 - -uniform int index 1 -uniform int col 0 -uniform int row 0 -uniform float expect 17 -draw rect 75 5 10 10 -probe rgb 80 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 18 -draw rect 75 20 10 10 -probe rgb 80 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 19 -draw rect 75 35 10 10 -probe rgb 80 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 20 -draw rect 75 50 10 10 -probe rgb 80 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 25 -draw rect 105 5 10 10 -probe rgb 110 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 26 -draw rect 105 20 10 10 -probe rgb 110 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 27 -draw rect 105 35 10 10 -probe rgb 110 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 28 -draw rect 105 50 10 10 -probe rgb 110 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 29 -draw rect 120 5 10 10 -probe rgb 125 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 30 -draw rect 120 20 10 10 -probe rgb 125 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 31 -draw rect 120 35 10 10 -probe rgb 125 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 32 -draw rect 120 50 10 10 -probe rgb 125 55 0.0 1.0 0.0 - -uniform int index 2 -uniform int col 0 -uniform int row 0 -uniform float expect 33 -draw rect 145 5 10 10 -probe rgb 150 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 34 -draw rect 145 20 10 10 -probe rgb 150 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 35 -draw rect 145 35 10 10 -probe rgb 150 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 36 -draw rect 145 50 10 10 -probe rgb 150 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 37 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 38 -draw rect 160 20 10 10 -probe rgb 165 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 39 -draw rect 160 35 10 10 -probe rgb 165 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 40 -draw rect 160 50 10 10 -probe rgb 165 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 41 -draw rect 175 5 10 10 -probe rgb 180 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 42 -draw rect 175 20 10 10 -probe rgb 180 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 43 -draw rect 175 35 10 10 -probe rgb 180 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 44 -draw rect 175 50 10 10 -probe rgb 180 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 45 -draw rect 190 5 10 10 -probe rgb 195 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 46 -draw rect 190 20 10 10 -probe rgb 195 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 47 -draw rect 190 35 10 10 -probe rgb 195 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 48 -draw rect 190 50 10 10 -probe rgb 195 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-rd.shader_test deleted file mode 100644 index 0056d1cea..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-rd.shader_test +++ /dev/null @@ -1,70 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int index; -uniform vec4 expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[index][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform vec4 expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[index][1] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int index 1 -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int index 2 -uniform vec4 expect 37 38 39 40 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-row-rd.shader_test deleted file mode 100644 index 13c16ff47..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-index-row-rd.shader_test +++ /dev/null @@ -1,120 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int index; -uniform int row; -uniform float expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[index][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int index; -uniform int row; -uniform float expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[index][1][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int index 0 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int index 1 -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - -uniform int index 2 -uniform int row 0 -uniform float expect 37 -draw rect 160 5 10 10 -probe rgb 165 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 38 -draw rect 160 20 10 10 -probe rgb 165 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 39 -draw rect 160 35 10 10 -probe rgb 165 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 40 -draw rect 160 50 10 10 -probe rgb 165 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-rd.shader_test deleted file mode 100644 index 26bebc7cd..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-rd.shader_test +++ /dev/null @@ -1,57 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform vec4 expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec4 expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][1] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec4 expect 21 22 23 24 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-row-rd.shader_test deleted file mode 100644 index feb62321f..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-array-mat4-row-rd.shader_test +++ /dev/null @@ -1,75 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 52 - -[vertex shader] -uniform int row; -uniform float expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m[0] = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - m[1] = mat4(17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0); - m[2] = mat4(33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying mat4x4[3] m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][1][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 21 -draw rect 90 5 10 10 -probe rgb 95 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 22 -draw rect 90 20 10 10 -probe rgb 95 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 23 -draw rect 90 35 10 10 -probe rgb 95 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 24 -draw rect 90 50 10 10 -probe rgb 95 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-rd.shader_test deleted file mode 100644 index ae7a107eb..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-rd.shader_test +++ /dev/null @@ -1,63 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 8 - -[vertex shader] -uniform int col; -uniform vec2 expect; -varying mat2x2 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat2x2(1.0, 2.0, 3.0, 4.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec2 expect; -varying mat2x2 m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[col] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec2 expect 1 2 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-row-rd.shader_test deleted file mode 100644 index 2a425019d..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-col-row-rd.shader_test +++ /dev/null @@ -1,77 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 8 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat2x2 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat2x2(1.0, 2.0, 3.0, 4.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat2x2 m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[col][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-rd.shader_test deleted file mode 100644 index 50cae7791..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-rd.shader_test +++ /dev/null @@ -1,55 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 8 - -[vertex shader] -uniform vec2 expect; -varying mat2x2 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat2x2(1.0, 2.0, 3.0, 4.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec2 expect; -varying mat2x2 m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec2 expect 3 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-row-rd.shader_test deleted file mode 100644 index 64cf19474..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat2-row-rd.shader_test +++ /dev/null @@ -1,63 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 8 - -[vertex shader] -uniform int row; -uniform float expect; -varying mat2x2 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat2x2(1.0, 2.0, 3.0, 4.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying mat2x2 m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 3 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 4 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-rd.shader_test deleted file mode 100644 index 89737490a..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-rd.shader_test +++ /dev/null @@ -1,68 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 13 - -[vertex shader] -uniform int col; -uniform vec3 expect; -varying mat3x3 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec3 expect; -varying mat3x3 m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[col] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec3 expect 1 2 3 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec3 expect 7 8 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-row-rd.shader_test deleted file mode 100644 index c9fd0c7b0..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-col-row-rd.shader_test +++ /dev/null @@ -1,103 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 13 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat3x3 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat3x3 m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[col][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 7 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 8 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 9 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-rd.shader_test deleted file mode 100644 index 57ca771c1..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-rd.shader_test +++ /dev/null @@ -1,55 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 13 - -[vertex shader] -uniform vec3 expect; -varying mat3x3 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec3 expect; -varying mat3x3 m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec3 expect 4 5 6 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-row-rd.shader_test deleted file mode 100644 index 2ede1046e..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat3-row-rd.shader_test +++ /dev/null @@ -1,68 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 13 - -[vertex shader] -uniform int row; -uniform float expect; -varying mat3x3 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat3x3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying mat3x3 m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 4 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 5 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 6 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-rd.shader_test deleted file mode 100644 index 3ffde8929..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-rd.shader_test +++ /dev/null @@ -1,73 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 20 - -[vertex shader] -uniform int col; -uniform vec4 expect; -varying mat4x4 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[col] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform vec4 expect; -varying mat4x4 m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[col] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform vec4 expect 1 2 3 4 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int col 1 -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int col 2 -uniform vec4 expect 9 10 11 12 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int col 3 -uniform vec4 expect 13 14 15 16 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-row-rd.shader_test deleted file mode 100644 index 51f584d2f..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-col-row-rd.shader_test +++ /dev/null @@ -1,139 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 20 - -[vertex shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat4x4 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[col][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int col; -uniform int row; -uniform float expect; -varying mat4x4 m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[col][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int col 0 -uniform int row 0 -uniform float expect 1 -draw rect 5 5 10 10 -probe rgb 10 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 2 -draw rect 5 20 10 10 -probe rgb 10 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 3 -draw rect 5 35 10 10 -probe rgb 10 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 4 -draw rect 5 50 10 10 -probe rgb 10 55 0.0 1.0 0.0 - -uniform int col 1 -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - -uniform int col 2 -uniform int row 0 -uniform float expect 9 -draw rect 35 5 10 10 -probe rgb 40 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 10 -draw rect 35 20 10 10 -probe rgb 40 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 11 -draw rect 35 35 10 10 -probe rgb 40 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 12 -draw rect 35 50 10 10 -probe rgb 40 55 0.0 1.0 0.0 - -uniform int col 3 -uniform int row 0 -uniform float expect 13 -draw rect 50 5 10 10 -probe rgb 55 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 14 -draw rect 50 20 10 10 -probe rgb 55 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 15 -draw rect 50 35 10 10 -probe rgb 55 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 16 -draw rect 50 50 10 10 -probe rgb 55 55 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-rd.shader_test deleted file mode 100644 index 2ff947619..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-rd.shader_test +++ /dev/null @@ -1,55 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 20 - -[vertex shader] -uniform vec4 expect; -varying mat4x4 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform vec4 expect; -varying mat4x4 m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform vec4 expect 5 6 7 8 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - diff --git a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-row-rd.shader_test b/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-row-rd.shader_test deleted file mode 100644 index 6cc06b48f..000000000 --- a/tests/spec/glsl-1.20/execution/variable-indexing/vs-varying-mat4-row-rd.shader_test +++ /dev/null @@ -1,73 +0,0 @@ -# Test generated by: -# ../../../glsl-1.10/variable-index-read.sh 1.20 - -[require] -GLSL >= 1.20 -GL_MAX_VARYING_COMPONENTS >= 20 - -[vertex shader] -uniform int row; -uniform float expect; -varying mat4x4 m; -varying vec4 color; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - - m = mat4x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0); - - /* From page 23 (page 30 of the PDF) of the GLSL 1.10 spec: - * - * "A vertex shader may also read varying variables, getting back the - * same values it has written. Reading a varying variable in a vertex - * shader returns undefined values if it is read before being - * written." - */ - color = (m[1][row] == expect) - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); -} - -[fragment shader] -uniform int row; -uniform float expect; -varying mat4x4 m; -varying vec4 color; - -void main() -{ - /* There is some trickery here. The fragment shader has to actually use - * the varyings generated by the vertex shader, or the compiler (more - * likely the linker) might demote the varying outputs to just be vertex - * shader global variables. Since the point of the test is the vertex - * shader reading from a varying, that would defeat the test. - */ - gl_FragColor = (m[1][row] == expect) - ? color : vec4(1.0, 0.0, 0.0, 1.0); -} - -[test] -clear color 0.5 0.5 0.5 0.5 -clear -ortho - -uniform int row 0 -uniform float expect 5 -draw rect 20 5 10 10 -probe rgb 25 10 0.0 1.0 0.0 - -uniform int row 1 -uniform float expect 6 -draw rect 20 20 10 10 -probe rgb 25 25 0.0 1.0 0.0 - -uniform int row 2 -uniform float expect 7 -draw rect 20 35 10 10 -probe rgb 25 40 0.0 1.0 0.0 - -uniform int row 3 -uniform float expect 8 -draw rect 20 50 10 10 -probe rgb 25 55 0.0 1.0 0.0 - |