Re: [Piglit] [PATCH] tests: add INTEL_blackhole_render

[Alejandro Piñeiro]

On 16/03/18 12:53, Lionel Landwerlin wrote:
> On 16/03/18 07:31, Alejandro Piñeiro wrote:
>> Is adding ${OPENGL_gl_LIBRARY} at link_libraries really needed at this
>> gles CMakeKist? As far as I have seen, most gles2/3 CMakeLists just adds
>> piglitutil_${piglit_target_api}.
>>
> Looks like I can drop it from the GL tests too and it still links...
> Does that make sense? :)

Funny thing. FWIW, I always C those sections (if it is working ...),
never thought too much why most of the tests had a different
link_libraries for gl compared to gles.

In any case, it is just a nitpick. If it is working as it is, just go
ahead with my Rb.

BR



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

Re: [Piglit] [PATCH] tests: add INTEL_blackhole_render

[Lionel Landwerlin]

On 16/03/18 07:31, Alejandro Piñeiro wrote:

Is adding ${OPENGL_gl_LIBRARY} at link_libraries really needed at this
gles CMakeKist? As far as I have seen, most gles2/3 CMakeLists just adds
piglitutil_${piglit_target_api}.

Looks like I can drop it from the GL tests too and it still links... 
Does that make sense? :)


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

Re: [Piglit] [PATCH] tests: add INTEL_blackhole_render

[Alejandro Piñeiro]

Looks good to me, just a minor comment below.


On 15/03/18 15:15, Lionel Landwerlin wrote:
> Signed-off-by: Lionel Landwerlin 
> ---
>  registry/gl.xml|   8 +-
>  tests/all.py   |   9 ++
>  tests/spec/CMakeLists.txt  |   1 +
>  .../spec/intel_blackhole_render/CMakeLists.gl.txt  |  14 ++
>  .../intel_blackhole_render/CMakeLists.gles2.txt|  13 ++
>  .../intel_blackhole_render/CMakeLists.gles3.txt|  13 ++
>  tests/spec/intel_blackhole_render/CMakeLists.txt   |   1 +
>  .../intel_blackhole_render/blackhole_dispatch.c| 127 +
>  tests/spec/intel_blackhole_render/blackhole_draw.c | 156 
> +
>  tests/spec/nv_image_formats/CMakeLists.gl.txt  |   8 ++
>  10 files changed, 349 insertions(+), 1 deletion(-)
>  create mode 100644 tests/spec/intel_blackhole_render/CMakeLists.gl.txt
>  create mode 100644 tests/spec/intel_blackhole_render/CMakeLists.gles2.txt
>  create mode 100644 tests/spec/intel_blackhole_render/CMakeLists.gles3.txt
>  create mode 100644 tests/spec/intel_blackhole_render/CMakeLists.txt
>  create mode 100644 tests/spec/intel_blackhole_render/blackhole_dispatch.c
>  create mode 100644 tests/spec/intel_blackhole_render/blackhole_draw.c
>  create mode 100644 tests/spec/nv_image_formats/CMakeLists.gl.txt
>
> diff --git a/registry/gl.xml b/registry/gl.xml
> index 7b13ff907..3c371905d 100644
> --- a/registry/gl.xml
> +++ b/registry/gl.xml
> @@ -4518,7 +4518,8 @@ typedef unsigned int GLhandleARB;
>  
>  
>  
> -
> +
> +
>  
>  
>  
> @@ -44054,6 +44055,11 @@ typedef unsigned int GLhandleARB;
>  
>  
>  
> + supported="gl|glcore|gles2">
> +
> +
> +
> +
>  
>  
>  
> diff --git a/tests/all.py b/tests/all.py
> index 8c5877a63..c30a5dfdb 100644
> --- a/tests/all.py
> +++ b/tests/all.py
> @@ -4971,6 +4971,15 @@ with profile.test_list.group_manager(
>  g(['intel_conservative_rasterization-innercoverage_gles3'])
>  g(['intel_conservative_rasterization-tri_gles3'])
>  
> +# Group INTEL_blackhole_render
> +with profile.test_list.group_manager(
> +PiglitGLTest,
> +grouptools.join('spec', 'INTEL_blackhole_render')) as g:
> +g(['intel_conservative_rasterization-draw'])
> +g(['intel_conservative_rasterization-dispatch'])
> +g(['intel_conservative_rasterization-draw_gles2'])
> +g(['intel_conservative_rasterization-draw_gles3'])
> +
>  # Group ARB_bindless_texture
>  with profile.test_list.group_manager(
>   PiglitGLTest,
> diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt
> index e57e8d703..dc14beb4e 100644
> --- a/tests/spec/CMakeLists.txt
> +++ b/tests/spec/CMakeLists.txt
> @@ -177,3 +177,4 @@ add_subdirectory (arb_post_depth_coverage)
>  add_subdirectory (arb_fragment_shader_interlock)
>  add_subdirectory (ext_occlusion_query_boolean)
>  add_subdirectory (ext_disjoint_timer_query)
> +add_subdirectory (intel_blackhole_render)
> diff --git a/tests/spec/intel_blackhole_render/CMakeLists.gl.txt 
> b/tests/spec/intel_blackhole_render/CMakeLists.gl.txt
> new file mode 100644
> index 0..379fc5f9a
> --- /dev/null
> +++ b/tests/spec/intel_blackhole_render/CMakeLists.gl.txt
> @@ -0,0 +1,14 @@
> +include_directories(
> + ${GLEXT_INCLUDE_DIR}
> + ${OPENGL_INCLUDE_PATH}
> +)
> +
> +link_libraries (
> + piglitutil_${piglit_target_api}
> + ${OPENGL_gl_LIBRARY}
> +)
> +
> +piglit_add_executable (intel_blackhole-dispatch blackhole_dispatch.c)
> +piglit_add_executable (intel_blackhole-draw blackhole_draw.c)
> +
> +# vim: ft=cmake:
> diff --git a/tests/spec/intel_blackhole_render/CMakeLists.gles2.txt 
> b/tests/spec/intel_blackhole_render/CMakeLists.gles2.txt
> new file mode 100644
> index 0..076c559d5
> --- /dev/null
> +++ b/tests/spec/intel_blackhole_render/CMakeLists.gles2.txt
> @@ -0,0 +1,13 @@
> +include_directories(
> + ${GLEXT_INCLUDE_DIR}
> + ${OPENGL_INCLUDE_PATH}
> +)
> +
> +link_libraries (
> + piglitutil_${piglit_target_api}
> + ${OPENGL_gl_LIBRARY}
> +)

Is adding ${OPENGL_gl_LIBRARY} at link_libraries really needed at this
gles CMakeKist? As far as I have seen, most gles2/3 CMakeLists just adds
piglitutil_${piglit_target_api}.

> +
> +piglit_add_executable (intel_blackhole-draw_gles2 blackhole_draw.c)
> +
> +# vim: ft=cmake:
> diff --git a/tests/spec/intel_blackhole_render/CMakeLists.gles3.txt 
> b/tests/spec/intel_blackhole_render/CMakeLists.gles3.txt
> new file mode 100644
> index 0..f0b912d99
> --- /dev/null
> +++ b/tests/spec/intel_blackhole_render/CMakeLists.gles3.txt
> @@ -0,0 +1,13 @@
> +include_directories(
> + ${GLEXT_INCLUDE_DIR}
> + ${OPENGL_INCLUDE_PATH}
> +)
> +
> +link_libraries (
> + 

[Piglit] [PATCH] tests: add INTEL_blackhole_render

[Lionel Landwerlin]

Signed-off-by: Lionel Landwerlin 
---
 registry/gl.xml|   8 +-
 tests/all.py   |   9 ++
 tests/spec/CMakeLists.txt  |   1 +
 .../spec/intel_blackhole_render/CMakeLists.gl.txt  |  14 ++
 .../intel_blackhole_render/CMakeLists.gles2.txt|  13 ++
 .../intel_blackhole_render/CMakeLists.gles3.txt|  13 ++
 tests/spec/intel_blackhole_render/CMakeLists.txt   |   1 +
 .../intel_blackhole_render/blackhole_dispatch.c| 127 +
 tests/spec/intel_blackhole_render/blackhole_draw.c | 156 +
 tests/spec/nv_image_formats/CMakeLists.gl.txt  |   8 ++
 10 files changed, 349 insertions(+), 1 deletion(-)
 create mode 100644 tests/spec/intel_blackhole_render/CMakeLists.gl.txt
 create mode 100644 tests/spec/intel_blackhole_render/CMakeLists.gles2.txt
 create mode 100644 tests/spec/intel_blackhole_render/CMakeLists.gles3.txt
 create mode 100644 tests/spec/intel_blackhole_render/CMakeLists.txt
 create mode 100644 tests/spec/intel_blackhole_render/blackhole_dispatch.c
 create mode 100644 tests/spec/intel_blackhole_render/blackhole_draw.c
 create mode 100644 tests/spec/nv_image_formats/CMakeLists.gl.txt

diff --git a/registry/gl.xml b/registry/gl.xml
index 7b13ff907..3c371905d 100644
--- a/registry/gl.xml
+++ b/registry/gl.xml
@@ -4518,7 +4518,8 @@ typedef unsigned int GLhandleARB;
 
 
 
-
+
+
 
 
 
@@ -44054,6 +44055,11 @@ typedef unsigned int GLhandleARB;
 
 
 
+
+
+
+
+
 
 
 
diff --git a/tests/all.py b/tests/all.py
index 8c5877a63..c30a5dfdb 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -4971,6 +4971,15 @@ with profile.test_list.group_manager(
 g(['intel_conservative_rasterization-innercoverage_gles3'])
 g(['intel_conservative_rasterization-tri_gles3'])
 
+# Group INTEL_blackhole_render
+with profile.test_list.group_manager(
+PiglitGLTest,
+grouptools.join('spec', 'INTEL_blackhole_render')) as g:
+g(['intel_conservative_rasterization-draw'])
+g(['intel_conservative_rasterization-dispatch'])
+g(['intel_conservative_rasterization-draw_gles2'])
+g(['intel_conservative_rasterization-draw_gles3'])
+
 # Group ARB_bindless_texture
 with profile.test_list.group_manager(
PiglitGLTest,
diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt
index e57e8d703..dc14beb4e 100644
--- a/tests/spec/CMakeLists.txt
+++ b/tests/spec/CMakeLists.txt
@@ -177,3 +177,4 @@ add_subdirectory (arb_post_depth_coverage)
 add_subdirectory (arb_fragment_shader_interlock)
 add_subdirectory (ext_occlusion_query_boolean)
 add_subdirectory (ext_disjoint_timer_query)
+add_subdirectory (intel_blackhole_render)
diff --git a/tests/spec/intel_blackhole_render/CMakeLists.gl.txt 
b/tests/spec/intel_blackhole_render/CMakeLists.gl.txt
new file mode 100644
index 0..379fc5f9a
--- /dev/null
+++ b/tests/spec/intel_blackhole_render/CMakeLists.gl.txt
@@ -0,0 +1,14 @@
+include_directories(
+   ${GLEXT_INCLUDE_DIR}
+   ${OPENGL_INCLUDE_PATH}
+)
+
+link_libraries (
+   piglitutil_${piglit_target_api}
+   ${OPENGL_gl_LIBRARY}
+)
+
+piglit_add_executable (intel_blackhole-dispatch blackhole_dispatch.c)
+piglit_add_executable (intel_blackhole-draw blackhole_draw.c)
+
+# vim: ft=cmake:
diff --git a/tests/spec/intel_blackhole_render/CMakeLists.gles2.txt 
b/tests/spec/intel_blackhole_render/CMakeLists.gles2.txt
new file mode 100644
index 0..076c559d5
--- /dev/null
+++ b/tests/spec/intel_blackhole_render/CMakeLists.gles2.txt
@@ -0,0 +1,13 @@
+include_directories(
+   ${GLEXT_INCLUDE_DIR}
+   ${OPENGL_INCLUDE_PATH}
+)
+
+link_libraries (
+   piglitutil_${piglit_target_api}
+   ${OPENGL_gl_LIBRARY}
+)
+
+piglit_add_executable (intel_blackhole-draw_gles2 blackhole_draw.c)
+
+# vim: ft=cmake:
diff --git a/tests/spec/intel_blackhole_render/CMakeLists.gles3.txt 
b/tests/spec/intel_blackhole_render/CMakeLists.gles3.txt
new file mode 100644
index 0..f0b912d99
--- /dev/null
+++ b/tests/spec/intel_blackhole_render/CMakeLists.gles3.txt
@@ -0,0 +1,13 @@
+include_directories(
+   ${GLEXT_INCLUDE_DIR}
+   ${OPENGL_INCLUDE_PATH}
+)
+
+link_libraries (
+   piglitutil_${piglit_target_api}
+   ${OPENGL_gl_LIBRARY}
+)
+
+piglit_add_executable (intel_blackhole-draw_gles3 blackhole_draw.c)
+
+# vim: ft=cmake:
diff --git a/tests/spec/intel_blackhole_render/CMakeLists.txt 
b/tests/spec/intel_blackhole_render/CMakeLists.txt
new file mode 100644
index 0..144a306f4
--- /dev/null
+++ b/tests/spec/intel_blackhole_render/CMakeLists.txt
@@ -0,0 +1 @@
+piglit_include_target_api()
diff --git a/tests/spec/intel_blackhole_render/blackhole_dispatch.c 
b/tests/spec/intel_blackhole_render/blackhole_dispatch.c
new file