<div dir="ltr">On 20 August 2013 10:56, Nicholas Mack <<a href="mailto:nichmack@gmail.com" target="_blank">nichmack@gmail.com</a>> wrote: <div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> --- tests/spec/CMakeLists.txt | 1 + tests/spec/arb_provoking_vertex/CMakeLists.gl.txt | 14 ++++ tests/spec/arb_provoking_vertex/CMakeLists.txt | 1 + .../provoking-vertex-control.c | 77 ++++++++++++++++++++++ 4 files changed, 93 insertions(+) create mode 100644 tests/spec/arb_provoking_vertex/CMakeLists.gl.txt create mode 100644 tests/spec/arb_provoking_vertex/CMakeLists.txt create mode 100644 tests/spec/arb_provoking_vertex/provoking-vertex-control.c </blockquote><div> </div><div>Can we rename this commit to "Test ProvokingVertex() state", just so that it's clear from the commit subject that this test is verifying that the GL state is stored and retrieved correctly, and not actually testing the functionality? </div><div>Also, we usually add don't wait until the end of the patch series to add tests to all.tests. We add them in each patch as the tests appear (much as we do for CMakeLists.txt). That way it's easier for reviewers to verify that the correct thing has been added to all.tests. It also simplifies things if we wind up deciding to revert a patch in the future. With those fixes, this patch is: Reviewed-by: Paul Berry <<a href="mailto:stereotype441@gmail.com">stereotype441@gmail.com</a>> </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt index 327780f..17c991a 100644 --- a/tests/spec/CMakeLists.txt +++ b/tests/spec/CMakeLists.txt @@ -14,6 +14,7 @@ add_subdirectory (arb_map_buffer_range) add_subdirectory (arb_multisample) add_subdirectory (arb_occlusion_query) add_subdirectory (arb_occlusion_query2) +add_subdirectory (arb_provoking_vertex) add_subdirectory (arb_robustness) add_subdirectory (arb_sampler_objects) add_subdirectory (arb_seamless_cube_map) diff --git a/tests/spec/arb_provoking_vertex/CMakeLists.gl.txt b/tests/spec/arb_provoking_vertex/CMakeLists.gl.txt new file mode 100644 index 0000000..e952392 --- /dev/null +++ b/tests/spec/arb_provoking_vertex/CMakeLists.gl.txt @@ -0,0 +1,14 @@ +include_directories( + ${GLEXT_INCLUDE_DIR} + ${OPENGL_INCLUDE_PATH} +) + +link_libraries ( + piglitutil_${piglit_target_api} + ${OPENGL_gl_LIBRARY} + ${OPENGL_glu_LIBRARY} +) + +piglit_add_executable (arb-provoking-vertex-control provoking-vertex-control.c) + +# vim: ft=cmake: diff --git a/tests/spec/arb_provoking_vertex/CMakeLists.txt b/tests/spec/arb_provoking_vertex/CMakeLists.txt new file mode 100644 index 0000000..4a012b9 --- /dev/null +++ b/tests/spec/arb_provoking_vertex/CMakeLists.txt @@ -0,0 +1 @@ +piglit_include_target_api() \ No newline at end of file diff --git a/tests/spec/arb_provoking_vertex/provoking-vertex-control.c b/tests/spec/arb_provoking_vertex/provoking-vertex-control.c new file mode 100644 index 0000000..302fdc4 --- /dev/null +++ b/tests/spec/arb_provoking_vertex/provoking-vertex-control.c @@ -0,0 +1,77 @@ +/** + * Copyright © 2013 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. + */ + +/** + * Test that ProvokingVertex() controls the provoking vertex convention + * + * Section 2.18(Flatshading) of OpenGL 3.2 Core says: + * "The provoking vertex is controlled with the command + * void ProvokingVertex( enum provokeMode ); + * provokeMode must be either FIRST_VERTEX_CONVENTION or + * LAST_VERTEX_CONVENTION" + * + */ + +#include "piglit-util-gl-common.h" + +PIGLIT_GL_TEST_CONFIG_BEGIN + + config.supports_gl_compat_version = 32; + config.supports_gl_core_version = 32; + +PIGLIT_GL_TEST_CONFIG_END + +void +piglit_init(int argc, char **argv) +{ + bool pass = true; + int ret = 0; + + glProvokingVertex(GL_FIRST_VERTEX_CONVENTION); + glGetIntegerv(GL_PROVOKING_VERTEX, &ret); + if(ret != GL_FIRST_VERTEX_CONVENTION) { + printf("GL_PROVOKING_VERTEX was expected to be GL_FIRST_VERTEX" + "_CONVENTION, but %s was returned.\n", + piglit_get_gl_enum_name(ret)); + pass = false; + } + pass = piglit_check_gl_error(GL_NO_ERROR) && pass; + + glProvokingVertex(GL_LAST_VERTEX_CONVENTION); + glGetIntegerv(GL_PROVOKING_VERTEX, &ret); + if(ret != GL_LAST_VERTEX_CONVENTION) { + printf("GL_PROVOKING_VERTEX was expected to be GL_LAST_VERTEX" + "_CONVENTION, but %s was returned.\n", + piglit_get_gl_enum_name(ret)); + pass = false; + } + pass = piglit_check_gl_error(GL_NO_ERROR) && pass; + + piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL); +} + +enum piglit_result +piglit_display(void) +{ + return PIGLIT_FAIL; +} -- 1.8.3.1 _______________________________________________ Piglit mailing list <a href="mailto:Piglit@lists.freedesktop.org">Piglit@lists.freedesktop.org</a> <a href="http://lists.freedesktop.org/mailman/listinfo/piglit" target="_blank">http://lists.freedesktop.org/mailman/listinfo/piglit</a> </blockquote></div> </div></div>