[Piglit] [PATCH 2/3] arb_es3_compatibility: add basic test for GL_PRIMITIVE_RESTART_FIXED_INDEX

Marek Olšák maraeo at gmail.com
Sun Jan 4 07:48:58 PST 2015


From: Marek Olšák <marek.olsak at amd.com>

---
 tests/all.py                                       |   1 +
 tests/spec/arb_es3_compatibility/CMakeLists.gl.txt |   1 +
 .../es3-primrestart-fixedindex.c                   | 110 +++++++++++++++++++++
 3 files changed, 112 insertions(+)
 create mode 100644 tests/spec/arb_es3_compatibility/es3-primrestart-fixedindex.c

diff --git a/tests/all.py b/tests/all.py
index 3e40fc4..0e65ff3 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -4278,6 +4278,7 @@ for tex_format in ('rgb8', 'srgb8', 'rgba8', 'srgb8-alpha8', 'r11', 'rg11', 'rgb
         test_name = ' ' .join(['oes_compressed_etc2_texture-miptree', tex_format, context])
         executable = '{0}'.format(test_name)
         arb_es3_compatibility[test_name] = PiglitGLTest(executable, run_concurrent=True)
+add_concurrent_test(arb_es3_compatibility, 'es3-primrestart-fixedindex')
 add_concurrent_test(arb_es3_compatibility, 'es3-drawarrays-primrestart-fixedindex')
 
 add_shader_test_dir(spec, os.path.join(generatedTestDir, 'spec'),
diff --git a/tests/spec/arb_es3_compatibility/CMakeLists.gl.txt b/tests/spec/arb_es3_compatibility/CMakeLists.gl.txt
index 22df5af..8f70460 100644
--- a/tests/spec/arb_es3_compatibility/CMakeLists.gl.txt
+++ b/tests/spec/arb_es3_compatibility/CMakeLists.gl.txt
@@ -9,4 +9,5 @@ link_libraries (
 	${OPENGL_glu_LIBRARY}
 )
 
+piglit_add_executable (es3-primrestart-fixedindex es3-primrestart-fixedindex.c)
 piglit_add_executable (es3-drawarrays-primrestart-fixedindex es3-drawarrays-primrestart-fixedindex.c)
diff --git a/tests/spec/arb_es3_compatibility/es3-primrestart-fixedindex.c b/tests/spec/arb_es3_compatibility/es3-primrestart-fixedindex.c
new file mode 100644
index 0000000..c1b6430
--- /dev/null
+++ b/tests/spec/arb_es3_compatibility/es3-primrestart-fixedindex.c
@@ -0,0 +1,110 @@
+/*
+ * Copyright © 2014 Advanced Micro Devices, Inc.
+ *
+ * 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 if PRIMITIVE_RESTART_FIXED_INDEX uses the fixed index and not
+ * the user-specified index.
+ */
+
+#include "piglit-util-gl.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+	config.supports_gl_compat_version = 33;
+	config.supports_gl_core_version = 33;
+	config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
+PIGLIT_GL_TEST_CONFIG_END
+
+static const GLchar *vstext =
+	"#version 330\n"
+	"attribute vec2 piglit_vertex;\n"
+	"attribute int piglit_texcoord;\n"
+	"out vec4 color;\n"
+	"void main()\n"
+	"{\n"
+	"	gl_Position = vec4(piglit_vertex, 0.0, 1.0);\n"
+	"	color = vec4(0.0, 1.0, 0.0, 1.0);\n"
+	"} \n";
+
+static const char *fstext =
+	"#version 330\n"
+	"in vec4 color;\n"
+	"void main() {\n"
+	"	gl_FragColor = color;\n"
+	"}\n";
+
+static GLint prog;
+
+enum piglit_result
+piglit_display(void)
+{
+	static const float green[] = {0, 1, 0, 1};
+	enum piglit_result result;
+
+	glClear(GL_COLOR_BUFFER_BIT);
+	glDrawElements(GL_TRIANGLES, 7, GL_UNSIGNED_SHORT, NULL);
+
+	result = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height,
+					green)
+		? PIGLIT_PASS : PIGLIT_FAIL;
+
+	piglit_present_results();
+	return result;
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+	static const float pos[] = {
+		-1, -1,
+		-1,  1,
+		 1, -1,
+		 1,  1,
+		 1, -1,
+		-1,  1,
+	};
+	static const short indices[] = {0, 1, 2, 0xFFFF, 3, 4, 5};
+	GLuint vao, buf, elem;
+
+	piglit_require_gl_version(33);
+	piglit_require_extension("GL_ARB_ES3_compatibility");
+	prog = piglit_build_simple_program(vstext, fstext);
+	glUseProgram(prog);
+
+	glGenVertexArrays(1, &vao);
+	glBindVertexArray(vao);
+
+	glGenBuffers(1, &buf);
+	glBindBuffer(GL_ARRAY_BUFFER, buf);
+	glBufferData(GL_ARRAY_BUFFER, sizeof(pos), pos, GL_STATIC_DRAW);
+
+	glGenBuffers(1, &elem);
+	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, elem);
+	glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(indices), indices,
+		     GL_STATIC_DRAW);
+
+	glEnableVertexAttribArray(PIGLIT_ATTRIB_POS);
+	glVertexAttribPointer(PIGLIT_ATTRIB_POS, 2, GL_FLOAT, 0, 0, NULL);
+
+	glEnable(GL_PRIMITIVE_RESTART_FIXED_INDEX);
+	glPrimitiveRestartIndex(2);
+}
-- 
2.1.0



More information about the Piglit mailing list