[Piglit] [PATCH v2 6/16] shader_runner: propagate all errors to piglit_init
Dylan Baker
dylan at pnwbakers.com
Fri Sep 30 21:17:39 UTC 2016
From: Marek Olšák <marek.olsak at amd.com>
piglit_report_result prevents running multiple tests per process.
---
tests/shaders/shader_runner.c | 229 +++++++++++++++++++++--------------
1 file changed, 139 insertions(+), 90 deletions(-)
diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c
index fe91e34..4c52194 100644
--- a/tests/shaders/shader_runner.c
+++ b/tests/shaders/shader_runner.c
@@ -360,7 +360,7 @@ target_to_short_name(GLenum target)
}
-static void
+static enum piglit_result
compile_glsl(GLenum target)
{
GLuint shader = glCreateShader(target);
@@ -368,33 +368,42 @@ compile_glsl(GLenum target)
switch (target) {
case GL_VERTEX_SHADER:
- piglit_require_vertex_shader();
+ if (piglit_get_gl_version() < 20 &&
+ !(piglit_is_extension_supported("GL_ARB_shader_objects") &&
+ piglit_is_extension_supported("GL_ARB_vertex_shader")))
+ return PIGLIT_SKIP;
break;
case GL_FRAGMENT_SHADER:
- piglit_require_fragment_shader();
+ if (piglit_get_gl_version() < 20 &&
+ !(piglit_is_extension_supported("GL_ARB_shader_objects") &&
+ piglit_is_extension_supported("GL_ARB_fragment_shader")))
+ return PIGLIT_SKIP;
break;
case GL_TESS_CONTROL_SHADER:
case GL_TESS_EVALUATION_SHADER:
if (gl_version.num < (gl_version.es ? 32 : 40))
- piglit_require_extension(gl_version.es ?
- "GL_OES_tessellation_shader" :
- "GL_ARB_tessellation_shader");
+ if (!piglit_is_extension_supported(gl_version.es ?
+ "GL_OES_tessellation_shader" :
+ "GL_ARB_tessellation_shader"))
+ return PIGLIT_SKIP;
break;
case GL_GEOMETRY_SHADER:
if (gl_version.num < 32)
- piglit_require_extension(gl_version.es ?
- "GL_OES_geometry_shader" :
- "GL_ARB_geometry_shader4");
+ if (!piglit_is_extension_supported(gl_version.es ?
+ "GL_OES_geometry_shader" :
+ "GL_ARB_geometry_shader4"))
+ return PIGLIT_SKIP;
break;
case GL_COMPUTE_SHADER:
if (gl_version.num < (gl_version.es ? 31 : 43))
- piglit_require_extension("GL_ARB_compute_shader");
+ if (!piglit_is_extension_supported("GL_ARB_compute_shader"))
+ return PIGLIT_SKIP;
break;
}
if (!glsl_req_version.num) {
printf("GLSL version requirement missing\n");
- piglit_report_result(PIGLIT_FAIL);
+ return PIGLIT_FAIL;
}
if (!strstr(shader_string, "#version ")) {
@@ -441,7 +450,7 @@ compile_glsl(GLenum target)
info);
free(info);
- piglit_report_result(PIGLIT_FAIL);
+ return PIGLIT_FAIL;
}
switch (target) {
@@ -470,9 +479,10 @@ compile_glsl(GLenum target)
num_compute_shaders++;
break;
}
+ return PIGLIT_PASS;
}
-static void
+static enum piglit_result
compile_and_bind_program(GLenum target, const char *start, int len)
{
GLuint prog;
@@ -480,10 +490,12 @@ compile_and_bind_program(GLenum target, const char *start, int len)
switch (target) {
case GL_VERTEX_PROGRAM_ARB:
- piglit_require_extension("GL_ARB_vertex_program");
+ if (!piglit_is_extension_supported("GL_ARB_vertex_program"))
+ return PIGLIT_SKIP;
break;
case GL_FRAGMENT_PROGRAM_ARB:
- piglit_require_extension("GL_ARB_fragment_program");
+ if (!piglit_is_extension_supported("GL_ARB_fragment_program"))
+ return PIGLIT_SKIP;
break;
}
@@ -496,9 +508,11 @@ compile_and_bind_program(GLenum target, const char *start, int len)
glBindProgramARB(target, prog);
link_ok = true;
prog_in_use = true;
+
+ return PIGLIT_PASS;
}
-static void
+static enum piglit_result
link_sso(GLenum target)
{
GLint ok;
@@ -521,9 +535,7 @@ link_sso(GLenum target)
prog_err_info);
free(prog_err_info);
- piglit_report_result(PIGLIT_FAIL);
-
- return;
+ return PIGLIT_FAIL;
}
switch (target) {
@@ -552,6 +564,7 @@ link_sso(GLenum target)
glUseProgramStages(pipeline, GL_COMPUTE_SHADER_BIT, prog);
break;
}
+ return PIGLIT_PASS;
}
/**
@@ -710,7 +723,7 @@ parse_version_comparison(const char *line, enum comparison *cmp,
/**
* Parse and check a line from the requirement section of the test
*/
-static void
+static enum piglit_result
process_requirement(const char *line)
{
char buffer[4096];
@@ -768,7 +781,7 @@ process_requirement(const char *line)
glGetIntegerv(int_enum, &gl_int_value);
if (!piglit_check_gl_error(GL_NO_ERROR)) {
fprintf(stderr, "Error reading %s\n", buffer);
- piglit_report_result(PIGLIT_FAIL);
+ return PIGLIT_FAIL;
}
if (!compare(comparison_value, gl_int_value, cmp)) {
@@ -778,10 +791,10 @@ process_requirement(const char *line)
comparison_string(cmp),
comparison_value,
gl_int_value);
- piglit_report_result(PIGLIT_SKIP);
+ return PIGLIT_SKIP;
}
- return;
+ return PIGLIT_PASS;
}
/* There are five types of requirements that a test can currently
@@ -817,9 +830,9 @@ process_requirement(const char *line)
comparison_string(cmp),
maxcomp,
*getint_limits[i].val);
- piglit_report_result(PIGLIT_SKIP);
+ return PIGLIT_SKIP;
}
- return;
+ return PIGLIT_PASS;
}
/* Consume any leading whitespace before requirements. This is
@@ -829,10 +842,12 @@ process_requirement(const char *line)
if (string_match("GL_", line)) {
strcpy_to_space(buffer, line);
- piglit_require_extension(buffer);
+ if (!piglit_is_extension_supported(buffer))
+ return PIGLIT_SKIP;
} else if (string_match("!GL_", line)) {
strcpy_to_space(buffer, line + 1);
- piglit_require_not_extension(buffer);
+ if (piglit_is_extension_supported(buffer))
+ return PIGLIT_SKIP;
} else if (string_match("GLSL", line)) {
enum comparison cmp;
@@ -843,7 +858,7 @@ process_requirement(const char *line)
* version number to insert a #version directive. */
if (cmp != greater_equal) {
printf("Unsupported GLSL version comparison\n");
- piglit_report_result(PIGLIT_FAIL);
+ return PIGLIT_FAIL;
}
if (!version_compare(&glsl_req_version, &glsl_version, cmp)) {
@@ -852,7 +867,7 @@ process_requirement(const char *line)
comparison_string(cmp),
version_string(&glsl_req_version),
version_string(&glsl_version));
- piglit_report_result(PIGLIT_SKIP);
+ return PIGLIT_SKIP;
}
} else if (string_match("GL", line)) {
enum comparison cmp;
@@ -867,7 +882,7 @@ process_requirement(const char *line)
comparison_string(cmp),
version_string(&gl_req_version),
version_string(&gl_version));
- piglit_report_result(PIGLIT_SKIP);
+ return PIGLIT_SKIP;
}
} else if (string_match("rlimit", line)) {
unsigned long lim;
@@ -878,7 +893,7 @@ process_requirement(const char *line)
lim = strtoul(line, &ptr, 0);
if (ptr == line) {
printf("rlimit requires numeric argument\n");
- piglit_report_result(PIGLIT_FAIL);
+ return PIGLIT_FAIL;
}
piglit_set_rlimit(lim);
@@ -898,6 +913,7 @@ process_requirement(const char *line)
glGenProgramPipelines(1, &pipeline);
}
}
+ return PIGLIT_PASS;
}
@@ -927,7 +943,7 @@ process_geometry_layout(const char *line)
}
-static void
+static enum piglit_result
leave_state(enum states state, const char *line)
{
switch (state) {
@@ -939,52 +955,44 @@ leave_state(enum states state, const char *line)
case vertex_shader:
shader_string_size = line - shader_string;
- compile_glsl(GL_VERTEX_SHADER);
- break;
+ return compile_glsl(GL_VERTEX_SHADER);
case vertex_shader_passthrough:
- compile_glsl(GL_VERTEX_SHADER);
- break;
+ return compile_glsl(GL_VERTEX_SHADER);
case vertex_program:
- compile_and_bind_program(GL_VERTEX_PROGRAM_ARB,
- shader_string,
- line - shader_string);
- break;
+ return compile_and_bind_program(GL_VERTEX_PROGRAM_ARB,
+ shader_string,
+ line - shader_string);
case tess_ctrl_shader:
shader_string_size = line - shader_string;
- compile_glsl(GL_TESS_CONTROL_SHADER);
- break;
+ return compile_glsl(GL_TESS_CONTROL_SHADER);
case tess_eval_shader:
shader_string_size = line - shader_string;
- compile_glsl(GL_TESS_EVALUATION_SHADER);
- break;
+ return compile_glsl(GL_TESS_EVALUATION_SHADER);
case geometry_shader:
shader_string_size = line - shader_string;
- compile_glsl(GL_GEOMETRY_SHADER);
- break;
+ return compile_glsl(GL_GEOMETRY_SHADER);
case geometry_layout:
break;
case fragment_shader:
shader_string_size = line - shader_string;
- compile_glsl(GL_FRAGMENT_SHADER);
- break;
+ return compile_glsl(GL_FRAGMENT_SHADER);
case fragment_program:
- compile_and_bind_program(GL_FRAGMENT_PROGRAM_ARB,
- shader_string,
- line - shader_string);
+ return compile_and_bind_program(GL_FRAGMENT_PROGRAM_ARB,
+ shader_string,
+ line - shader_string);
break;
case compute_shader:
shader_string_size = line - shader_string;
- compile_glsl(GL_COMPUTE_SHADER);
- break;
+ return compile_glsl(GL_COMPUTE_SHADER);
case vertex_data:
vertex_data_end = line;
@@ -996,14 +1004,15 @@ leave_state(enum states state, const char *line)
default:
assert(!"Not yet supported.");
}
+ return PIGLIT_PASS;
}
-static void
+static enum piglit_result
process_shader(GLenum target, unsigned num_shaders, GLuint *shaders)
{
if (num_shaders == 0)
- return;
+ return PIGLIT_PASS;
if (sso_in_use) {
prog = glCreateProgram();
@@ -1037,14 +1046,16 @@ process_shader(GLenum target, unsigned num_shaders, GLuint *shaders)
glBindAttribLocation(prog, PIGLIT_ATTRIB_TEX, "piglit_texcoord");
if (sso_in_use) {
- link_sso(target);
+ return link_sso(target);
}
+ return PIGLIT_PASS;
}
-static void
+static enum piglit_result
link_and_use_shaders(void)
{
+ enum piglit_result result;
unsigned i;
GLenum err;
GLint ok;
@@ -1055,17 +1066,29 @@ link_and_use_shaders(void)
&& (num_tess_eval_shaders == 0)
&& (num_geometry_shaders == 0)
&& (num_compute_shaders == 0))
- return;
+ return PIGLIT_PASS;
if (!sso_in_use)
prog = glCreateProgram();
- process_shader(GL_VERTEX_SHADER, num_vertex_shaders, vertex_shaders);
- process_shader(GL_TESS_CONTROL_SHADER, num_tess_ctrl_shaders, tess_ctrl_shaders);
- process_shader(GL_TESS_EVALUATION_SHADER, num_tess_eval_shaders, tess_eval_shaders);
- process_shader(GL_GEOMETRY_SHADER, num_geometry_shaders, geometry_shaders);
- process_shader(GL_FRAGMENT_SHADER, num_fragment_shaders, fragment_shaders);
- process_shader(GL_COMPUTE_SHADER, num_compute_shaders, compute_shaders);
+ result = process_shader(GL_VERTEX_SHADER, num_vertex_shaders, vertex_shaders);
+ if (result != PIGLIT_PASS)
+ return result;
+ result = process_shader(GL_TESS_CONTROL_SHADER, num_tess_ctrl_shaders, tess_ctrl_shaders);
+ if (result != PIGLIT_PASS)
+ return result;
+ result = process_shader(GL_TESS_EVALUATION_SHADER, num_tess_eval_shaders, tess_eval_shaders);
+ if (result != PIGLIT_PASS)
+ return result;
+ result = process_shader(GL_GEOMETRY_SHADER, num_geometry_shaders, geometry_shaders);
+ if (result != PIGLIT_PASS)
+ return result;
+ result = process_shader(GL_FRAGMENT_SHADER, num_fragment_shaders, fragment_shaders);
+ if (result != PIGLIT_PASS)
+ return result;
+ result = process_shader(GL_COMPUTE_SHADER, num_compute_shaders, compute_shaders);
+ if (result != PIGLIT_PASS)
+ return result;
if (!sso_in_use)
glLinkProgram(prog);
@@ -1106,7 +1129,7 @@ link_and_use_shaders(void)
glGetProgramInfoLog(prog, size, NULL, prog_err_info);
- return;
+ return PIGLIT_PASS;
}
glUseProgram(prog);
@@ -1123,10 +1146,11 @@ link_and_use_shaders(void)
glGetProgramInfoLog(prog, size, NULL, prog_err_info);
}
+ return PIGLIT_PASS;
}
-static void
+static enum piglit_result
process_test_script(const char *script_name)
{
unsigned text_size;
@@ -1134,17 +1158,20 @@ process_test_script(const char *script_name)
char *text = piglit_load_text_file(script_name, &text_size);
enum states state = none;
const char *line = text;
+ enum piglit_result result;
if (line == NULL) {
printf("could not read file \"%s\"\n", script_name);
- piglit_report_result(PIGLIT_FAIL);
+ return PIGLIT_FAIL;
}
line_num = 1;
while (line[0] != '\0') {
if (line[0] == '[') {
- leave_state(state, line);
+ result = leave_state(state, line);
+ if (result != PIGLIT_PASS)
+ return result;
if (string_match("[require]", line)) {
state = requirements;
@@ -1188,12 +1215,12 @@ process_test_script(const char *script_name)
test_start_line_num = line_num + 1;
if (test_start[0] != '\0')
test_start++;
- return;
+ return PIGLIT_PASS;
} else {
fprintf(stderr,
"Unknown section in test script. "
"Perhaps missing closing ']'?\n");
- piglit_report_result(PIGLIT_FAIL);
+ return PIGLIT_FAIL;
}
} else {
switch (state) {
@@ -1202,7 +1229,9 @@ process_test_script(const char *script_name)
break;
case requirements:
- process_requirement(line);
+ result = process_requirement(line);
+ if (result != PIGLIT_PASS)
+ return result;
break;
case geometry_layout:
@@ -1238,7 +1267,7 @@ process_test_script(const char *script_name)
line_num++;
}
- leave_state(state, line);
+ return leave_state(state, line);
}
struct requirement_parse_results {
@@ -2743,17 +2772,17 @@ setup_ubos(void)
}
}
-static void
+static enum piglit_result
program_must_be_in_use(void)
{
if (!link_ok) {
fprintf(stderr, "Failed to link:\n%s\n", prog_err_info);
- piglit_report_result(PIGLIT_FAIL);
+ return PIGLIT_FAIL;
} else if (!prog_in_use) {
fprintf(stderr, "Failed to use program: %s\n", prog_err_info);
- piglit_report_result(PIGLIT_FAIL);
+ return PIGLIT_FAIL;
}
-
+ return PIGLIT_PASS;
}
static void
@@ -3417,6 +3446,36 @@ piglit_display(void)
return full_result;
}
+static enum piglit_result
+init_test(const char *file)
+{
+ enum piglit_result result;
+
+ result = process_test_script(file);
+ if (result != PIGLIT_PASS)
+ return result;
+
+ result = link_and_use_shaders();
+ if (result != PIGLIT_PASS)
+ return result;
+
+ if (sso_in_use)
+ glBindProgramPipeline(pipeline);
+
+ if (link_ok && vertex_data_start != NULL) {
+ result = program_must_be_in_use();
+ if (result != PIGLIT_PASS)
+ return result;
+
+ bind_vao_if_supported();
+
+ num_vbo_rows = setup_vbo_from_text(prog, vertex_data_start,
+ vertex_data_end);
+ vbo_present = true;
+ }
+ setup_ubos();
+ return PIGLIT_PASS;
+}
void
piglit_init(int argc, char **argv)
@@ -3425,6 +3484,7 @@ piglit_init(int argc, char **argv)
int minor;
bool core = piglit_is_core_profile;
bool es;
+ enum piglit_result result;
piglit_require_GLSL();
@@ -3479,21 +3539,10 @@ piglit_init(int argc, char **argv)
exit(1);
}
- process_test_script(argv[1]);
- link_and_use_shaders();
- if (sso_in_use)
- glBindProgramPipeline(pipeline);
-
- if (link_ok && vertex_data_start != NULL) {
- program_must_be_in_use();
- bind_vao_if_supported();
-
- num_vbo_rows = setup_vbo_from_text(prog, vertex_data_start,
- vertex_data_end);
- vbo_present = true;
- }
- setup_ubos();
+ result = init_test(argv[1]);
+ if (result != PIGLIT_PASS)
+ piglit_report_result(result);
render_width = piglit_width;
render_height = piglit_height;
--
git-series 0.8.10
More information about the Piglit
mailing list