On 5 January 2013 01:07, Chris Forbes <chr...@ijw.co.nz> wrote:
> Verifies new minimum maximums in ARB_texture_multisample:
>
> GL_MAX_COLOR_TEXTURE_SAMPLES >= 1
> GL_MAX_DEPTH_TEXTURE_SAMPLES >= 1
> GL_MAX_INTEGER_SAMPLES >= 1
> GL_MAX_SAMPLE_MASK_WORDS >= 1
>
> Signed-off-by: Chris Forbes <chr...@ijw.co.nz>
> ---
> tests/all.tests | 5 ++++
> .../spec/arb_texture_multisample/CMakeLists.gl.txt | 1 +
> tests/spec/arb_texture_multisample/minmax.c | 32
> ++++++++++++++++++++++
> 3 files changed, 38 insertions(+)
> create mode 100644 tests/spec/arb_texture_multisample/minmax.c
>
> diff --git a/tests/all.tests b/tests/all.tests
> index 7053989..acaf1ad 100644
> --- a/tests/all.tests
> +++ b/tests/all.tests
> @@ -840,6 +840,11 @@ arb_point_sprite = Group()
> spec['ARB_point_sprite'] = arb_point_sprite
> add_plain_test(arb_point_sprite, 'point-sprite')
>
> +# Group ARB_texture_multisample
> +arb_texture_multisample = Group()
> +spec['ARB_texture_multisample'] = arb_texture_multisample
> +add_concurrent_test(arb_texture_multisample,
> 'arb_texture_multisample-minmax')
> +
> # Group AMD_shader_stencil_export
> spec['AMD_shader_stencil_export'] = Group()
> import_glsl_parser_tests(spec['AMD_shader_stencil_export'],
> diff --git a/tests/spec/arb_texture_multisample/CMakeLists.gl.txt
> b/tests/spec/arb_texture_multisample/CMakeLists.gl.txt
> index c37afac..90dae9e 100644
> --- a/tests/spec/arb_texture_multisample/CMakeLists.gl.txt
> +++ b/tests/spec/arb_texture_multisample/CMakeLists.gl.txt
> @@ -10,5 +10,6 @@ link_libraries (
> ${OPENGL_glu_LIBRARY}
> )
>
> +piglit_add_executable (arb_texture_multisample-minmax minmax.c)
>
> # vim: ft=cmake:
> diff --git a/tests/spec/arb_texture_multisample/minmax.c
> b/tests/spec/arb_texture_multisample/minmax.c
> new file mode 100644
> index 0000000..1bfcbcb
> --- /dev/null
> +++ b/tests/spec/arb_texture_multisample/minmax.c
> @@ -0,0 +1,32 @@
> +#include "piglit-util-gl-common.h"
> +#include "minmax-test.h"
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +
> + config.supports_gl_compat_version = 10;
> + config.supports_gl_core_version = 31;
> + config.window_width = 32;
> + config.window_height = 32;
>
Window height/width less than 116 pixels cause problems when Piglit is run
on windows (because Windows forcibly resizes the window, causing the Piglit
framework to report the test result as "WARN" instead of "PASS"). Since
you're not actually drawing anything in the window for this test, I would
just eliminate these two lines, so that the window width and height are
left at the default size.
> + config.window_visual = PIGLIT_GL_VISUAL_RGB;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> + piglit_require_extension("GL_ARB_texture_multisample");
> + piglit_print_minmax_header();
> +
> + piglit_test_min_int(GL_MAX_SAMPLE_MASK_WORDS, 1);
> + piglit_test_min_int(GL_MAX_COLOR_TEXTURE_SAMPLES, 1);
> + piglit_test_min_int(GL_MAX_DEPTH_TEXTURE_SAMPLES, 1);
> + piglit_test_min_int(GL_MAX_INTEGER_SAMPLES, 1);
> +
> + piglit_report_result(PIGLIT_PASS);
>
This line needs to be "piglit_report_result(piglit_minmax_pass ?
PIGLIT_PASS : PIGLIT_FAIL)". Otherwise, the test will pass even if one of
the minmax checks fails.
> +}
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> + return PIGLIT_FAIL;
> +}
> --
> 1.8.1
>
> _______________________________________________
> Piglit mailing list
> Piglit@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit
>
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit
