[Piglit] [PATCH] arb_shader_draw_parameters: test define

[Timothy Arceri]

Cc: Ilia Mirkin 
---
 .../arb_shader_draw_parameters/compiler/define.vert   | 19 +++
 1 file changed, 19 insertions(+)
 create mode 100644 tests/spec/arb_shader_draw_parameters/compiler/define.vert

diff --git a/tests/spec/arb_shader_draw_parameters/compiler/define.vert 
b/tests/spec/arb_shader_draw_parameters/compiler/define.vert
new file mode 100644
index 000..0ac10ef
--- /dev/null
+++ b/tests/spec/arb_shader_draw_parameters/compiler/define.vert
@@ -0,0 +1,19 @@
+// [config]
+// expect_result: pass
+// glsl_version: 1.30
+// require_extensions: GL_ARB_shader_draw_parameters
+// [end config]
+
+#version 130
+#extension GL_ARB_shader_draw_parameters: require
+
+#if !defined GL_ARB_shader_draw_parameters
+#  error GL_ARB_shader_draw_parameters is not defined
+#elif GL_ARB_shader_draw_parameters != 1
+#  error GL_ARB_shader_draw_parameters is not equal to 1
+#endif
+
+/* Some compilers generate spurious errors if a shader does not contain
+ * any code or declarations.
+ */
+int foo(void) { return 1; }
-- 
2.4.3

___
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit

Re: [Piglit] [PATCH] arb_shader_draw_parameters: test define

[Ilia Mirkin]

Hm, the spec wants GL 3.1, i.e. #version 140. I think it got left
enabled in mesa for compat so that it's available there, but the
piglit tests should go with what's in the spec. With that fixed,

Reviewed-by: Ilia Mirkin 

On Wed, Dec 30, 2015 at 7:17 PM, Timothy Arceri
 wrote:
> Cc: Ilia Mirkin 
> ---
>  .../arb_shader_draw_parameters/compiler/define.vert   | 19 
> +++
>  1 file changed, 19 insertions(+)
>  create mode 100644 tests/spec/arb_shader_draw_parameters/compiler/define.vert
>
> diff --git a/tests/spec/arb_shader_draw_parameters/compiler/define.vert 
> b/tests/spec/arb_shader_draw_parameters/compiler/define.vert
> new file mode 100644
> index 000..0ac10ef
> --- /dev/null
> +++ b/tests/spec/arb_shader_draw_parameters/compiler/define.vert
> @@ -0,0 +1,19 @@
> +// [config]
> +// expect_result: pass
> +// glsl_version: 1.30
> +// require_extensions: GL_ARB_shader_draw_parameters
> +// [end config]
> +
> +#version 130
> +#extension GL_ARB_shader_draw_parameters: require
> +
> +#if !defined GL_ARB_shader_draw_parameters
> +#  error GL_ARB_shader_draw_parameters is not defined
> +#elif GL_ARB_shader_draw_parameters != 1
> +#  error GL_ARB_shader_draw_parameters is not equal to 1
> +#endif
> +
> +/* Some compilers generate spurious errors if a shader does not contain
> + * any code or declarations.
> + */
> +int foo(void) { return 1; }
> --
> 2.4.3
>
___
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit

Re: [Piglit] [PATCH] Add tests for GL_ARB_shader_draw_parameters

[Ilia Mirkin]

While these all look fine, it appears that there are no tests for
gl[Multi]DrawArraysIndirect.

On Wed, Dec 16, 2015 at 7:17 PM, Kristian Høgsberg  wrote:
> From: Kristian Høgsberg Kristensen 
>
> ---
>
> v2: Fix copy-paste error in drawid-indirect-vertexid case.
>
>  tests/all.py   |  15 ++
>  tests/spec/CMakeLists.txt  |   1 +
>  .../arb_shader_draw_parameters/CMakeLists.gl.txt   |  14 ++
>  .../spec/arb_shader_draw_parameters/CMakeLists.txt |   1 +
>  tests/spec/arb_shader_draw_parameters/basevertex.c | 176 +
>  .../arb_shader_draw_parameters/drawid-indirect.c   | 216 
> +
>  tests/spec/arb_shader_draw_parameters/drawid.c | 173 +
>  7 files changed, 596 insertions(+)
>  create mode 100644 tests/spec/arb_shader_draw_parameters/CMakeLists.gl.txt
>  create mode 100644 tests/spec/arb_shader_draw_parameters/CMakeLists.txt
>  create mode 100644 tests/spec/arb_shader_draw_parameters/basevertex.c
>  create mode 100644 tests/spec/arb_shader_draw_parameters/drawid-indirect.c
>  create mode 100644 tests/spec/arb_shader_draw_parameters/drawid.c
>
> diff --git a/tests/all.py b/tests/all.py
> index f61ff15..39cffbb 100644
> --- a/tests/all.py
> +++ b/tests/all.py
> @@ -4552,5 +4552,20 @@ with profile.group_manager(
>  for sample_count in (str(x) for x in MSAA_SAMPLE_COUNTS):
>  g(['ext_shader_samples_identical', sample_count])
>
> +# Group ARR_shader_draw_parameters
> +with profile.group_manager(
> +PiglitGLTest,
> +grouptools.join('spec', 'ARB_shader_draw_parameters')) as g:
> +g(['arb_shader_draw_parameters-drawid', 'drawid'], 'drawid')
> +g(['arb_shader_draw_parameters-drawid', 'vertexid'], 'drawid-vertexid')
> +g(['arb_shader_draw_parameters-basevertex', 'basevertex'], 'basevertex')
> +g(['arb_shader_draw_parameters-basevertex', 'baseinstance'], 
> 'baseinstance')
> +g(['arb_shader_draw_parameters-basevertex', 'basevertex-baseinstance'], 
> 'basevertex-baseinstance')
> +g(['arb_shader_draw_parameters-basevertex', 'vertexid-zerobased'], 
> 'vertexid-zerobased')
> +g(['arb_shader_draw_parameters-drawid-indirect', 'drawid'], 
> 'drawid-indirect')
> +g(['arb_shader_draw_parameters-drawid-indirect', 'basevertex'], 
> 'drawid-indirect-basevertex')
> +g(['arb_shader_draw_parameters-drawid-indirect', 'baseinstance'], 
> 'drawid-indirect-baseinstance')
> +g(['arb_shader_draw_parameters-drawid-indirect', 'vertexid'], 
> 'drawid-indirect-vertexid')
> +
>  if platform.system() is 'Windows':
>  profile.filter_tests(lambda p, _: not p.startswith('glx'))
> diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt
> index 57ac541..b499cd8 100644
> --- a/tests/spec/CMakeLists.txt
> +++ b/tests/spec/CMakeLists.txt
> @@ -139,3 +139,4 @@ add_subdirectory (ext_framebuffer_blit)
>  add_subdirectory (mesa_pack_invert)
>  add_subdirectory (ext_texture_format_bgra)
>  add_subdirectory (oes_draw_elements_base_vertex)
> +add_subdirectory (arb_shader_draw_parameters)
> diff --git a/tests/spec/arb_shader_draw_parameters/CMakeLists.gl.txt 
> b/tests/spec/arb_shader_draw_parameters/CMakeLists.gl.txt
> new file mode 100644
> index 000..f711e2c
> --- /dev/null
> +++ b/tests/spec/arb_shader_draw_parameters/CMakeLists.gl.txt
> @@ -0,0 +1,14 @@
> +include_directories(
> +   ${GLEXT_INCLUDE_DIR}
> +   ${OPENGL_INCLUDE_PATH}
> +   ${piglit_SOURCE_DIR}/tests/mesa/util
> +)
> +
> +link_libraries (
> +   piglitutil_${piglit_target_api}
> +   ${OPENGL_gl_LIBRARY}
> +)
> +
> +piglit_add_executable (arb_shader_draw_parameters-basevertex basevertex.c)
> +piglit_add_executable (arb_shader_draw_parameters-drawid drawid.c)
> +piglit_add_executable (arb_shader_draw_parameters-drawid-indirect 
> drawid-indirect.c)
> diff --git a/tests/spec/arb_shader_draw_parameters/CMakeLists.txt 
> b/tests/spec/arb_shader_draw_parameters/CMakeLists.txt
> new file mode 100644
> index 000..144a306
> --- /dev/null
> +++ b/tests/spec/arb_shader_draw_parameters/CMakeLists.txt
> @@ -0,0 +1 @@
> +piglit_include_target_api()
> diff --git a/tests/spec/arb_shader_draw_parameters/basevertex.c 
> b/tests/spec/arb_shader_draw_parameters/basevertex.c
> new file mode 100644
> index 000..343c38c
> --- /dev/null
> +++ b/tests/spec/arb_shader_draw_parameters/basevertex.c
> @@ -0,0 +1,176 @@
> +/*
> + * Copyright © 2015 Intel Corporation
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> +