[Piglit] [PATCH 1/5] arb_compute_shader: Add common functions to generate a CS program

Jordan Justen jordan.l.justen at intel.com
Sat Sep 19 14:44:31 PDT 2015


These are a very simplified version of the similar image load/store
versions.

Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
---
 tests/spec/arb_compute_shader/CMakeLists.gl.txt |  2 +
 tests/spec/arb_compute_shader/common.c          | 98 +++++++++++++++++++++++++
 tests/spec/arb_compute_shader/common.h          | 52 +++++++++++++
 3 files changed, 152 insertions(+)
 create mode 100644 tests/spec/arb_compute_shader/common.c
 create mode 100644 tests/spec/arb_compute_shader/common.h

diff --git a/tests/spec/arb_compute_shader/CMakeLists.gl.txt b/tests/spec/arb_compute_shader/CMakeLists.gl.txt
index a3367a7..4ef0446 100644
--- a/tests/spec/arb_compute_shader/CMakeLists.gl.txt
+++ b/tests/spec/arb_compute_shader/CMakeLists.gl.txt
@@ -13,4 +13,6 @@ link_libraries (
 piglit_add_executable (arb_compute_shader-api_errors api_errors.c)
 piglit_add_executable (arb_compute_shader-minmax minmax.c)
 
+set(depends common.c)
+
 # vim: ft=cmake:
diff --git a/tests/spec/arb_compute_shader/common.c b/tests/spec/arb_compute_shader/common.c
new file mode 100644
index 0000000..c2d98b7
--- /dev/null
+++ b/tests/spec/arb_compute_shader/common.c
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2014 - 2015 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 common.c
+ *
+ * Utility code for building a compute shader program.
+ */
+
+#include "common.h"
+
+char *
+concat(char *hunk0, ...)
+{
+	char *s = hunk0;
+	char *hunk;
+	va_list ap;
+
+	va_start(ap, hunk0);
+
+	while ((hunk = va_arg(ap, char *))) {
+		char *t = s;
+		asprintf(&s, "%s\n%s", t, hunk);
+		free(t);
+		free(hunk);
+	}
+
+	va_end(ap);
+	return s;
+}
+
+GLuint
+generate_cs_prog(unsigned x, unsigned y, unsigned z, char *ext,
+		 char *src)
+{
+	char *source = NULL;
+
+	if (ext == NULL)
+		ext = hunk("");
+
+	asprintf(&source,
+		 "#version 330\n"
+		 "#extension GL_ARB_compute_shader : enable\n"
+		 "%s\n"
+		 "layout(local_size_x = %d, local_size_y = %d, local_size_z = %d) in;\n"
+		 "\n"
+		 "%s\n",
+		 ext,
+		 x, y, z,
+		 src
+		 );
+	free(ext);
+	free(src);
+
+	GLuint prog = glCreateProgram();
+
+	GLuint shader =
+		piglit_compile_shader_text_nothrow(GL_COMPUTE_SHADER, source);
+
+	free(source);
+
+	if (!shader) {
+		glDeleteProgram(prog);
+		return 0;
+	}
+
+	glAttachShader(prog, shader);
+
+	glLinkProgram(prog);
+
+	glDeleteShader(shader);
+
+	if (!piglit_link_check_status(prog)) {
+		glDeleteProgram(prog);
+		return 0;
+	}
+
+	return prog;
+}
diff --git a/tests/spec/arb_compute_shader/common.h b/tests/spec/arb_compute_shader/common.h
new file mode 100644
index 0000000..e870827
--- /dev/null
+++ b/tests/spec/arb_compute_shader/common.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2014 -2015 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 common.h
+ *
+ * Common utility functions for the ARB_compute_shader tests.
+ */
+
+#ifndef __PIGLIT_ARB_COMPUTE_SHADER_COMMON_H__
+#define __PIGLIT_ARB_COMPUTE_SHADER_COMMON_H__
+
+#include "piglit-util-gl.h"
+
+/**
+ * Concatenate a variable number of strings into a newly allocated
+ * buffer.  Note that concat() assumes ownership of the provided
+ * arguments and that the argument list must be NULL-terminated.
+ */
+char *
+concat(char *hunk0, ...);
+
+static inline char *
+hunk(const char *s)
+{
+	return strdup(s);
+}
+
+GLuint
+generate_cs_prog(unsigned x, unsigned y, unsigned z, char *ext,
+		 char *src);
+
+#endif
-- 
2.5.1



More information about the Piglit mailing list