diff options
author | Ben Widawsky <ben@bwidawsk.net> | 2011-08-07 17:01:12 -0700 |
---|---|---|
committer | Ben Widawsky <ben@bwidawsk.net> | 2011-08-10 10:02:43 -0700 |
commit | c8bb64613c8112cc2ac89e5984da6c1f204c3b36 (patch) | |
tree | 4265e3526ccbc27729a1ec01246a2600569f6428 /tests | |
parent | f861777b6acaf460859d4ae1c983a450ece61cb8 (diff) |
spec/arb_copy_buffer: Add a new test for copy_buffer.
This is failing on Intel pre-GEN6, but will be fixed shortly.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/all.tests | 4 | ||||
-rw-r--r-- | tests/spec/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/spec/arb_copy_buffer/CMakeLists.gl.txt | 16 | ||||
-rw-r--r-- | tests/spec/arb_copy_buffer/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/spec/arb_copy_buffer/copy_buffer_coherency.c | 79 |
5 files changed, 101 insertions, 0 deletions
diff --git a/tests/all.tests b/tests/all.tests index 62deb873..461d20fb 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -1161,6 +1161,10 @@ spec['OES_compressed_paletted_texture'] = oes_compressed_paletted_texture oes_compressed_paletted_texture['invalid formats'] = PlainExecTest(['arb_texture_compression-invalid-formats', 'paletted']) oes_compressed_paletted_texture['invalid formats'].runConcurrent = True +arb_copy_buffer = Group() +spec['ARB_copy_buffer'] = arb_copy_buffer +add_plain_test(arb_copy_buffer, 'copy_buffer_coherency') + # group glslparsertest ------------------------------------------------------ glslparsertest = Group() # Add all shader source files in the directories below. diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt index 9ce6b986..d5a969c8 100644 --- a/tests/spec/CMakeLists.txt +++ b/tests/spec/CMakeLists.txt @@ -17,3 +17,4 @@ add_subdirectory (nv_texture_barrier) add_subdirectory (arb_draw_elements_base_vertex) add_subdirectory (arb_vertex_buffer_object) add_subdirectory (arb_vertex_program) +add_subdirectory (arb_copy_buffer) diff --git a/tests/spec/arb_copy_buffer/CMakeLists.gl.txt b/tests/spec/arb_copy_buffer/CMakeLists.gl.txt new file mode 100644 index 00000000..190a1310 --- /dev/null +++ b/tests/spec/arb_copy_buffer/CMakeLists.gl.txt @@ -0,0 +1,16 @@ +include_directories( + ${OPENGL_INCLUDE_PATH} + ${GLUT_INCLUDE_DIR} + ${piglit_SOURCE_DIR}/tests/util +) + +link_libraries ( + piglitutil + ${OPENGL_gl_LIBRARY} + ${OPENGL_glu_LIBRARY} + ${GLUT_glut_LIBRARY} +) + +add_executable (copy_buffer_coherency copy_buffer_coherency.c) + +# vim: ft=cmake: diff --git a/tests/spec/arb_copy_buffer/CMakeLists.txt b/tests/spec/arb_copy_buffer/CMakeLists.txt new file mode 100644 index 00000000..144a306f --- /dev/null +++ b/tests/spec/arb_copy_buffer/CMakeLists.txt @@ -0,0 +1 @@ +piglit_include_target_api() diff --git a/tests/spec/arb_copy_buffer/copy_buffer_coherency.c b/tests/spec/arb_copy_buffer/copy_buffer_coherency.c new file mode 100644 index 00000000..cba3f2f3 --- /dev/null +++ b/tests/spec/arb_copy_buffer/copy_buffer_coherency.c @@ -0,0 +1,79 @@ +/* + * Copyright © 2011 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. + * + * Authors: + * Ben Widawsky <ben@bwidawsk.net> + * + */ + +#include "piglit-util.h" + +#define COPY_BUFFER_SIZE (4<<20) +uint8_t src_data[COPY_BUFFER_SIZE]; +uint8_t dest_data[COPY_BUFFER_SIZE]; + +int piglit_width = 400, piglit_height = 300; +int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE; + +enum piglit_result +piglit_display(void) +{ + return PIGLIT_PASS; +} + +static enum piglit_result +do_copy() +{ + GLuint buffer_handles[2]; + + glGenBuffersARB(2, buffer_handles); + + glBindBufferARB(GL_COPY_READ_BUFFER, buffer_handles[0]); + glBindBufferARB(GL_COPY_WRITE_BUFFER, buffer_handles[1]); + glBufferData(GL_COPY_READ_BUFFER, COPY_BUFFER_SIZE, src_data, + GL_STREAM_COPY); + glBufferData(GL_COPY_WRITE_BUFFER, COPY_BUFFER_SIZE, NULL, + GL_STREAM_READ); + + glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, 0, 0, + COPY_BUFFER_SIZE); + + glGetBufferSubDataARB(GL_COPY_WRITE_BUFFER, 0, COPY_BUFFER_SIZE, + dest_data); + + if (memcmp(src_data, dest_data, COPY_BUFFER_SIZE) != 0) + return PIGLIT_FAIL; + + return PIGLIT_PASS; +} + +void +piglit_init(int argc, char *argv[]) +{ + + piglit_require_extension("GL_ARB_vertex_buffer_object"); + piglit_require_extension("GL_ARB_copy_buffer"); + + memset(src_data, 0xff, COPY_BUFFER_SIZE); + + piglit_report_result(do_copy()); +} |