Signed-off-by: Samuel Iglesias Gonsalvez <sigles...@igalia.com> --- tests/all.py | 1 + .../CMakeLists.gl.txt | 1 + .../layout-std140-write-shader.c | 161 +++++++++++++++++++++ 3 files changed, 163 insertions(+) create mode 100644 tests/spec/arb_shader_storage_buffer_object/layout-std140-write-shader.c
diff --git a/tests/all.py b/tests/all.py index 4d3d29e..d718030 100755 --- a/tests/all.py +++ b/tests/all.py @@ -4042,6 +4042,7 @@ with profile.group_manager( g(['arb_shader_storage_buffer_object-shaderstorageblockbinding'], 'shaderstorageblockbinding') g(['arb_shader_storage_buffer_object-array-ssbo-binding'], 'array-ssbo-binding') g(['arb_shader_storage_buffer_object-layout-std430-write-shader'], 'layout-std430-write-shader') + g(['arb_shader_storage_buffer_object-layout-std140-write-shader'], 'layout-std140-write-shader') with profile.group_manager( PiglitGLTest, diff --git a/tests/spec/arb_shader_storage_buffer_object/CMakeLists.gl.txt b/tests/spec/arb_shader_storage_buffer_object/CMakeLists.gl.txt index 100fbcd..43fa604 100644 --- a/tests/spec/arb_shader_storage_buffer_object/CMakeLists.gl.txt +++ b/tests/spec/arb_shader_storage_buffer_object/CMakeLists.gl.txt @@ -17,5 +17,6 @@ piglit_add_executable (arb_shader_storage_buffer_object-maxblocks maxblocks.c) piglit_add_executable (arb_shader_storage_buffer_object-shaderstorageblockbinding shaderstorageblockbinding.c) piglit_add_executable (arb_shader_storage_buffer_object-array-ssbo-binding array-ssbo-binding.c) piglit_add_executable (arb_shader_storage_buffer_object-layout-std430-write-shader layout-std430-write-shader.c) +piglit_add_executable (arb_shader_storage_buffer_object-layout-std140-write-shader layout-std140-write-shader.c) # vim: ft=cmake: diff --git a/tests/spec/arb_shader_storage_buffer_object/layout-std140-write-shader.c b/tests/spec/arb_shader_storage_buffer_object/layout-std140-write-shader.c new file mode 100644 index 0000000..bcddce5 --- /dev/null +++ b/tests/spec/arb_shader_storage_buffer_object/layout-std140-write-shader.c @@ -0,0 +1,161 @@ +/* + * Copyright © 2015 Intel Corporation + * + * 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. + */ + +/** @file layout-std140-write-shader.c + * + * Tests that shader storage block writes in GLSL works correctly (offsets and + * values) when interface packing qualifier is std140 and row_major. + */ + +#include "piglit-util-gl.h" + +PIGLIT_GL_TEST_CONFIG_BEGIN + config.window_width = 100; + config.window_height = 100; + config.supports_gl_compat_version = 10; + config.supports_gl_core_version = 31; + config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + +PIGLIT_GL_TEST_CONFIG_END + +#define SSBO_SIZE 44 + +static const char vs_pass_thru_text[] = + "#version 130\n" + "#extension GL_ARB_shader_storage_buffer_object : require\n" + "#extension GL_ARB_uniform_buffer_object : require\n" + "\n" + "struct A {\n" + " float a1;\n" + " vec2 a2[2];\n" + " mat2 a4;\n" + "};\n" + "layout(std140, row_major, binding=2) buffer ssbo {\n" + " vec4 v;\n" + " float f;\n" + " A s;\n" + " float unsized_array[];\n" + "};\n" + "in vec4 piglit_vertex;\n" + "void main() {\n" + " gl_Position = piglit_vertex;\n" + " f = 4.0;\n" + " s.a2[0] = vec2(6.0, 7.0); \n" + " int index = int(v.x); // index should be zero\n" + " unsized_array[index + gl_VertexID] = unsized_array.length();\n" + "}\n"; + +static const char fs_source[] = + "#version 130\n" + "#extension GL_ARB_shader_storage_buffer_object : require\n" + "#extension GL_ARB_uniform_buffer_object : require\n" + "\n" + "struct A {\n" + " float a1;\n" + " vec2 a2[2];\n" + " mat2 a4;\n" + "};\n" + "layout(std140, row_major, binding=2) buffer ssbo {\n" + " vec4 v;\n" + " float f;\n" + " A s;\n" + " float unsized_array[];\n" + "};\n" + "out vec4 color;\n" + "\n" + "void main() {\n" + " color = vec4(0,1,0,1);\n" + " v = vec4(0.0, 1.0, 2.0, 3.0);\n" + " s.a1 = 5.0;\n" + " s.a2[1] = vec2(8.0, 9.0);\n" + " s.a4 = mat2(10.0, 11.0, 12.0, 13.0);\n" + " int index = int(v.z + gl_FragCoord.x);\n" + " unsized_array[index] = unsized_array.length() * 2.0;\n" + "}\n"; + +GLuint prog; + +float expected[SSBO_SIZE] = { 0.0, 1.0, 2.0, 3.0, // vec4 v + 4.0, 0.0, 0.0, 0.0, // float f + 5.0, 0.0, 0.0, 0.0, // float s.a1 + 6.0, 7.0, 0.0, 0.0, // vec2 s.a2[0] + 8.0, 9.0, 0.0, 0.0, // vec2 s.a2[1] + 10.0, 12.0, 0.0, 0.0, // mat2 a4 + 11.0, 13.0, 0.0, 0.0, // mat2 a4 + 4.0, 0.0, 0.0, 0.0, // float unsized_array[0] + 4.0, 0.0, 0.0, 0.0, // float unsized_array[1] + 8.0, 0.0, 0.0, 0.0, // float unsized_array[2] + 8.0, 0.0, 0.0, 0.0, // float unsized_array[3] +}; + +void +piglit_init(int argc, char **argv) +{ + bool pass = true; + GLuint buffer; + unsigned int i; + float ssbo_values[SSBO_SIZE] = {0}; + float *map; + + piglit_require_extension("GL_ARB_shader_storage_buffer_object"); + piglit_require_GLSL_version(130); + + prog = piglit_build_simple_program(vs_pass_thru_text, fs_source); + + glUseProgram(prog); + + glClearColor(0, 0, 0, 0); + + glGenBuffers(1, &buffer); + glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, buffer); + glBufferData(GL_SHADER_STORAGE_BUFFER, SSBO_SIZE*sizeof(GLfloat), + &ssbo_values[0], GL_DYNAMIC_DRAW); + + glViewport(0, 0, piglit_width, piglit_height); + + piglit_draw_rect(-1, -1, 2, 2); + + glBindBuffer(GL_SHADER_STORAGE_BUFFER, buffer); + map = (float *) glMapBuffer(GL_SHADER_STORAGE_BUFFER, GL_READ_ONLY); + + for (i = 0; i < SSBO_SIZE; i++) { + if (map[i] != expected[i]) { + printf("expected[%d] = %.2f. Read value: %.2f\n", + i, expected[i], map[i]); + pass = false; + } + } + + glUnmapBuffer(GL_SHADER_STORAGE_BUFFER); + + if (!piglit_check_gl_error(GL_NO_ERROR)) + pass = false; + + piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL); +} + +enum piglit_result piglit_display(void) +{ + /* UNREACHED */ + return PIGLIT_FAIL; +} -- 2.1.0 _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit