The texture target argument of the 'fb tex layered' command is somewhat redundant because the glFramebufferTexture() GL API it's implemented in terms of doesn't care what the target is. Right now the implementation of 'fb tex layered' requires the texture to be a 2D array due to the way it uses the GL API to query the bound texture object and dimensions, but that limitation will be removed shortly. --- tests/shaders/shader_runner.c | 2 +- .../arb_fragment_layer_viewport/layer-gs-writes-in-range.shader_test | 2 +- .../layer-gs-writes-out-of-range.shader_test | 2 +- .../arb_fragment_layer_viewport/viewport-gs-writes-in-range.shader_test | 2 +- .../viewport-gs-writes-out-of-range.shader_test | 2 +- tests/spec/oes_viewport_array/viewport-gs-writes-in-range.shader_test | 2 +- .../spec/oes_viewport_array/viewport-gs-writes-out-of-range.shader_test | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c index 2a37b56..91bc793 100644 --- a/tests/shaders/shader_runner.c +++ b/tests/shaders/shader_runner.c @@ -2987,7 +2987,7 @@ piglit_display(void) glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &render_width); glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &render_height); - } else if (sscanf(line, "fb tex layered 2DArray %d", &tex) == 1) { + } else if (sscanf(line, "fb tex layered %d", &tex) == 1) { GLenum status; GLint tex_num; diff --git a/tests/spec/arb_fragment_layer_viewport/layer-gs-writes-in-range.shader_test b/tests/spec/arb_fragment_layer_viewport/layer-gs-writes-in-range.shader_test index 0e899bb..1c20f76 100644 --- a/tests/spec/arb_fragment_layer_viewport/layer-gs-writes-in-range.shader_test +++ b/tests/spec/arb_fragment_layer_viewport/layer-gs-writes-in-range.shader_test @@ -64,7 +64,7 @@ void main() [test] texture junk 2DArray 0 ( 64 , 64 , 4 ) -fb tex layered 2DArray 0 +fb tex layered 0 atomic counters 2 diff --git a/tests/spec/arb_fragment_layer_viewport/layer-gs-writes-out-of-range.shader_test b/tests/spec/arb_fragment_layer_viewport/layer-gs-writes-out-of-range.shader_test index ad1bfa8..06a859b 100644 --- a/tests/spec/arb_fragment_layer_viewport/layer-gs-writes-out-of-range.shader_test +++ b/tests/spec/arb_fragment_layer_viewport/layer-gs-writes-out-of-range.shader_test @@ -62,7 +62,7 @@ void main() [test] texture junk 2DArray 0 ( 64 , 64 , 4 ) -fb tex layered 2DArray 0 +fb tex layered 0 atomic counters 1 diff --git a/tests/spec/arb_fragment_layer_viewport/viewport-gs-writes-in-range.shader_test b/tests/spec/arb_fragment_layer_viewport/viewport-gs-writes-in-range.shader_test index fdac3e3..3d3c7df 100644 --- a/tests/spec/arb_fragment_layer_viewport/viewport-gs-writes-in-range.shader_test +++ b/tests/spec/arb_fragment_layer_viewport/viewport-gs-writes-in-range.shader_test @@ -65,7 +65,7 @@ void main() [test] texture junk 2DArray 0 ( 64 , 64 , 1 ) -fb tex layered 2DArray 0 +fb tex layered 0 atomic counters 2 diff --git a/tests/spec/arb_fragment_layer_viewport/viewport-gs-writes-out-of-range.shader_test b/tests/spec/arb_fragment_layer_viewport/viewport-gs-writes-out-of-range.shader_test index ca852f6..9418e16 100644 --- a/tests/spec/arb_fragment_layer_viewport/viewport-gs-writes-out-of-range.shader_test +++ b/tests/spec/arb_fragment_layer_viewport/viewport-gs-writes-out-of-range.shader_test @@ -63,7 +63,7 @@ void main() [test] texture junk 2DArray 0 ( 64 , 64 , 1 ) -fb tex layered 2DArray 0 +fb tex layered 0 atomic counters 1 diff --git a/tests/spec/oes_viewport_array/viewport-gs-writes-in-range.shader_test b/tests/spec/oes_viewport_array/viewport-gs-writes-in-range.shader_test index 8a942c2..98508b8 100644 --- a/tests/spec/oes_viewport_array/viewport-gs-writes-in-range.shader_test +++ b/tests/spec/oes_viewport_array/viewport-gs-writes-in-range.shader_test @@ -63,7 +63,7 @@ void main() [test] texture junk 2DArray 0 ( 64 , 64 , 1 ) -fb tex layered 2DArray 0 +fb tex layered 0 atomic counters 2 diff --git a/tests/spec/oes_viewport_array/viewport-gs-writes-out-of-range.shader_test b/tests/spec/oes_viewport_array/viewport-gs-writes-out-of-range.shader_test index f6a6163..ea00b3f 100644 --- a/tests/spec/oes_viewport_array/viewport-gs-writes-out-of-range.shader_test +++ b/tests/spec/oes_viewport_array/viewport-gs-writes-out-of-range.shader_test @@ -61,7 +61,7 @@ void main() [test] texture junk 2DArray 0 ( 64 , 64 , 1 ) -fb tex layered 2DArray 0 +fb tex layered 0 atomic counters 1 -- 2.9.0 _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit