[Piglit] [PATCH 00/11] Port glsl-link-test to shader_runner

Dylan Baker dylan at pnwbakers.com
Fri May 6 00:48:35 UTC 2016


Some will notice the existence of 718a888ed9a5. This patch *should* have
fixed installing and running piglit out of tree, but instead it breaks
piglit. The reason is that glsl-link-test assumes that it knows where
shaders need to go, and it doesn't running out of tree.

While I could of fixed glsl-link-test, shader_runner can do what this
binary did, and this gets rid of an extra binary, and a bunch of lose
shaders as files.

Tested on the intel CI system with no regressions on 965-skylake

Dylan Baker (11):
  shaders: port "GLSL link single global intiailzier, 2 shaders" to
    shader_runner
  shaders: port "GLSL link match global initializer, 2 shaders" to
    shader_runner
  shaders: port "GLSL link mismatched global initailizer, 2 shaders" to
    shader_runner
  shaders: port "GLSL link mismatched global-initalizer, 3 shaders" to
    shader_runner
  shaders: port "GLSL link mismatched global const initializer" to
    shader_runner
  shaders: port "GLSL link matched global initializer expression" to
    shader_runner
  shaders: port "GLSL link mismatched global initializer expression" to
    shader_test
  shaders: port "GLSL link array-of-struct-of-array" to shader_runner
  shaders: port "GLSL link mismatched centroid" to shader_test
  shaders: port "GLSL link mismatched invariant" to shader_runner
  shaders: delte glsl-link-test.c

 tests/all.py                                       |  49 --------
 tests/shaders/CMakeLists.gl.txt                    |   1 -
 tests/shaders/glsl-link-centroid-01a.vert          |   7 --
 tests/shaders/glsl-link-centroid-01b.vert          |   6 -
 tests/shaders/glsl-link-initializer-01a.vert       |   6 -
 tests/shaders/glsl-link-initializer-01d.vert       |   6 -
 tests/shaders/glsl-link-initializer-02a.vert       |   6 -
 tests/shaders/glsl-link-initializer-05b.vert       |   8 --
 tests/shaders/glsl-link-initializer-06a.vert       |   8 --
 tests/shaders/glsl-link-initializer-06b.vert       |  10 --
 tests/shaders/glsl-link-invariant-01a.vert         |   7 --
 tests/shaders/glsl-link-invariant-01b.vert         |   6 -
 tests/shaders/glsl-link-test.c                     | 132 ---------------------
 .../global-const-intializer-mismatch.shader_test}  |  12 ++
 ...obal-initializer-matched-2-shaders.shader_test} |  15 +++
 ...bal-initializer-matched-expression.shader_test} |  17 +++
 ...bal-initializer-mismatch-2-shaders.shader_test} |  15 +++
 ...obal-initializer-mismatch-3-shaders.shader_test |  29 +++++
 ...al-initializer-unmatched-expression.shader_test |  27 +++++
 ...lobal-single-initializer-2-shaders.shader_test} |  15 +++
 .../link-array-of-struct-of-array.shader_test}     |   7 ++
 .../linker/centroid-mismatched.shader_test         |  22 ++++
 .../linker/invariant-mismatched.shader_test        |  22 ++++
 23 files changed, 181 insertions(+), 252 deletions(-)
 delete mode 100644 tests/shaders/glsl-link-centroid-01a.vert
 delete mode 100644 tests/shaders/glsl-link-centroid-01b.vert
 delete mode 100644 tests/shaders/glsl-link-initializer-01a.vert
 delete mode 100644 tests/shaders/glsl-link-initializer-01d.vert
 delete mode 100644 tests/shaders/glsl-link-initializer-02a.vert
 delete mode 100644 tests/shaders/glsl-link-initializer-05b.vert
 delete mode 100644 tests/shaders/glsl-link-initializer-06a.vert
 delete mode 100644 tests/shaders/glsl-link-initializer-06b.vert
 delete mode 100644 tests/shaders/glsl-link-invariant-01a.vert
 delete mode 100644 tests/shaders/glsl-link-invariant-01b.vert
 delete mode 100644 tests/shaders/glsl-link-test.c
 rename tests/{shaders/glsl-link-initializer-02b.vert => spec/glsl-1.10/linker/global-const-intializer-mismatch.shader_test} (59%)
 rename tests/{shaders/glsl-link-initializer-01c.vert => spec/glsl-1.10/linker/global-initializer-matched-2-shaders.shader_test} (55%)
 rename tests/{shaders/glsl-link-initializer-05a.vert => spec/glsl-1.10/linker/global-initializer-matched-expression.shader_test} (54%)
 copy tests/{shaders/glsl-link-initializer-01b.vert => spec/glsl-1.10/linker/global-initializer-mismatch-2-shaders.shader_test} (56%)
 create mode 100644 tests/spec/glsl-1.10/linker/global-initializer-mismatch-3-shaders.shader_test
 create mode 100644 tests/spec/glsl-1.10/linker/global-initializer-unmatched-expression.shader_test
 rename tests/{shaders/glsl-link-initializer-01b.vert => spec/glsl-1.10/linker/global-single-initializer-2-shaders.shader_test} (56%)
 rename tests/{shaders/glsl-link-struct-array.frag => spec/glsl-1.10/linker/link-array-of-struct-of-array.shader_test} (71%)
 create mode 100644 tests/spec/glsl-1.20/linker/centroid-mismatched.shader_test
 create mode 100644 tests/spec/glsl-1.20/linker/invariant-mismatched.shader_test

-- 
2.8.2



More information about the Piglit mailing list