diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2014-04-27 16:15:09 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2014-04-28 09:22:16 -0700 |
| commit | 0d375d95e44fdaaf0ce847cc9b722df3568ce700 (patch) | |
| tree | b936a9311c05ffeacefd56e62ccff64b45b482a8 | |
| parent | 2d09849ba43a2b7d870b1b64e195ce6723cd4df8 (diff) | |
sso: Use "-" as a separator instead of "/"sso
"/" in a (sub)test name is how the framework partitions subtests. We
were getting "GS splitting a VS" with a subtest of "FS pipeline" instead
of "GS splitting a VS/FS pipeline". Now we'll get "GS splitting a VS-FS
pipeline".
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
| -rw-r--r-- | tests/spec/arb_separate_shader_objects/ValidateProgramPipeline.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/tests/spec/arb_separate_shader_objects/ValidateProgramPipeline.c b/tests/spec/arb_separate_shader_objects/ValidateProgramPipeline.c index 2f698f381..2bca3023c 100644 --- a/tests/spec/arb_separate_shader_objects/ValidateProgramPipeline.c +++ b/tests/spec/arb_separate_shader_objects/ValidateProgramPipeline.c @@ -328,7 +328,7 @@ piglit_init(int argc, char **argv) glGenProgramPipelines(1, &pipe); build_and_validate_pipe(pipe, true, - "VS/FS program, single glUseProgramStages " + "VS-FS program, single glUseProgramStages " "call", GL_ALL_SHADER_BITS, prog_vs_fs, 0, 0, @@ -337,7 +337,7 @@ piglit_init(int argc, char **argv) 0, 0); build_and_validate_pipe(pipe, true, - "VS/FS program, multiple glUseProgramStages " + "VS-FS program, multiple glUseProgramStages " "calls", GL_FRAGMENT_SHADER_BIT, prog_vs_fs, GL_VERTEX_SHADER_BIT, prog_vs_fs, @@ -372,7 +372,7 @@ piglit_init(int argc, char **argv) */ if (has_geo) build_and_validate_pipe(pipe, false, - "GS splitting a VS/FS pipeline", + "GS splitting a VS-FS pipeline", GL_ALL_SHADER_BITS, prog_vs_fs, GL_GEOMETRY_SHADER_BIT, prog_gs, 0, 0, @@ -380,11 +380,11 @@ piglit_init(int argc, char **argv) 0, 0); else piglit_report_subtest_result(PIGLIT_SKIP, - "GS splitting a VS/FS pipeline"); + "GS splitting a VS-FS pipeline"); if (has_tess) build_and_validate_pipe(pipe, false, - "TCS splitting a VS/GS pipeline", + "TCS splitting a VS-GS pipeline", GL_ALL_SHADER_BITS, prog_vs_gs, GL_TESS_CONTROL_SHADER_BIT, prog_tcs, 0, 0, @@ -392,11 +392,11 @@ piglit_init(int argc, char **argv) 0, 0); else piglit_report_subtest_result(PIGLIT_SKIP, - "TCS splitting a VS/GS pipeline"); + "TCS splitting a VS-GS pipeline"); if (has_tess) build_and_validate_pipe(pipe, false, - "TES splitting a VS/GS program", + "TES splitting a VS-GS program", GL_ALL_SHADER_BITS, prog_vs_gs, GL_FRAGMENT_SHADER_BIT, prog_fs, GL_TESS_EVALUATION_SHADER_BIT, prog_tes, @@ -404,7 +404,7 @@ piglit_init(int argc, char **argv) 0, 0); else piglit_report_subtest_result(PIGLIT_SKIP, - "TES splitting a VS/GS program"); + "TES splitting a VS-GS program"); /* Section 2.11.11 (Shader Execution), subpart "Validation" of the * OpenGL 4.1 spec says: @@ -434,14 +434,14 @@ piglit_init(int argc, char **argv) if (has_tess) build_and_validate_pipe(pipe, false, - "TES/TCS without VS", + "TES-TCS without VS", GL_ALL_SHADER_BITS, prog_tess, GL_FRAGMENT_SHADER_BIT, prog_fs, 0, 0, 0, 0, 0, 0); else - piglit_report_subtest_result(PIGLIT_SKIP, "TES/TCS without VS"); + piglit_report_subtest_result(PIGLIT_SKIP, "TES-TCS without VS"); /* Section 2.11.11 (Shader Execution), subpart "Validation" of the * OpenGL 4.1 spec says: @@ -456,7 +456,7 @@ piglit_init(int argc, char **argv) * linked." */ build_and_validate_pipe(pipe, false, - "Only VS from a VS/FS program", + "Only VS from a VS-FS program", GL_FRAGMENT_SHADER_BIT, prog_fs, GL_VERTEX_SHADER_BIT, prog_vs_fs, 0, 0, @@ -465,7 +465,7 @@ piglit_init(int argc, char **argv) if (has_geo) build_and_validate_pipe(pipe, false, - "Only GS from a VS/GS program", + "Only GS from a VS-GS program", GL_FRAGMENT_SHADER_BIT, prog_fs, GL_GEOMETRY_SHADER_BIT, prog_vs_gs, GL_VERTEX_SHADER_BIT, prog_vs, @@ -473,11 +473,11 @@ piglit_init(int argc, char **argv) 0, 0); else piglit_report_subtest_result(PIGLIT_SKIP, - "Only GS from a VS/GS program"); + "Only GS from a VS-GS program"); if (has_tess) build_and_validate_pipe(pipe, false, - "Only TES from TES/TCS program", + "Only TES from TES-TCS program", GL_FRAGMENT_SHADER_BIT, prog_fs, GL_TESS_EVALUATION_SHADER_BIT, prog_tess, GL_VERTEX_SHADER_BIT, prog_vs, @@ -485,7 +485,7 @@ piglit_init(int argc, char **argv) 0, 0); else piglit_report_subtest_result(PIGLIT_SKIP, - "Only TES from TES/TCS program"); + "Only TES from TES-TCS program"); /* Section 2.11.11 (Shader Execution), subpart "Validation" of the * OpenGL 4.1 spec says: |