Re: [Mesa-dev] [PATCH 8/8] radeonsi: enable multi-draw related pipe caps

2016-08-08 Thread Marek Olšák
If release notes are updated as well, the series is:

Reviewed-by: Marek Olšák 

Marek

On Mon, Aug 8, 2016 at 5:55 PM, Nicolai Hähnle  wrote:
> From: Nicolai Hähnle 
>
> This enables GL_shader_draw_parameters and GL_ARB_indirect_parameters as well
> as a properly accelerated implementation of GL_ARB_multi_draw_indirect.
>
> Enabling the feature requires a sufficiently uptodate firmware -- those have
> already been released a long time ago, although this does mean that the
> feature only works with the amdgpu kernel module, since the radeon module
> doesn't have a way to query the firmware version.
> ---
>  docs/GL3.txt   | 4 ++--
>  src/gallium/drivers/radeonsi/si_pipe.c | 8 +---
>  2 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/docs/GL3.txt b/docs/GL3.txt
> index c185c69..0ba5a25 100644
> --- a/docs/GL3.txt
> +++ b/docs/GL3.txt
> @@ -283,7 +283,7 @@ Khronos, ARB, and OES extensions that are not part of any 
> OpenGL or OpenGL ES ve
>GL_ARB_ES3_2_compatibilitynot started
>GL_ARB_fragment_shader_interlock  not started
>GL_ARB_gpu_shader_int64   started (airlied for 
> core and Gallium, idr for i965)
> -  GL_ARB_indirect_parametersDONE (nvc0)
> +  GL_ARB_indirect_parametersDONE (nvc0, radeonsi)
>GL_ARB_parallel_shader_compilenot started, but 
> Chia-I Wu did some related work in 2014
>GL_ARB_pipeline_statistics_query  DONE (i965, nvc0, 
> radeonsi, softpipe, swr)
>GL_ARB_post_depth_coveragenot started
> @@ -293,7 +293,7 @@ Khronos, ARB, and OES extensions that are not part of any 
> OpenGL or OpenGL ES ve
>GL_ARB_shader_atomic_counter_ops  DONE (nvc0, 
> radeonsi, softpipe)
>GL_ARB_shader_ballot  not started
>GL_ARB_shader_clock   DONE (i965/gen7+)
> -  GL_ARB_shader_draw_parameters DONE (i965, nvc0)
> +  GL_ARB_shader_draw_parameters DONE (i965, nvc0, 
> radeonsi)
>GL_ARB_shader_group_vote  DONE (nvc0)
>GL_ARB_shader_stencil_export  DONE (i965/gen9+, 
> radeonsi, softpipe, llvmpipe, swr)
>GL_ARB_shader_viewport_layer_arraynot started
> diff --git a/src/gallium/drivers/radeonsi/si_pipe.c 
> b/src/gallium/drivers/radeonsi/si_pipe.c
> index ffeeda3..86d7632 100644
> --- a/src/gallium/drivers/radeonsi/si_pipe.c
> +++ b/src/gallium/drivers/radeonsi/si_pipe.c
> @@ -435,9 +435,6 @@ static int si_get_param(struct pipe_screen* pscreen, enum 
> pipe_cap param)
> case PIPE_CAP_TEXTURE_GATHER_OFFSETS:
> case PIPE_CAP_VERTEXID_NOBASE:
> case PIPE_CAP_CLEAR_TEXTURE:
> -   case PIPE_CAP_DRAW_PARAMETERS:
> -   case PIPE_CAP_MULTI_DRAW_INDIRECT:
> -   case PIPE_CAP_MULTI_DRAW_INDIRECT_PARAMS:
> case PIPE_CAP_QUERY_BUFFER_OBJECT:
> case PIPE_CAP_CULL_DISTANCE:
> case PIPE_CAP_PRIMITIVE_RESTART_FOR_PATCHES:
> @@ -445,6 +442,11 @@ static int si_get_param(struct pipe_screen* pscreen, 
> enum pipe_cap param)
> case PIPE_CAP_MAX_WINDOW_RECTANGLES:
> return 0;
>
> +   case PIPE_CAP_DRAW_PARAMETERS:
> +   case PIPE_CAP_MULTI_DRAW_INDIRECT:
> +   case PIPE_CAP_MULTI_DRAW_INDIRECT_PARAMS:
> +   return sscreen->has_draw_indirect_multi;
> +
> case PIPE_CAP_MAX_SHADER_PATCH_VARYINGS:
> return 30;
>
> --
> 2.7.4
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH 8/8] radeonsi: enable multi-draw related pipe caps

2016-08-08 Thread Nicolai Hähnle
From: Nicolai Hähnle 

This enables GL_shader_draw_parameters and GL_ARB_indirect_parameters as well
as a properly accelerated implementation of GL_ARB_multi_draw_indirect.

Enabling the feature requires a sufficiently uptodate firmware -- those have
already been released a long time ago, although this does mean that the
feature only works with the amdgpu kernel module, since the radeon module
doesn't have a way to query the firmware version.
---
 docs/GL3.txt   | 4 ++--
 src/gallium/drivers/radeonsi/si_pipe.c | 8 +---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/docs/GL3.txt b/docs/GL3.txt
index c185c69..0ba5a25 100644
--- a/docs/GL3.txt
+++ b/docs/GL3.txt
@@ -283,7 +283,7 @@ Khronos, ARB, and OES extensions that are not part of any 
OpenGL or OpenGL ES ve
   GL_ARB_ES3_2_compatibilitynot started
   GL_ARB_fragment_shader_interlock  not started
   GL_ARB_gpu_shader_int64   started (airlied for 
core and Gallium, idr for i965)
-  GL_ARB_indirect_parametersDONE (nvc0)
+  GL_ARB_indirect_parametersDONE (nvc0, radeonsi)
   GL_ARB_parallel_shader_compilenot started, but 
Chia-I Wu did some related work in 2014
   GL_ARB_pipeline_statistics_query  DONE (i965, nvc0, 
radeonsi, softpipe, swr)
   GL_ARB_post_depth_coveragenot started
@@ -293,7 +293,7 @@ Khronos, ARB, and OES extensions that are not part of any 
OpenGL or OpenGL ES ve
   GL_ARB_shader_atomic_counter_ops  DONE (nvc0, radeonsi, 
softpipe)
   GL_ARB_shader_ballot  not started
   GL_ARB_shader_clock   DONE (i965/gen7+)
-  GL_ARB_shader_draw_parameters DONE (i965, nvc0)
+  GL_ARB_shader_draw_parameters DONE (i965, nvc0, 
radeonsi)
   GL_ARB_shader_group_vote  DONE (nvc0)
   GL_ARB_shader_stencil_export  DONE (i965/gen9+, 
radeonsi, softpipe, llvmpipe, swr)
   GL_ARB_shader_viewport_layer_arraynot started
diff --git a/src/gallium/drivers/radeonsi/si_pipe.c 
b/src/gallium/drivers/radeonsi/si_pipe.c
index ffeeda3..86d7632 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -435,9 +435,6 @@ static int si_get_param(struct pipe_screen* pscreen, enum 
pipe_cap param)
case PIPE_CAP_TEXTURE_GATHER_OFFSETS:
case PIPE_CAP_VERTEXID_NOBASE:
case PIPE_CAP_CLEAR_TEXTURE:
-   case PIPE_CAP_DRAW_PARAMETERS:
-   case PIPE_CAP_MULTI_DRAW_INDIRECT:
-   case PIPE_CAP_MULTI_DRAW_INDIRECT_PARAMS:
case PIPE_CAP_QUERY_BUFFER_OBJECT:
case PIPE_CAP_CULL_DISTANCE:
case PIPE_CAP_PRIMITIVE_RESTART_FOR_PATCHES:
@@ -445,6 +442,11 @@ static int si_get_param(struct pipe_screen* pscreen, enum 
pipe_cap param)
case PIPE_CAP_MAX_WINDOW_RECTANGLES:
return 0;
 
+   case PIPE_CAP_DRAW_PARAMETERS:
+   case PIPE_CAP_MULTI_DRAW_INDIRECT:
+   case PIPE_CAP_MULTI_DRAW_INDIRECT_PARAMS:
+   return sscreen->has_draw_indirect_multi;
+
case PIPE_CAP_MAX_SHADER_PATCH_VARYINGS:
return 30;
 
-- 
2.7.4

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev