[Piglit] [PATCH 2/2 v2] Test that if VertexAttribPointer uses a packed type, size must be 4 or BGRA.

[Nicholas Mack]

v2: change context
---
 .../CMakeLists.gl.txt                              |  1 +
 .../vertex-attrib-pointer-type-size-match.c        | 92 ++++++++++++++++++++++
 2 files changed, 93 insertions(+)
 create mode 100644 tests/spec/arb_vertex_type_2_10_10_10_rev/vertex-attrib-pointer-type-size-match.c

diff --git a/tests/spec/arb_vertex_type_2_10_10_10_rev/CMakeLists.gl.txt b/tests/spec/arb_vertex_type_2_10_10_10_rev/CMakeLists.gl.txt
index 9154c26..a7388a1 100644
--- a/tests/spec/arb_vertex_type_2_10_10_10_rev/CMakeLists.gl.txt
+++ b/tests/spec/arb_vertex_type_2_10_10_10_rev/CMakeLists.gl.txt
@@ -11,5 +11,6 @@ link_libraries (
 
 piglit_add_executable (draw-vertices-2101010 draw-vertices-2101010.c)
 piglit_add_executable (gl-3.3-vertex-attrib-p-types vertex-attrib-p-types.c)
+piglit_add_executable (gl-3.3-vertex-attrib-pointer-type-size-match vertex-attrib-pointer-type-size-match.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_vertex_type_2_10_10_10_rev/vertex-attrib-pointer-type-size-match.c b/tests/spec/arb_vertex_type_2_10_10_10_rev/vertex-attrib-pointer-type-size-match.c
new file mode 100644
index 0000000..7ed5e6f
--- /dev/null
+++ b/tests/spec/arb_vertex_type_2_10_10_10_rev/vertex-attrib-pointer-type-size-match.c
@@ -0,0 +1,92 @@
+/* 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.
+ */
+
+/**
+ * Test that if VertexAttribPointer type is INT_2_10_10_10_REV or
+ * UNSIGNED_INT_2_10_10_10_REV, size must be either 4 or BGRA.
+ *
+ * Section 2.8(Vertex Arrays) of GL3.3 core spec says:
+ * "An INVALID_OPERATION error is generated under any of the following
+ *  conditions:
+ *  	• size is BGRA and type is not UNSIGNED_BYTE, INT_2_10_10_10_REV or
+ *  	  UNSIGNED_INT_2_10_10_10_REV;
+ *  	• type is INT_2_10_10_10_REV or UNSIGNED_INT_2_10_10_10_REV, and size
+ *  	  is neither 4 or BGRA;"
+ */
+
+#include "piglit-util-gl-common.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+	config.supports_gl_core_version = 31;
+	config.supports_gl_compat_version = 20;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+void
+piglit_init(int argc, char **argv)
+{
+	bool pass = true;
+	int i;
+	GLint valid_sizes[] = {
+		4, GL_BGRA
+	};
+	GLint invalid_sizes[] = {
+		1, 2, 3
+	};
+
+	if(piglit_get_gl_version() < 33)
+		piglit_require_extension("ARB_vertex_type_2_10_10_10_rev");
+
+	for (i = 0; i < ARRAY_SIZE(valid_sizes); i++) {
+		glVertexAttribPointer(0, valid_sizes[i],
+					GL_INT_2_10_10_10_REV, GL_TRUE,
+					0, NULL);
+		pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
+
+		glVertexAttribPointer(0, valid_sizes[i],
+					GL_UNSIGNED_INT_2_10_10_10_REV, GL_TRUE,
+					0, NULL);
+		pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
+	}
+
+	for (i = 0; i < ARRAY_SIZE(invalid_sizes); i++) {
+		glVertexAttribPointer(0, valid_sizes[i],
+					GL_INT_2_10_10_10_REV, GL_TRUE,
+					0, NULL);
+		pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+
+		glVertexAttribPointer(0, valid_sizes[i],
+					GL_UNSIGNED_INT_2_10_10_10_REV, GL_TRUE,
+					0, NULL);
+		pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+	}
+
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
+
+enum piglit_result
+piglit_display(void)
+{
+	/* UNREACHED */
+	return PIGLIT_FAIL;
+}
-- 
1.8.3.1