diff options
| -rw-r--r-- | run.c | 30 |
1 files changed, 19 insertions, 11 deletions
@@ -50,6 +50,8 @@ #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +bool verbose = 0; + struct context_info { char *extension_string; int extension_string_len; @@ -124,15 +126,17 @@ get_shaders(const struct context_info *core, const struct context_info *compat, if (version <= 130) { if (unlikely(version > compat->max_glsl_version)) { - fprintf(stderr, "SKIP: %s requires GLSL %ld\n", - shader_name, version); + if (verbose) + fprintf(stderr, "SKIP: %s requires GLSL %ld\n", + shader_name, version); return NULL; } *type = TYPE_COMPAT; } else { if (unlikely(version > core->max_glsl_version)) { - fprintf(stderr, "SKIP: %s requires GLSL %ld\n", - shader_name, version); + if (verbose) + fprintf(stderr, "SKIP: %s requires GLSL %ld\n", + shader_name, version); return NULL; } *type = TYPE_CORE; @@ -144,8 +148,9 @@ get_shaders(const struct context_info *core, const struct context_info *compat, long version = major * 100 + minor; if (unlikely(version > es->max_glsl_version)) { - fprintf(stderr, "SKIP: %s requires GLSL ES %ld\n", - shader_name, version); + if (verbose) + fprintf(stderr, "SKIP: %s requires GLSL ES %ld\n", + shader_name, version); return NULL; } *type = TYPE_ES; @@ -170,8 +175,9 @@ get_shaders(const struct context_info *core, const struct context_info *compat, if (memmem(info->extension_string, info->extension_string_len, extension_text, newline - extension_text) == NULL) { - fprintf(stderr, "SKIP: %s requires unavailable extension %.*s\n", - shader_name, (int)(newline - extension_text), extension_text); + if (verbose) + fprintf(stderr, "SKIP: %s requires unavailable extension %.*s\n", + shader_name, (int)(newline - extension_text), extension_text); return NULL; } @@ -379,7 +385,7 @@ void print_usage(const char *prog_name) { fprintf(stderr, "Usage: %s [-d <device>] [-j <max_threads>] [-o <driver>] " - "[-b] <directories and *.shader_test files>\n", + "[-b] [-v] <directories and *.shader_test files>\n", prog_name); } @@ -445,10 +451,9 @@ main(int argc, char **argv) int device_id = 0; int opt; bool generate_prog_bin = 0; - max_threads = omp_get_max_threads(); - while ((opt = getopt(argc, argv, "d:j:o:b")) != -1) { + while ((opt = getopt(argc, argv, "d:j:o:b:v")) != -1) { switch(opt) { case 'd': { char *endptr; @@ -471,6 +476,9 @@ main(int argc, char **argv) case 'b': generate_prog_bin = 1; break; + case 'v': + verbose = 1; + break; default: print_usage(argv[0]); return -1; |