[Piglit] [PATCH 04/10] nv_conditional_render: port tests to gles3

[Ilia Mirkin]

Unless there's something that makes this a pain for ES2, I'd rather
these tests were runnable with gl_es_version = 20. You can test with
MESA_GLES_VERSION_OVERRIDE=20.
On Mon, Nov 5, 2018 at 12:23 PM Erik Faye-Lund
<erik.faye-lund at collabora.com> wrote:
>
> These two tests are trivial to port to GLES 3.
>
> Signed-off-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
> ---
>  tests/spec/nv_conditional_render/CMakeLists.gles3.txt | 6 ++++++
>  tests/spec/nv_conditional_render/begin-while-active.c | 4 ++++
>  tests/spec/nv_conditional_render/begin-zero.c         | 5 +++++
>  3 files changed, 15 insertions(+)
>  create mode 100644 tests/spec/nv_conditional_render/CMakeLists.gles3.txt
>
> diff --git a/tests/spec/nv_conditional_render/CMakeLists.gles3.txt b/tests/spec/nv_conditional_render/CMakeLists.gles3.txt
> new file mode 100644
> index 000000000..5cd5970ff
> --- /dev/null
> +++ b/tests/spec/nv_conditional_render/CMakeLists.gles3.txt
> @@ -0,0 +1,6 @@
> +link_libraries(piglitutil_${piglit_target_api})
> +
> +piglit_add_executable (nv_conditional_render-begin-while-active_gles3 begin-while-active.c)
> +piglit_add_executable (nv_conditional_render-begin-zero_gles3 begin-zero.c)
> +
> +# vim: ft=cmake:
> diff --git a/tests/spec/nv_conditional_render/begin-while-active.c b/tests/spec/nv_conditional_render/begin-while-active.c
> index 821544113..9b8488763 100644
> --- a/tests/spec/nv_conditional_render/begin-while-active.c
> +++ b/tests/spec/nv_conditional_render/begin-while-active.c
> @@ -42,7 +42,11 @@
>
>  PIGLIT_GL_TEST_CONFIG_BEGIN
>
> +#ifdef PIGLIT_USE_OPENGL
>         config.supports_gl_compat_version = 10;
> +#else // PIGLIT_USE_OPENGL_ES3
> +       config.supports_gl_es_version = 30;
> +#endif
>
>         config.window_visual = PIGLIT_GL_VISUAL_RGBA;
>         config.khr_no_error_support = PIGLIT_HAS_ERRORS;
> diff --git a/tests/spec/nv_conditional_render/begin-zero.c b/tests/spec/nv_conditional_render/begin-zero.c
> index 85304643c..0777d5c70 100644
> --- a/tests/spec/nv_conditional_render/begin-zero.c
> +++ b/tests/spec/nv_conditional_render/begin-zero.c
> @@ -40,7 +40,12 @@
>
>  PIGLIT_GL_TEST_CONFIG_BEGIN
>
> +#ifdef PIGLIT_USE_OPENGL
>         config.supports_gl_compat_version = 10;
> +#else // PIGLIT_USE_OPENGL_ES3
> +       config.supports_gl_es_version = 30;
> +#endif
> +
>         config.window_visual = PIGLIT_GL_VISUAL_RGBA;
>         config.khr_no_error_support = PIGLIT_HAS_ERRORS;
>
> --
> 2.19.1
>
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/piglit