<div dir="ltr">On 6 August 2013 10:29, 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:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> --- tests/spec/gl-3.2/CMakeLists.gl.txt | 1 + tests/spec/gl-3.2/draw-buffers-errors.c | 116 ++++++++++++++++++++++++++++++++ </blockquote><div> </div><div>You need to add the new test to all.tests. Other comments below: </div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> 2 files changed, 117 insertions(+) create mode 100644 tests/spec/gl-3.2/draw-buffers-errors.c diff --git a/tests/spec/gl-3.2/CMakeLists.gl.txt b/tests/spec/gl-3.2/CMakeLists.gl.txt index c6c99b8..49e9279 100644 --- a/tests/spec/gl-3.2/CMakeLists.gl.txt +++ b/tests/spec/gl-3.2/CMakeLists.gl.txt @@ -10,5 +10,6 @@ link_libraries ( ) piglit_add_executable (gl-3.2-minmax minmax.c) +piglit_add_executable (gl-3.2-draw-buffers-errors draw-buffers-errors.c) # vim: ft=cmake: diff --git a/tests/spec/gl-3.2/draw-buffers-errors.c b/tests/spec/gl-3.2/draw-buffers-errors.c new file mode 100644 index 0000000..dae753a --- /dev/null +++ b/tests/spec/gl-3.2/draw-buffers-errors.c @@ -0,0 +1,116 @@ +/** + * 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 DrawBuffers() returns correct error message for different values + * + * Section 4.2.1(Selecting a Buffer for Writing) of OpenGL 3.2 Core says: + * + * "For both the default framebuffer and framebuffer objects, the constants + * FRONT, BACK, LEFT, RIGHT, and FRONT_AND_BACK are not valid in the bufs + * array passed to DrawBuffers, and will result in the error INVALID_ENUM." + * + * "If the GL is bound to the default framebuffer and DrawBuffers is supplied + * with a constant (other than NONE) that does not indicate any of the color + * buffers allocated to the GL context by the window system, the error + * INVALID_OPERATION will be generated." + * + */ + +#include "piglit-util-gl-common.h" + +PIGLIT_GL_TEST_CONFIG_BEGIN + + config.supports_gl_compat_version = 10; </blockquote><div> </div><div>Since this test is validating behaviour that is specified in GL 3.2, the above line should change to: config.supports_gl_compat_version = 32; config.supports_gl_core_version = 32; </div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> + + config.window_visual = PIGLIT_GL_VISUAL_DOUBLE; + +PIGLIT_GL_TEST_CONFIG_END + + +static GLenum invalids[]={GL_FRONT, + GL_BACK, + GL_LEFT, + GL_RIGHT, + GL_FRONT_AND_BACK}; + +static GLenum valids[] = {GL_NONE, + GL_FRONT_LEFT, + GL_FRONT_RIGHT, + GL_BACK_LEFT, + GL_BACK_RIGHT}; + +enum piglit_result +piglit_display(void) +{ + bool pass = true; + int i = 0; + + glClearColor(0, 1, 0 , 1); + glClear(GL_COLOR_BUFFER_BIT); + +// printf("Expected GL_WAIT_FAILED but returned: %s\n", +// piglit_get_gl_enum_name(status1)); +// pass = false; </blockquote><div> </div><div>These three comment lines seem extraneous. </div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> + + for (i = 0; i < 5; i++) { + GLenum err = 0; + glDrawBuffers(1, &valids[i]); + err = glGetError(); + /* err = INVALID_OPERATION if that color buffer is not + allocated to the window system */ </blockquote><div> </div><div>We format multi-line comments like this: </div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> + if(err != GL_NONE && err != GL_INVALID_OPERATION) { + printf("Expected GL_NONE or GL_INVALID_OPERATION with" + " %s but received: %s\n", + piglit_get_gl_enum_name(valids[i]), + piglit_get_gl_enum_name(err)); + pass = false; + } + } + + for (i = 0; i < 5; i++) { + GLenum err = 0; + glDrawBuffers(1, &invalids[i]); + err = glGetError(); + if(err != GL_INVALID_ENUM) { + printf("Expected GL_INVALID_ENUM with %s but " + "received: %s\n", + piglit_get_gl_enum_name(invalids[i]), + piglit_get_gl_enum_name(err)); + pass = false; + } + } + + if(!pass) { + glClearColor(1, 0, 0 , 1); + glClear(GL_COLOR_BUFFER_BIT); + } + + piglit_present_results(); + + return pass ? PIGLIT_PASS : PIGLIT_FAIL; +} +void +piglit_init(int argc, char **argv) +{ +} -- 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>