<div dir="ltr">On 1 August 2013 14:56, Jacob Penner <span dir="ltr"><<a href="mailto:jkpenner91@gmail.com" target="_blank">jkpenner91@gmail.com</a>></span> wrote:<br><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">Version 2: Fixed compile errors.<br>
---<br>
.../spec/arb_texture_multisample/CMakeLists.gl.txt | 1 +<br>
.../teximage-2d-multisample.c | 79 ++++++++++++++++++++++<br>
2 files changed, 80 insertions(+)<br>
<div class="im"> create mode 100644 tests/spec/arb_texture_multisample/teximage-2d-multisample.c<br>
<br>
diff --git a/tests/spec/arb_texture_multisample/CMakeLists.gl.txt b/tests/spec/arb_texture_multisample/CMakeLists.gl.txt<br>
index d4b05f6..0f00e72 100644<br>
--- a/tests/spec/arb_texture_multisample/CMakeLists.gl.txt<br>
+++ b/tests/spec/arb_texture_multisample/CMakeLists.gl.txt<br>
@@ -19,5 +19,6 @@ piglit_add_executable (arb_texture_multisample-sample-mask-value sample-mask-val<br>
piglit_add_executable (arb_texture_multisample-sample-mask-execution sample-mask-execution.c)<br>
piglit_add_executable (arb_texture_multisample-negative-max-samples negative-max-samples.c)<br>
piglit_add_executable (arb_texture_multisample-sample-position sample-position.c)<br>
+piglit_add_executable (arb_texture_multisample-teximage-2d-multisample teximage-2d-multisample.c)<br>
piglit_add_executable (arb_texture_multisample-teximage-3d-multisample teximage-3d-multisample.c)<br>
# vim: ft=cmake:<br>
diff --git a/tests/spec/arb_texture_multisample/teximage-2d-multisample.c b/tests/spec/arb_texture_multisample/teximage-2d-multisample.c<br>
new file mode 100644<br>
</div>index 0000000..53ef3ef<br>
--- /dev/null<br>
+++ b/tests/spec/arb_texture_multisample/teximage-2d-multisample.c<br>
@@ -0,0 +1,79 @@<br>
<div><div class="h5">+/*<br>
+ * Copyright © 2013 Intel Corporation<br>
+ *<br>
+ * Permission is hereby granted, free of charge, to any person obtaining a<br>
+ * copy of this software and associated documentation files (the "Software"),<br>
+ * to deal in the Software without restriction, including without limitation<br>
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,<br>
+ * and/or sell copies of the Software, and to permit persons to whom the<br>
+ * Software is furnished to do so, subject to the following conditions:<br>
+ *<br>
+ * The above copyright notice and this permission notice (including the next<br>
+ * paragraph) shall be included in all copies or substantial portions of the<br>
+ * Software.<br>
+ *<br>
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR<br>
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,<br>
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL<br>
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER<br>
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING<br>
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS<br>
+ * IN THE SOFTWARE.<br>
+ */<br>
+<br>
+/** @file teximage-multisample.c<br>
+ *<br>
+* Section 3.8.4(TEXTURING) From GL spec 3.2 core:<br>
+ * Functions added 'glTexImage2DMultisample'<br>
+ *<br>
+ * For TexImage2DMultisample, target must be TEXTURE_2D_MULTISAMPLE or<br></div></div></blockquote><div><br></div><div>Extraneous end-of-line whitespace here.<br><br></div><div>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.<br>
</div><div><br></div><div>With those issues fixed, the series is:<br><br>Reviewed-by: Paul Berry <<a href="mailto:stereotype441@gmail.com">stereotype441@gmail.com</a>><br><br></div><div>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!<br>
</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div><div class="h5">
+ * PROXY_TEXTURE_2D_MULTISAMPLE.<br>
+ */<br>
+<br>
+#include "piglit-util-gl-common.h"<br>
+<br>
+PIGLIT_GL_TEST_CONFIG_BEGIN<br>
+<br>
+ config.supports_gl_compat_version = 10;<br>
+ config.supports_gl_core_version = 31;<br>
+<br>
+PIGLIT_GL_TEST_CONFIG_END<br>
+<br>
+void<br>
+piglit_init(int argc, char **argv)<br>
+{<br>
</div></div><div class="im">+ bool pass = true;<br>
</div>+ GLuint textures[3];<br>
<div class="im HOEnZb">+<br>
+ if(piglit_get_gl_version() < 32) {<br>
+ piglit_require_extension("GL_ARB_texture_multisample");<br>
+ }<br>
+<br>
</div><div class="HOEnZb"><div class="h5">+ glGenTextures(3, textures);<br>
+<br>
+ /* Pass a Texture 2D Multisample */<br>
+ glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, textures[0]);<br>
+ glTexImage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, 4, GL_RGB,<br>
+ 1024, 1024, GL_FALSE);<br>
+ pass = piglit_check_gl_error(GL_NO_ERROR) && pass;<br>
+<br>
+ /* Pass a Proxy Texture 2d Multisample */<br>
+ glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, textures[1]);<br>
+ glTexImage2DMultisample(GL_PROXY_TEXTURE_2D_MULTISAMPLE, 4, GL_RGB,<br>
+ 1024, 1024, GL_FALSE);<br>
+ pass = piglit_check_gl_error(GL_NO_ERROR) && pass;<br>
+<br>
+ /* Pass an Invalid Enum */<br>
+ glBindTexture(GL_TEXTURE_2D, textures[2]);<br>
+ glTexImage2DMultisample(GL_TEXTURE_2D, 4, GL_RGB,<br>
+ 1024, 1024, GL_FALSE);<br>
+ pass = piglit_check_gl_error(GL_INVALID_ENUM) && pass;<br>
+<br>
+ piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);<br>
+}<br>
+<br>
+enum piglit_result<br>
+piglit_display(void)<br>
+{<br>
+ return PIGLIT_FAIL;<br>
+}<br>
--<br>
1.8.3.1<br>
<br>
_______________________________________________<br>
Piglit mailing list<br>
<a href="mailto:Piglit@lists.freedesktop.org">Piglit@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/piglit" target="_blank">http://lists.freedesktop.org/mailman/listinfo/piglit</a><br>
</div></div></blockquote></div><br></div></div>