[Piglit] [PATCH] tbo: add buffer storage test
Ilia Mirkin
imirkin at alum.mit.edu
Wed Sep 16 18:38:55 PDT 2015
Have to use a VBO since piglit_draw_rect causes too much state to get
flushed.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
---
tests/all.py | 1 +
.../arb_texture_buffer_object/CMakeLists.gl.txt | 1 +
.../spec/arb_texture_buffer_object/bufferstorage.c | 149 +++++++++++++++++++++
3 files changed, 151 insertions(+)
create mode 100644 tests/spec/arb_texture_buffer_object/bufferstorage.c
diff --git a/tests/all.py b/tests/all.py
index 761ec5c..fc7cb13 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -2361,6 +2361,7 @@ with profile.group_manager(
with profile.group_manager(
PiglitGLTest,
grouptools.join('spec', 'ARB_texture_buffer_object')) as g:
+ g(['arb_texture_buffer_object-bufferstorage'], 'bufferstorage')
g(['arb_texture_buffer_object-data-sync'], 'data-sync')
g(['arb_texture_buffer_object-dlist'], 'dlist')
g(['arb_texture_buffer_object-formats', 'fs', 'core'],
diff --git a/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt b/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt
index 2971582..fb221fc 100644
--- a/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt
@@ -10,6 +10,7 @@ link_libraries (
${OPENGL_glu_LIBRARY}
)
+piglit_add_executable (arb_texture_buffer_object-bufferstorage bufferstorage.c)
piglit_add_executable (arb_texture_buffer_object-data-sync data-sync.c)
piglit_add_executable (arb_texture_buffer_object-dlist dlist.c)
piglit_add_executable (arb_texture_buffer_object-formats formats.c)
diff --git a/tests/spec/arb_texture_buffer_object/bufferstorage.c b/tests/spec/arb_texture_buffer_object/bufferstorage.c
new file mode 100644
index 0000000..8c526bf
--- /dev/null
+++ b/tests/spec/arb_texture_buffer_object/bufferstorage.c
@@ -0,0 +1,149 @@
+/* Copyright © 2015 Ilia Mirkin
+ *
+ * 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 bufferstorage.c
+ *
+ * Tests that we can modify texture buffers using coherently mapped buffers.
+ */
+
+#include "piglit-util-gl.h"
+
+static const float green[4] = {0, 1, 0, 0};
+static const float red[4] = {1, 0, 0, 0};
+static float *map;
+
+enum piglit_result
+piglit_display(void)
+{
+ GLsync fence;
+ bool pass = true;
+
+ glViewport(0, 0, piglit_width, piglit_height);
+ glClearColor(0.2, 0.2, 0.2, 0.2);
+ glClear(GL_COLOR_BUFFER_BIT);
+
+ /* Wait for any previous rendering to finish before updating
+ * the texture buffers
+ */
+ fence = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+ glClientWaitSync(fence, GL_SYNC_FLUSH_COMMANDS_BIT,
+ GL_TIMEOUT_IGNORED);
+
+ memcpy(map, red, sizeof(red));
+ glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+
+ fence = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+ glClientWaitSync(fence, GL_SYNC_FLUSH_COMMANDS_BIT,
+ GL_TIMEOUT_IGNORED);
+
+ memcpy(map, green, sizeof(green));
+ glDrawArrays(GL_TRIANGLE_FAN, 4, 4);
+
+ pass = piglit_probe_rect_rgba(
+ 0, 0, piglit_width / 2, piglit_height, red) && pass;
+ pass = piglit_probe_rect_rgba(piglit_width / 2, 0,
+ piglit_width / 2, piglit_height,
+ green) && pass;
+
+ piglit_present_results();
+
+ return pass ? PIGLIT_PASS : PIGLIT_FAIL;
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+ static const char *vs_source =
+ "#version 140\n"
+ "in vec4 piglit_vertex;\n"
+ "void main()\n"
+ "{\n"
+ " gl_Position = piglit_vertex;\n"
+ "}\n";
+
+ static const char *fs_source =
+ "#version 140\n"
+ "uniform samplerBuffer s;\n"
+ "uniform int offset;\n"
+ "void main()\n"
+ "{\n"
+ " gl_FragColor = texelFetch(s, 0);\n"
+ "}\n";
+
+ static const GLfloat verts[16] = {
+ -1, -1,
+ 0, -1,
+ 0, 1,
+ -1, 1,
+
+ 0, -1,
+ 1, -1,
+ 1, 1,
+ 0, 1
+ };
+
+ GLuint tex, tbo;
+ GLuint prog;
+
+ int vertex_location;
+ GLuint vao, vbo;
+
+ piglit_require_extension("GL_ARB_buffer_storage");
+
+ prog = piglit_build_simple_program(vs_source, fs_source);
+ glUseProgram(prog);
+ vertex_location = glGetAttribLocation(prog, "piglit_vertex");
+
+ glGenBuffers(1, &tbo);
+ glBindBuffer(GL_TEXTURE_BUFFER, tbo);
+ glBufferStorage(GL_TEXTURE_BUFFER, sizeof(red), NULL,
+ GL_MAP_WRITE_BIT |
+ GL_MAP_PERSISTENT_BIT |
+ GL_MAP_COHERENT_BIT |
+ GL_DYNAMIC_STORAGE_BIT);
+ piglit_check_gl_error(GL_NO_ERROR);
+
+ map = glMapBufferRange(GL_TEXTURE_BUFFER, 0, sizeof(red),
+ GL_MAP_WRITE_BIT |
+ GL_MAP_PERSISTENT_BIT |
+ GL_MAP_COHERENT_BIT);
+
+ glGenTextures(1, &tex);
+ glBindTexture(GL_TEXTURE_BUFFER, tex);
+
+ glTexBuffer(GL_TEXTURE_BUFFER, GL_RGBA32F, tbo);
+
+ glGenVertexArrays(1, &vao);
+ glBindVertexArray(vao);
+
+ glGenBuffers(1, &vbo);
+ glBindBuffer(GL_ARRAY_BUFFER, vbo);
+ glBufferData(GL_ARRAY_BUFFER, sizeof(verts), verts, GL_STATIC_READ);
+ glVertexAttribPointer(vertex_location, 2, GL_FLOAT,
+ GL_FALSE, 0, NULL);
+ glEnableVertexAttribArray(vertex_location);
+}
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+ config.supports_gl_core_version = 31;
+ config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
+PIGLIT_GL_TEST_CONFIG_END
--
2.4.6
More information about the Piglit
mailing list