summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Justen <jordan.l.justen@intel.com>2018-01-31 15:46:03 -0800
committerJordan Justen <jordan.l.justen@intel.com>2018-05-09 10:44:11 -0700
commit0ecc0d643167528ccfcd8182d1786818305f9953 (patch)
tree6e1e83d1dee86f187ef1f00a1743f7de901b396e
parentb005897bd5272a21a2db6deb2420c6ae4e313344 (diff)
shader_runner: Support PIGLIT_DEFAULT_SIZE env var
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com>
-rw-r--r--tests/shaders/shader_runner.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c
index c1d4c9265..c2b27ad20 100644
--- a/tests/shaders/shader_runner.c
+++ b/tests/shaders/shader_runner.c
@@ -46,8 +46,10 @@ decode_drawing_mode(const char *mode_str);
PIGLIT_GL_TEST_CONFIG_BEGIN
- config.window_width = DEFAULT_WINDOW_WIDTH;
- config.window_height = DEFAULT_WINDOW_HEIGHT;
+ if (!piglit_gl_test_config_override_size(&config)) {
+ config.window_width = DEFAULT_WINDOW_WIDTH;
+ config.window_height = DEFAULT_WINDOW_HEIGHT;
+ }
config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
config.khr_no_error_support = PIGLIT_NO_ERRORS;
@@ -3972,8 +3974,10 @@ validate_current_gl_context(const char *filename)
{
struct piglit_gl_test_config config = { 0 };
- config.window_width = DEFAULT_WINDOW_WIDTH;
- config.window_height = DEFAULT_WINDOW_HEIGHT;
+ if (!piglit_gl_test_config_override_size(&config)) {
+ config.window_width = DEFAULT_WINDOW_WIDTH;
+ config.window_height = DEFAULT_WINDOW_HEIGHT;
+ }
get_required_config(filename, &config);