On Thu, Mar 5, 2015 at 6:01 PM, Laura Ekstrand <[email protected]> wrote: > This is just some trivial error testing, because apparently Mesa doesn't > actually implement the glInvalidate*Framebuffer* functionality. Testers of > other drivers are welcome to submit a less trivial test at a future date. > --- > tests/all.py | 1 + > .../spec/arb_direct_state_access/CMakeLists.gl.txt | 1 + > .../invalidateframebuffer.c | 120 > +++++++++++++++++++++ > 3 files changed, 122 insertions(+) > create mode 100644 tests/spec/arb_direct_state_access/invalidateframebuffer.c > > diff --git a/tests/all.py b/tests/all.py > index 8c23e7c..d03f661 100644 > --- a/tests/all.py > +++ b/tests/all.py > @@ -4032,6 +4032,7 @@ > spec['ARB_direct_state_access']['namedframebufferrenderbuffer'] = > PiglitGLTest([ > spec['ARB_direct_state_access']['framebufferblit'] = > PiglitGLTest(['arb_direct_state_access-framebufferblit'], run_concurrent=True) > spec['ARB_direct_state_access']['checkfbstatus-errors'] = > PiglitGLTest(['arb_direct_state_access-checkfbstatus-errors'], > run_concurrent=True) > spec['ARB_direct_state_access']['fbattachmentparam-errors'] = > PiglitGLTest(['arb_direct_state_access-fbattachmentparam-errors'], > run_concurrent=True) > +spec['ARB_direct_state_access']['invalidateframebuffer'] = > PiglitGLTest(['arb_direct_state_access-invalidateframebuffer'], > run_concurrent=True) > > arb_shader_image_load_store = spec['ARB_shader_image_load_store'] > arb_shader_image_load_store['atomicity'] = > PiglitGLTest(['arb_shader_image_load_store-atomicity'], run_concurrent=True) > diff --git a/tests/spec/arb_direct_state_access/CMakeLists.gl.txt > b/tests/spec/arb_direct_state_access/CMakeLists.gl.txt > index 8ecb1ce..3c09c21 100644 > --- a/tests/spec/arb_direct_state_access/CMakeLists.gl.txt > +++ b/tests/spec/arb_direct_state_access/CMakeLists.gl.txt > @@ -29,6 +29,7 @@ piglit_add_executable > (arb_direct_state_access-namedframebufferrenderbuffer name > piglit_add_executable (arb_direct_state_access-framebufferblit > framebufferblit.c) > piglit_add_executable (arb_direct_state_access-checkfbstatus-errors > checkfbstatus-errors.c) > piglit_add_executable (arb_direct_state_access-fbattachmentparam-errors > fbattachmentparam-errors.c) > +piglit_add_executable (arb_direct_state_access-invalidateframebuffer > invalidateframebuffer.c) > piglit_add_executable (arb_direct_state_access-dsa-textures dsa-textures.c > dsa-utils.c) > piglit_add_executable (arb_direct_state_access-texturesubimage > texturesubimage.c) > piglit_add_executable (arb_direct_state_access-bind-texture-unit > bind-texture-unit.c) > diff --git a/tests/spec/arb_direct_state_access/invalidateframebuffer.c > b/tests/spec/arb_direct_state_access/invalidateframebuffer.c > new file mode 100644 > index 0000000..30daee1 > --- /dev/null > +++ b/tests/spec/arb_direct_state_access/invalidateframebuffer.c > @@ -0,0 +1,120 @@ > +/* > + * Copyright 2015 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. > + */ > + > +/** @file invalidateframebuffer.c > + * > + * Trivial tests for glInvalidate*Framebuffer* functions. > + */ > + > +#include "piglit-util-gl.h" > +#include "dsa-utils.h" > + > +PIGLIT_GL_TEST_CONFIG_BEGIN > + > + config.supports_gl_core_version = 32; > + > + config.window_visual = PIGLIT_GL_VISUAL_RGBA | > + PIGLIT_GL_VISUAL_DOUBLE; > + > +PIGLIT_GL_TEST_CONFIG_END > + > +void > +piglit_init(int argc, char **argv) > +{ > + piglit_require_extension("GL_ARB_direct_state_access"); > + piglit_require_extension("GL_ARB_invalidate_subdata"); > +} > + > +enum piglit_result > +piglit_display(void) > +{ > + bool pass = true; > + GLuint fbo, texture[2]; > + GLenum attachments[2] = {GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1}; > + GLenum winsysatt[2] = {GL_FRONT_LEFT, GL_COLOR}; > + > + glCreateFramebuffers(1, &fbo); > + glCreateTextures(GL_TEXTURE_2D, 2, texture); > + glNamedFramebufferTexture(fbo, attachments[0], texture[0], 0); > + glNamedFramebufferTexture(fbo, attachments[1], texture[1], 0); > + > + /* Bad target */ > + glInvalidateSubFramebuffer(GL_INVALID_ENUM, 2, attachments, > + 0, 0, 32, 32); > + SUBTEST(GL_INVALID_ENUM, pass, "bad target"); > + > + /* Non-generated name */ > + glInvalidateNamedFramebufferSubData(1337, 2, attachments, > + 0, 0, 32, 32); > + SUBTEST(GL_INVALID_OPERATION, pass, "bad name"); > + > + /* Negative number of attachments */ > + glInvalidateNamedFramebufferSubData(fbo, -1, attachments, > + 0, 0, 32, 32); > + SUBTEST(GL_INVALID_VALUE, pass, "numAttachments < 0"); > + > + /* Number of attachments larger than array */ > + glInvalidateNamedFramebufferSubData(fbo, 3, attachments, > + 0, 0, 32, 32); > + SUBTEST(GL_INVALID_ENUM, pass, "numAttachments exceeds array size"); > + > + /* Negative width */ > + glInvalidateNamedFramebufferSubData(fbo, 2, attachments, > + 0, 0, -32, 32); > + SUBTEST(GL_INVALID_VALUE, pass, "width < 0"); > + > + /* Negative height */ > + glInvalidateNamedFramebufferSubData(fbo, 2, attachments, > + 0, 0, 32, -32); > + SUBTEST(GL_INVALID_VALUE, pass, "height < 0"); > + > + /* fbo with default attachment enums */ > + glInvalidateNamedFramebufferSubData(fbo, 2, winsysatt, > + 0, 0, 32, 32); > + SUBTEST(GL_INVALID_ENUM, pass, "default fb attachments, user fbo"); > + > + /* default framebuffer with fbo attachment enums */ > + glInvalidateNamedFramebufferSubData(0, 2, attachments, > + 0, 0, 32, 32); > + SUBTEST(GL_INVALID_ENUM, pass, "user fbo attachments, default fb"); > + > + > + /* Trivial cases */ > + glInvalidateNamedFramebufferSubData(0, 2, winsysatt, > + 0, 0, 32, 32); > + SUBTEST(GL_NO_ERROR, pass, "trivial default fb test"); > + > + glBindFramebuffer(GL_FRAMEBUFFER, 0); > + glInvalidateFramebuffer(GL_FRAMEBUFFER, 2, winsysatt); > + SUBTEST(GL_NO_ERROR, pass, "trivial, traditional default fb test"); > + > + glInvalidateNamedFramebufferData(fbo, 2, attachments); > + SUBTEST(GL_NO_ERROR, pass, "trivial fbo test"); > + > + Extra newline here. > + glDeleteTextures(2, texture); > + glDeleteFramebuffers(1, &fbo); > + > + return pass ? PIGLIT_PASS : PIGLIT_FAIL; > +} > + > -- > 2.1.0 > > _______________________________________________ > Piglit mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/piglit
Patches 9-15 are: Reviewed-by: Anuj Phogat <[email protected]> _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
