| Message ID | 1427864487-10053-1-git-send-email-t_arceri@yahoo.com.au |
|---|---|
| State | New |
| Headers | show |
On Sat, 2015-04-25 at 02:02 -0700, Matt Turner wrote: > On Tue, Mar 31, 2015 at 10:01 PM, Timothy Arceri <t_arceri@yahoo.com.au> wrote: > > Although the existing tests are valid until link time, > > it doesn't make much sense to test this way. > > --- > > .../compiler/input-array-array-var.frag | 15 +++++++++++++++ > > .../compiler/input-array-array-var.vert | 15 --------------- > > .../compiler/input-array-var-array.frag | 15 +++++++++++++++ > > .../compiler/input-array-var-array.vert | 15 --------------- > > .../compiler/input-var-array-array.frag | 15 +++++++++++++++ > > .../compiler/input-var-array-array.vert | 15 --------------- > > 6 files changed, 45 insertions(+), 45 deletions(-) > > create mode 100644 tests/spec/arb_arrays_of_arrays/compiler/input-array-array-var.frag > > delete mode 100644 tests/spec/arb_arrays_of_arrays/compiler/input-array-array-var.vert > > create mode 100644 tests/spec/arb_arrays_of_arrays/compiler/input-array-var-array.frag > > delete mode 100644 tests/spec/arb_arrays_of_arrays/compiler/input-array-var-array.vert > > create mode 100644 tests/spec/arb_arrays_of_arrays/compiler/input-var-array-array.frag > > delete mode 100644 tests/spec/arb_arrays_of_arrays/compiler/input-var-array-array.vert > > I'm not sure I understand the rationale. Could you explain? Sure. These are compile tests to see if the implementation allows a shader input to be an array of arrays, however a vertex can't have input varyings (a mistake from copy and pasting when I created the tests). According to the spec having an input in a vertex shader is only a link time error so technically these tests are still valid as vertex shaders because we are just checking compile time validation but it makes sense to just fix this and change them to fragment shaders instead. I can add something like above to the commit message before committing if you like. Thanks for taking a look at the tests.
diff --git a/tests/spec/arb_arrays_of_arrays/compiler/input-array-array-var.frag b/tests/spec/arb_arrays_of_arrays/compiler/input-array-array-var.frag new file mode 100644 index 0000000..45313ee --- /dev/null +++ b/tests/spec/arb_arrays_of_arrays/compiler/input-array-array-var.frag @@ -0,0 +1,15 @@ +/* [config] + * expect_result: pass + * glsl_version: 1.50 + * require_extensions: GL_ARB_arrays_of_arrays + * [end config] + */ +#version 150 +#extension GL_ARB_arrays_of_arrays: enable + +in vec4[3][1] an_array; + +void main() +{ + gl_FragColor = an_array[0][0]; +} diff --git a/tests/spec/arb_arrays_of_arrays/compiler/input-array-array-var.vert b/tests/spec/arb_arrays_of_arrays/compiler/input-array-array-var.vert deleted file mode 100644 index cd945bf..0000000 --- a/tests/spec/arb_arrays_of_arrays/compiler/input-array-array-var.vert +++ /dev/null @@ -1,15 +0,0 @@ -/* [config] - * expect_result: pass - * glsl_version: 1.50 - * require_extensions: GL_ARB_arrays_of_arrays - * [end config] - */ -#version 150 -#extension GL_ARB_arrays_of_arrays: enable - -in vec4[3][1] an_array; - -void main() -{ - gl_Position = an_array[0][0]; -} diff --git a/tests/spec/arb_arrays_of_arrays/compiler/input-array-var-array.frag b/tests/spec/arb_arrays_of_arrays/compiler/input-array-var-array.frag new file mode 100644 index 0000000..ea0ce56 --- /dev/null +++ b/tests/spec/arb_arrays_of_arrays/compiler/input-array-var-array.frag @@ -0,0 +1,15 @@ +/* [config] + * expect_result: pass + * glsl_version: 1.50 + * require_extensions: GL_ARB_arrays_of_arrays + * [end config] + */ +#version 150 +#extension GL_ARB_arrays_of_arrays: enable + +in vec4[1] an_array[3]; + +void main() +{ + gl_FragColor = an_array[0][0]; +} diff --git a/tests/spec/arb_arrays_of_arrays/compiler/input-array-var-array.vert b/tests/spec/arb_arrays_of_arrays/compiler/input-array-var-array.vert deleted file mode 100644 index 1f234aa..0000000 --- a/tests/spec/arb_arrays_of_arrays/compiler/input-array-var-array.vert +++ /dev/null @@ -1,15 +0,0 @@ -/* [config] - * expect_result: pass - * glsl_version: 1.50 - * require_extensions: GL_ARB_arrays_of_arrays - * [end config] - */ -#version 150 -#extension GL_ARB_arrays_of_arrays: enable - -in vec4[1] an_array[3]; - -void main() -{ - gl_Position = an_array[0][0]; -} diff --git a/tests/spec/arb_arrays_of_arrays/compiler/input-var-array-array.frag b/tests/spec/arb_arrays_of_arrays/compiler/input-var-array-array.frag new file mode 100644 index 0000000..acd407a --- /dev/null +++ b/tests/spec/arb_arrays_of_arrays/compiler/input-var-array-array.frag @@ -0,0 +1,15 @@ +/* [config] + * expect_result: pass + * glsl_version: 1.50 + * require_extensions: GL_ARB_arrays_of_arrays + * [end config] + */ +#version 150 +#extension GL_ARB_arrays_of_arrays: enable + +in vec4 an_array[3][1]; + +void main() +{ + gl_FragColor = an_array[0][0]; +} diff --git a/tests/spec/arb_arrays_of_arrays/compiler/input-var-array-array.vert b/tests/spec/arb_arrays_of_arrays/compiler/input-var-array-array.vert deleted file mode 100644 index 0f1e85d..0000000 --- a/tests/spec/arb_arrays_of_arrays/compiler/input-var-array-array.vert +++ /dev/null @@ -1,15 +0,0 @@ -/* [config] - * expect_result: pass - * glsl_version: 1.50 - * require_extensions: GL_ARB_arrays_of_arrays - * [end config] - */ -#version 150 -#extension GL_ARB_arrays_of_arrays: enable - -in vec4 an_array[3][1]; - -void main() -{ - gl_Position = an_array[0][0]; -}