[Piglit] [PATCH 3/3] ext_transform_feedback: use default window size
Jose Fonseca
jfonseca at vmware.com
Thu Jun 5 05:51:44 PDT 2014
Looks ok. Though I still wonder if it wouldn't be to do as I suggested in another similar review request -- to treat config.window_width/height as "minimum" values, as opposed to maximum values. That is, something along the lines of
diff --git a/tests/util/piglit-framework-gl.c b/tests/util/piglit-framework-gl.c
index a97babc..aa91625 100644
--- a/tests/util/piglit-framework-gl.c
+++ b/tests/util/piglit-framework-gl.c
@@ -138,6 +138,15 @@ void
piglit_gl_test_run(int argc, char *argv[],
const struct piglit_gl_test_config *config)
{
+#ifdef _WIN32
+ struct piglit_gl_test_config modified_config = *config;
+ if (modified_config.window_width < 160)
+ modified_config.window_width = 160;
+ if (modified_config.window_height < 160)
+ modified_config.window_height = 160;
+ config = &modified_config;
+#endif
+
piglit_width = config->window_width;
piglit_height = config->window_height;
Jose
----- Original Message -----
> These tests need no other changes. Again, this is to avoid the "spurious
> window resize" issue on Windows when the initial window size is too small.
> ---
> tests/spec/ext_transform_feedback/alignment.c | 3 ---
> tests/spec/ext_transform_feedback/api-errors.c | 3 ---
> tests/spec/ext_transform_feedback/get-buffer-state.c | 2 --
> tests/spec/ext_transform_feedback/intervening-read.c | 2 --
> tests/spec/ext_transform_feedback/output-type.c | 3 ---
> tests/spec/ext_transform_feedback/overflow-edge-cases.c | 2 --
> tests/spec/ext_transform_feedback/primgen.c | 3 ---
> tests/spec/ext_transform_feedback/separate.c | 3 ---
> 8 files changed, 21 deletions(-)
>
> diff --git a/tests/spec/ext_transform_feedback/alignment.c
> b/tests/spec/ext_transform_feedback/alignment.c
> index aedc0f2..440a44e 100644
> --- a/tests/spec/ext_transform_feedback/alignment.c
> +++ b/tests/spec/ext_transform_feedback/alignment.c
> @@ -39,9 +39,6 @@
> PIGLIT_GL_TEST_CONFIG_BEGIN
>
> config.supports_gl_compat_version = 10;
> -
> - config.window_width = 10;
> - config.window_height = 10;
> config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
>
> PIGLIT_GL_TEST_CONFIG_END
> diff --git a/tests/spec/ext_transform_feedback/api-errors.c
> b/tests/spec/ext_transform_feedback/api-errors.c
> index 737dc20..23ff37c 100644
> --- a/tests/spec/ext_transform_feedback/api-errors.c
> +++ b/tests/spec/ext_transform_feedback/api-errors.c
> @@ -53,9 +53,6 @@
> PIGLIT_GL_TEST_CONFIG_BEGIN
>
> config.supports_gl_compat_version = 10;
> -
> - config.window_width = 16;
> - config.window_height = 16;
> config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB;
>
> PIGLIT_GL_TEST_CONFIG_END
> diff --git a/tests/spec/ext_transform_feedback/get-buffer-state.c
> b/tests/spec/ext_transform_feedback/get-buffer-state.c
> index c5a8107..55bd2d2 100644
> --- a/tests/spec/ext_transform_feedback/get-buffer-state.c
> +++ b/tests/spec/ext_transform_feedback/get-buffer-state.c
> @@ -34,8 +34,6 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
>
> config.supports_gl_compat_version = 10;
>
> - config.window_width = 16;
> - config.window_height = 16;
> config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB;
>
> PIGLIT_GL_TEST_CONFIG_END
> diff --git a/tests/spec/ext_transform_feedback/intervening-read.c
> b/tests/spec/ext_transform_feedback/intervening-read.c
> index 2c356a6..d161979 100644
> --- a/tests/spec/ext_transform_feedback/intervening-read.c
> +++ b/tests/spec/ext_transform_feedback/intervening-read.c
> @@ -69,8 +69,6 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> config.supports_gl_core_version = 31;
> }
>
> - config.window_width = 64;
> - config.window_height = 32;
> config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB;
>
> PIGLIT_GL_TEST_CONFIG_END
> diff --git a/tests/spec/ext_transform_feedback/output-type.c
> b/tests/spec/ext_transform_feedback/output-type.c
> index 9f189e2..dc5ceed 100644
> --- a/tests/spec/ext_transform_feedback/output-type.c
> +++ b/tests/spec/ext_transform_feedback/output-type.c
> @@ -33,9 +33,6 @@
> PIGLIT_GL_TEST_CONFIG_BEGIN
>
> config.supports_gl_compat_version = 10;
> -
> - config.window_width = 64;
> - config.window_height = 32;
> config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
>
> PIGLIT_GL_TEST_CONFIG_END
> diff --git a/tests/spec/ext_transform_feedback/overflow-edge-cases.c
> b/tests/spec/ext_transform_feedback/overflow-edge-cases.c
> index e56d5cf..42db6bd 100644
> --- a/tests/spec/ext_transform_feedback/overflow-edge-cases.c
> +++ b/tests/spec/ext_transform_feedback/overflow-edge-cases.c
> @@ -63,8 +63,6 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> config.supports_gl_core_version = 31;
> }
>
> - config.window_width = 16;
> - config.window_height = 16;
> config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB;
>
> PIGLIT_GL_TEST_CONFIG_END
> diff --git a/tests/spec/ext_transform_feedback/primgen.c
> b/tests/spec/ext_transform_feedback/primgen.c
> index caa0bc0..37282ce 100644
> --- a/tests/spec/ext_transform_feedback/primgen.c
> +++ b/tests/spec/ext_transform_feedback/primgen.c
> @@ -34,9 +34,6 @@
> PIGLIT_GL_TEST_CONFIG_BEGIN
>
> config.supports_gl_compat_version = 10;
> -
> - config.window_width = 64;
> - config.window_height = 32;
> config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
>
> PIGLIT_GL_TEST_CONFIG_END
> diff --git a/tests/spec/ext_transform_feedback/separate.c
> b/tests/spec/ext_transform_feedback/separate.c
> index 5c4d617..a03ded8 100644
> --- a/tests/spec/ext_transform_feedback/separate.c
> +++ b/tests/spec/ext_transform_feedback/separate.c
> @@ -32,9 +32,6 @@
> PIGLIT_GL_TEST_CONFIG_BEGIN
>
> config.supports_gl_compat_version = 10;
> -
> - config.window_width = 64;
> - config.window_height = 32;
> config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
>
> PIGLIT_GL_TEST_CONFIG_END
> --
> 1.7.10.4
>
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> https://urldefense.proofpoint.com/v1/url?u=http://lists.freedesktop.org/mailman/listinfo/piglit&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=NMr9uy2iTjWVixC0wOcYCWEIYhfo80qKwRgdodpoDzA%3D%0A&m=RekgXLz%2BKaSkpS%2BmVmDamMm3uL1zY%2BSA%2FKBQsfrh%2BpU%3D%0A&s=c30e83989597cfb5474e9fdd20c8cffcca68a33867bc6717a97f3b443f7fad07
>
More information about the Piglit
mailing list