diff options
| author | Carl Worth <cworth@cworth.org> | 2012-12-20 10:58:32 -0800 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2013-01-14 11:38:25 -0800 |
| commit | 279807dfc48d17a8217fa44b23f5376267397b3c (patch) | |
| tree | 7741b21d9e071f65db2d3bf1ac77667e81eab74b | |
| parent | e057cf0c0dfc413010f9c45fbb49badcc1a05c62 (diff) | |
Make new tests/spec/arb_occlusion_query directory
Moving the existing occlusion_query.c test from tests/general to the new
directory. This creates a natural place to add additional occlusion-query
tests according to the current naming scheme for piglit.
| -rw-r--r-- | tests/general/CMakeLists.gl.txt | 1 | ||||
| -rw-r--r-- | tests/spec/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/spec/arb_occlusion_query/CMakeLists.gl.txt | 12 | ||||
| -rw-r--r-- | tests/spec/arb_occlusion_query/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/spec/arb_occlusion_query/occlusion_query.c (renamed from tests/general/occlusion_query.c) | 0 |
5 files changed, 14 insertions, 1 deletions
diff --git a/tests/general/CMakeLists.gl.txt b/tests/general/CMakeLists.gl.txt index d1eaeb41..3f54f506 100644 --- a/tests/general/CMakeLists.gl.txt +++ b/tests/general/CMakeLists.gl.txt @@ -133,7 +133,6 @@ piglit_add_executable (vbo-subdata-sync vbo-subdata-sync.c) piglit_add_executable (object_purgeable-api-pbo object_purgeable-api-pbo.c object_purgeable.c) piglit_add_executable (object_purgeable-api-texture object_purgeable-api-texture.c object_purgeable.c) piglit_add_executable (object_purgeable-api-vbo object_purgeable-api-vbo.c object_purgeable.c) -piglit_add_executable (occlusion_query occlusion_query.c) piglit_add_executable (occlusion-query-discard occlusion-query-discard.c) piglit_add_executable (quad-invariance quad-invariance.c) piglit_add_executable (clear-accum clear-accum.c) diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt index 9ec37fa7..a4342b7c 100644 --- a/tests/spec/CMakeLists.txt +++ b/tests/spec/CMakeLists.txt @@ -9,6 +9,7 @@ add_subdirectory (arb_internalformat_query) add_subdirectory (arb_map_buffer_alignment) add_subdirectory (arb_map_buffer_range) add_subdirectory (arb_multisample) +add_subdirectory (arb_occlusion_query) add_subdirectory (arb_occlusion_query2) add_subdirectory (arb_robustness) add_subdirectory (arb_sampler_objects) diff --git a/tests/spec/arb_occlusion_query/CMakeLists.gl.txt b/tests/spec/arb_occlusion_query/CMakeLists.gl.txt new file mode 100644 index 00000000..a323e860 --- /dev/null +++ b/tests/spec/arb_occlusion_query/CMakeLists.gl.txt @@ -0,0 +1,12 @@ +include_directories( + ${GLEXT_INCLUDE_DIR} + ${OPENGL_INCLUDE_PATH} +) + +link_libraries ( + piglitutil_${piglit_target_api} + ${OPENGL_gl_LIBRARY} + ${OPENGL_glu_LIBRARY} +) + +piglit_add_executable (occlusion_query occlusion_query.c) diff --git a/tests/spec/arb_occlusion_query/CMakeLists.txt b/tests/spec/arb_occlusion_query/CMakeLists.txt new file mode 100644 index 00000000..144a306f --- /dev/null +++ b/tests/spec/arb_occlusion_query/CMakeLists.txt @@ -0,0 +1 @@ +piglit_include_target_api() diff --git a/tests/general/occlusion_query.c b/tests/spec/arb_occlusion_query/occlusion_query.c index ba35ed0c..ba35ed0c 100644 --- a/tests/general/occlusion_query.c +++ b/tests/spec/arb_occlusion_query/occlusion_query.c |