On 09/11/2015 11:52 PM, Kenneth Graunke wrote: > Having more than two stages makes SSO interface matching a lot more > interesting. However, the five-stage variant won't run on i965 for > a while. So, this patch adds a three-stage variant (VS/GS/FS, but > no tessellation). > > Beyond that, this test is a little meaner: I made the VS have more > outputs than the GS has inputs, with the locations specified to have a > gap. An implementation that lays out VS outputs and GS inputs > contiguously would fail; they have to match up properly. > > Signed-off-by: Kenneth Graunke <[email protected]> > --- > .../arb_separate_shader_objects/CMakeLists.gl.txt | 1 + > .../rendezvous_by_location-3-stages.c | 152 > +++++++++++++++++++++ > 2 files changed, 153 insertions(+) > create mode 100644 > tests/spec/arb_separate_shader_objects/rendezvous_by_location-3-stages.c > > diff --git a/tests/spec/arb_separate_shader_objects/CMakeLists.gl.txt > b/tests/spec/arb_separate_shader_objects/CMakeLists.gl.txt > index abd6b37..f7feb27 100644 > --- a/tests/spec/arb_separate_shader_objects/CMakeLists.gl.txt > +++ b/tests/spec/arb_separate_shader_objects/CMakeLists.gl.txt > @@ -16,6 +16,7 @@ piglit_add_executable > (arb_separate_shader_object-GetProgramPipelineiv GetProgra > piglit_add_executable (arb_separate_shader_object-IsProgramPipeline > IsProgramPipeline.c) > piglit_add_executable (arb_separate_shader_object-ProgramUniform-coverage > ProgramUniform-coverage.c) > piglit_add_executable (arb_separate_shader_object-rendezvous_by_location > rendezvous_by_location.c) > +piglit_add_executable > (arb_separate_shader_object-rendezvous_by_location-3-stages > rendezvous_by_location-3-stages.c) > piglit_add_executable > (arb_separate_shader_object-rendezvous_by_location-5-stages > rendezvous_by_location-5-stages.c) > piglit_add_executable > (arb_separate_shader_object-UseProgramStages-non-separable > UseProgramStages-non-separable.c) > piglit_add_executable (arb_separate_shader_object-ValidateProgramPipeline > ValidateProgramPipeline.c) > diff --git > a/tests/spec/arb_separate_shader_objects/rendezvous_by_location-3-stages.c > b/tests/spec/arb_separate_shader_objects/rendezvous_by_location-3-stages.c > new file mode 100644 > index 0000000..b8192a6 > --- /dev/null > +++ b/tests/spec/arb_separate_shader_objects/rendezvous_by_location-3-stages.c > @@ -0,0 +1,152 @@ > +/* > + * Copyright © 2013 Intel Corporation > + * Copyright © 2015 Advanced Micro Devices, Inc. > + * > + * 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 (including the next > + * paragraph) 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. > + */ > + > +/** > + * This test uses 3 separate shaders (VS, GS, FS) and tests whether > + * separate shader objects combined with tessellation and geometry shaders > + * all work together. > + */ > + > +#include "piglit-util-gl.h" > + > +PIGLIT_GL_TEST_CONFIG_BEGIN > + > + config.supports_gl_compat_version = 0; > + config.supports_gl_core_version = 32; > + config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; > + > +PIGLIT_GL_TEST_CONFIG_END > + > +static GLuint pipeline; > + > +static const char *vs_code = > + "#version 150\n" > + "#extension GL_ARB_separate_shader_objects: require\n" > + "#extension GL_ARB_explicit_attrib_location: require\n" > + "\n" > + "layout(location = 0) in vec4 piglit_vertex;\n" > + "\n" > + "layout(location = 2) out vec3 a;\n" > + "layout(location = 4) out vec3 b;\n" > + "layout(location = 3) out vec3 c;\n" > + "\n" > + "void main()\n" > + "{\n" > + " gl_Position = piglit_vertex;\n" > + " a = vec3(0.5, 0, 0.3);\n" > + " b = vec3(0.4, 0, 0.2);\n" > + " c = vec3(0.3, 0, 0.1);\n" > + "}\n" > + ; > + > +static const char *gs_code = > + "#version 150\n" > + "#extension GL_ARB_separate_shader_objects: require\n" > + "#extension GL_ARB_explicit_attrib_location: require\n" > + "layout(triangles) in;\n" > + "layout(triangle_strip, max_vertices = 3) out;\n" > + "\n" > + "layout(location = 2) in vec3 a[]; /* should get vec3(0.5, 0, 0.3) */\n" > + "layout(location = 4) in vec3 b[]; /* should get vec3(0.4, 0, 0.2) */\n"
I would change the name of this variable to c. Both the location and the name match. There are classes of driver bugs that this could miss. The other rendezvous_by_location tests do this. With that and the two minor nits below fixed, this patch is Reviewed-by: Ian Romanick <[email protected]> > + "\n" > + "layout(location = 2) out vec3 ga; /* should get vec3(0.675, 0, 0.405) > */\n" > + "layout(location = 3) out vec3 gb; /* should get vec3(0.28, 0, 0.14) > */\n" > + "\n" > + "void main()\n" > + "{\n" > + " for (int i = 0; i < 3; i++) {" > + " gl_Position = gl_in[i].gl_Position;\n" > + " ga = a[i] * 1.35;\n" > + " gb = b[i] * 0.7;\n" > + " EmitVertex();\n" > + " }\n" > + "}\n" > + ; > + > +static const char *fs_code = > + "#version 150\n" > + "#extension GL_ARB_separate_shader_objects: require\n" > + "#extension GL_ARB_explicit_attrib_location: require\n" > + "\n" > + "layout(location = 3) in vec3 ga; /* should get vec3(0.28, 0, 0.14) > */\n" > + "layout(location = 2) in vec3 gb; /* should get vec3(0.675, 0, 0.405) > */\n" > + "\n" > + "layout(location = 0) out vec4 out_color;\n" > + "\n" > + "void main()\n" > + "{\n" > + " out_color = vec4(ga.x, gb.x, ga.z, gb.z);\n" > + "}\n" > + ; > + > +enum piglit_result > +piglit_display(void) > +{ > + static const float expected[] = { > + 0.28, 0.675, 0.14, 0.405 > + }; > + bool pass; > + > + glClearColor(0.1f, 0.1f, 0.1f, 0.1f); > + glClear(GL_COLOR_BUFFER_BIT); > + > + glBindProgramPipeline(pipeline); > + piglit_draw_rect(-1, -1, 2, 2); > + > + pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height, > + expected); > + > + piglit_present_results(); > + return pass ? PIGLIT_PASS : PIGLIT_FAIL; > +} > + > +void piglit_init(int argc, char **argv) > +{ > + GLuint vs_prog, gs_prog, fs_prog; > + > + piglit_require_gl_version(32); You don't need this check. > + piglit_require_extension("GL_ARB_separate_shader_objects"); > + piglit_require_extension("GL_ARB_explicit_attrib_location"); > + > + vs_prog = glCreateShaderProgramv(GL_VERTEX_SHADER, 1, > + (const GLchar *const*)&vs_code); ^ Missing space. > + piglit_link_check_status(vs_prog); > + > + gs_prog = glCreateShaderProgramv(GL_GEOMETRY_SHADER, 1, > + (const GLchar *const *)&gs_code); > + piglit_link_check_status(gs_prog); > + > + fs_prog = glCreateShaderProgramv(GL_FRAGMENT_SHADER, 1, > + (const GLchar *const *)&fs_code); > + piglit_link_check_status(fs_prog); > + > + glGenProgramPipelines(1, &pipeline); > + glUseProgramStages(pipeline, GL_VERTEX_SHADER_BIT, vs_prog); > + glUseProgramStages(pipeline, GL_GEOMETRY_SHADER_BIT, gs_prog); > + glUseProgramStages(pipeline, GL_FRAGMENT_SHADER_BIT, fs_prog); > + piglit_program_pipeline_check_status(pipeline); > + > + if (!piglit_check_gl_error(0)) > + piglit_report_result(PIGLIT_FAIL); > +} > _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
