On 1 August 2013 14:56, Jacob Penner <[email protected]> wrote: > Version 2: Fixed compile errors. > --- > .../spec/arb_texture_multisample/CMakeLists.gl.txt | 1 + > .../teximage-2d-multisample.c | 79 > ++++++++++++++++++++++ > 2 files changed, 80 insertions(+) > create mode 100644 > tests/spec/arb_texture_multisample/teximage-2d-multisample.c > > diff --git a/tests/spec/arb_texture_multisample/CMakeLists.gl.txt > b/tests/spec/arb_texture_multisample/CMakeLists.gl.txt > index d4b05f6..0f00e72 100644 > --- a/tests/spec/arb_texture_multisample/CMakeLists.gl.txt > +++ b/tests/spec/arb_texture_multisample/CMakeLists.gl.txt > @@ -19,5 +19,6 @@ piglit_add_executable > (arb_texture_multisample-sample-mask-value sample-mask-val > piglit_add_executable (arb_texture_multisample-sample-mask-execution > sample-mask-execution.c) > piglit_add_executable (arb_texture_multisample-negative-max-samples > negative-max-samples.c) > piglit_add_executable (arb_texture_multisample-sample-position > sample-position.c) > +piglit_add_executable (arb_texture_multisample-teximage-2d-multisample > teximage-2d-multisample.c) > piglit_add_executable (arb_texture_multisample-teximage-3d-multisample > teximage-3d-multisample.c) > # vim: ft=cmake: > diff --git a/tests/spec/arb_texture_multisample/teximage-2d-multisample.c > b/tests/spec/arb_texture_multisample/teximage-2d-multisample.c > new file mode 100644 > index 0000000..53ef3ef > --- /dev/null > +++ b/tests/spec/arb_texture_multisample/teximage-2d-multisample.c > @@ -0,0 +1,79 @@ > +/* > + * 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. > + */ > + > +/** @file teximage-multisample.c > + * > +* Section 3.8.4(TEXTURING) From GL spec 3.2 core: > + * Functions added 'glTexImage2DMultisample' > + * > + * For TexImage2DMultisample, target must be TEXTURE_2D_MULTISAMPLE or >
Extraneous end-of-line whitespace here. Also it looks like you forgot to add both of these tests to all.tests, so they won't be executed during a normal piglit run. With those issues fixed, the series is: Reviewed-by: Paul Berry <[email protected]> P.S. I just noticed that your previous commits (e88624b, 5ba9291, and 9b1060d) don't update all.tests either. Can you please submit a patch to take care of this as well? Thanks! > + * PROXY_TEXTURE_2D_MULTISAMPLE. > + */ > + > +#include "piglit-util-gl-common.h" > + > +PIGLIT_GL_TEST_CONFIG_BEGIN > + > + config.supports_gl_compat_version = 10; > + config.supports_gl_core_version = 31; > + > +PIGLIT_GL_TEST_CONFIG_END > + > +void > +piglit_init(int argc, char **argv) > +{ > + bool pass = true; > + GLuint textures[3]; > + > + if(piglit_get_gl_version() < 32) { > + piglit_require_extension("GL_ARB_texture_multisample"); > + } > + > + glGenTextures(3, textures); > + > + /* Pass a Texture 2D Multisample */ > + glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, textures[0]); > + glTexImage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, 4, GL_RGB, > + 1024, 1024, GL_FALSE); > + pass = piglit_check_gl_error(GL_NO_ERROR) && pass; > + > + /* Pass a Proxy Texture 2d Multisample */ > + glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, textures[1]); > + glTexImage2DMultisample(GL_PROXY_TEXTURE_2D_MULTISAMPLE, 4, GL_RGB, > + 1024, 1024, GL_FALSE); > + pass = piglit_check_gl_error(GL_NO_ERROR) && pass; > + > + /* Pass an Invalid Enum */ > + glBindTexture(GL_TEXTURE_2D, textures[2]); > + glTexImage2DMultisample(GL_TEXTURE_2D, 4, GL_RGB, > + 1024, 1024, GL_FALSE); > + pass = piglit_check_gl_error(GL_INVALID_ENUM) && 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 > [email protected] > http://lists.freedesktop.org/mailman/listinfo/piglit >
_______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
