Tests errors thrown by glGenTextures, glBindTexture, and glDeleteTextures. Oddly enough, these didn't seem to be tested elsewhere. --- tests/all.py | 1 + tests/general/CMakeLists.gl.txt | 1 + tests/general/tex-errors.c | 74 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+) create mode 100644 tests/general/tex-errors.c
diff --git a/tests/all.py b/tests/all.py index aa7ffd8..94f4b82 100644 --- a/tests/all.py +++ b/tests/all.py @@ -1020,6 +1020,7 @@ spec['!OpenGL 4.2/required-renderbuffer-attachment-formats'] = PiglitGLTest('gl- spec['!OpenGL 4.2/required-sized-texture-formats'] = PiglitGLTest('gl-3.0-required-sized-texture-formats 42', run_concurrent=True) spec['!OpenGL 4.2/required-texture-attachment-formats'] = PiglitGLTest('gl-3.0-required-texture-attachment-formats 42', run_concurrent=True) spec['!OpenGL 4.4/gl-max-vertex-attrib-stride'] = PiglitGLTest('gl-4.4-max_vertex_attrib_stride', run_concurrent=True) +spec['!OpenGL 4.4/tex-errors'] = PiglitGLTest('tex-errors', run_concurrent=True) # Group spec/glsl-es-1.00 spec['glsl-es-1.00'] = {} diff --git a/tests/general/CMakeLists.gl.txt b/tests/general/CMakeLists.gl.txt index cf34097..4224c06 100644 --- a/tests/general/CMakeLists.gl.txt +++ b/tests/general/CMakeLists.gl.txt @@ -111,6 +111,7 @@ piglit_add_executable (stencil-drawpixels stencil-drawpixels.c) piglit_add_executable (stencil-twoside stencil-twoside.c) piglit_add_executable (stencil-wrap stencil-wrap.c) piglit_add_executable (sync_api sync_api.c) +piglit_add_executable (tex-errors tex-errors.c) piglit_add_executable (texgen texgen.c) piglit_add_executable (texunits texunits.c) piglit_add_executable (timer_query timer_query.c) diff --git a/tests/general/tex-errors.c b/tests/general/tex-errors.c new file mode 100644 index 0000000..c63007a --- /dev/null +++ b/tests/general/tex-errors.c @@ -0,0 +1,74 @@ +/* + * Copyright 2014 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 tex-errors.c + * + * Checks to see if *Tex* functions throw the correct errors. This is not + * exhaustive since some *Tex* errors are covered elsewhere. + */ + +#include "piglit-util-gl.h" + +PIGLIT_GL_TEST_CONFIG_BEGIN + + config.supports_gl_compat_version = 13; + + config.window_visual = PIGLIT_GL_VISUAL_RGBA | + PIGLIT_GL_VISUAL_DOUBLE; + +PIGLIT_GL_TEST_CONFIG_END + +void +piglit_init(int argc, char **argv) +{ + +} + +enum piglit_result +piglit_display(void) +{ + bool pass = true; + GLuint name; + + /* n is negative */ + glGenTextures(-1, &name); + pass &= piglit_check_gl_error(GL_INVALID_VALUE); + + glGenTextures(1, &name); + /* Not a valid target */ + glBindTexture(GL_INVALID_ENUM, name); + pass &= piglit_check_gl_error(GL_INVALID_ENUM); + + glBindTexture(GL_TEXTURE_2D, name); + glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA8, 4, 5); + /* Wrong dimensionality. */ + glBindTexture(GL_TEXTURE_1D, name); + pass &= piglit_check_gl_error(GL_INVALID_OPERATION); + + /* n is negative */ + glDeleteTextures(-1, &name); + pass &= piglit_check_gl_error(GL_INVALID_VALUE); + + return pass ? PIGLIT_PASS : PIGLIT_FAIL; +} + -- 2.1.0 _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit