[Piglit] [PATCH v2] GL 3.2: Test that GetTexLevelParameterfv() generates an error when passed TEXTURE_BORDER

[Nicholas Mack]

v2: Multiple fixes and added to all.tests
---
 tests/all.tests                               |  1 +
 tests/spec/gl-3.2/CMakeLists.gl.txt           |  1 +
 tests/spec/gl-3.2/texture-border-deprecated.c | 66 +++++++++++++++++++++++++++
 3 files changed, 68 insertions(+)
 create mode 100644 tests/spec/gl-3.2/texture-border-deprecated.c

diff --git a/tests/all.tests b/tests/all.tests
index dadd98e..93d91f8 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -749,6 +749,7 @@ spec['!OpenGL 3.2/layered-rendering/clear-color'] = concurrent_test('gl-3.2-laye
 spec['!OpenGL 3.2/layered-rendering/clear-depth'] = concurrent_test('gl-3.2-layered-rendering-clear-depth')
 spec['!OpenGL 3.2/layered-rendering/framebuffertexture-buffer-textures'] = concurrent_test('gl-3.2-layered-rendering-framebuffertexture-buffer-textures')
 spec['!OpenGL 3.2/layered-rendering/readpixels'] = concurrent_test('gl-3.2-layered-rendering-readpixels')
+spec['!OpenGL 3.2/texture-border-deprecated'] = concurrent_test('gl-3.2-texture-border-deprecated')
 
 spec['!OpenGL 3.3/minmax'] = concurrent_test('gl-3.3-minmax')
 spec['!OpenGL 3.3/required-renderbuffer-attachment-formats'] = concurrent_test('gl-3.0-required-renderbuffer-attachment-formats 33')
diff --git a/tests/spec/gl-3.2/CMakeLists.gl.txt b/tests/spec/gl-3.2/CMakeLists.gl.txt
index 9fc0a75..39e829a 100644
--- a/tests/spec/gl-3.2/CMakeLists.gl.txt
+++ b/tests/spec/gl-3.2/CMakeLists.gl.txt
@@ -14,4 +14,5 @@ piglit_add_executable (gl-3.2-clear-no-buffers clear-no-buffers.c)
 piglit_add_executable (gl-3.2-get-buffer-parameter-i64v get-buffer-parameter-i64v.c)
 piglit_add_executable (gl-3.2-get-integer-64iv get-integer-64iv.c)
 piglit_add_executable (gl-3.2-get-integer-64v get-integer-64v.c)
+piglit_add_executable (gl-3.2-texture-border-deprecated texture-border-deprecated.c)
 # vim: ft=cmake:
diff --git a/tests/spec/gl-3.2/texture-border-deprecated.c b/tests/spec/gl-3.2/texture-border-deprecated.c
new file mode 100644
index 0000000..6aa9933
--- /dev/null
+++ b/tests/spec/gl-3.2/texture-border-deprecated.c
@@ -0,0 +1,66 @@
+/**
+ * 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
+ * Test that GetTexLevelParameterfv() generates an error if passed
+ * TEXTURE_BORDER.
+ *
+ * In GL 3.2 core spec section 6.1.3 (Enumerated Queries), TEXTURE_BORDER is not
+ * included in the list of acceptable targets for GetTexLevelParameterfv()
+ *
+ */
+
+#include "piglit-util-gl-common.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+	config.supports_gl_core_version = 32;
+	config.supports_gl_compat_version = 0;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+void
+piglit_init(int argc, char **argv)
+{
+	bool pass = true;
+	GLfloat data = -1;
+	GLuint tex;
+
+	glGenTextures(1, &tex);
+	glBindTexture(GL_TEXTURE_2D, tex);
+
+	glGetTexLevelParameterfv(GL_TEXTURE_2D, 0, GL_TEXTURE_BORDER, &data);
+
+	if (!piglit_check_gl_error(GL_INVALID_ENUM))
+		pass = false;
+
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
+
+enum piglit_result
+piglit_display(void)
+{
+	/* UNREACHED */
+	return PIGLIT_FAIL;
+}
-- 
1.8.3.1