[Mesa-dev] [PATCH v3 4/6] gallium: add PIPE_CAP_MAX_WINDOW_RECTANGLES to all drivers

Brian Paul brianp at vmware.com
Mon Jun 13 14:46:23 UTC 2016


Reviewed-by: Brian Paul <brianp at vmware.com>

On 06/12/2016 12:36 AM, Ilia Mirkin wrote:
> This says how many window rectangles are supported by the
> implementation, although it may not exceed PIPE_MAX_WINDOW_RECTANGLES.
>
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
> ---
>   src/gallium/docs/source/screen.rst               | 3 ++-
>   src/gallium/drivers/freedreno/freedreno_screen.c | 1 +
>   src/gallium/drivers/i915/i915_screen.c           | 1 +
>   src/gallium/drivers/ilo/ilo_screen.c             | 1 +
>   src/gallium/drivers/nouveau/nv30/nv30_screen.c   | 1 +
>   src/gallium/drivers/nouveau/nv50/nv50_screen.c   | 1 +
>   src/gallium/drivers/nouveau/nvc0/nvc0_screen.c   | 1 +
>   src/gallium/drivers/r300/r300_screen.c           | 1 +
>   src/gallium/drivers/r600/r600_pipe.c             | 1 +
>   src/gallium/drivers/radeonsi/si_pipe.c           | 1 +
>   src/gallium/drivers/softpipe/sp_screen.c         | 1 +
>   src/gallium/drivers/svga/svga_screen.c           | 1 +
>   src/gallium/drivers/swr/swr_screen.cpp           | 1 +
>   src/gallium/drivers/vc4/vc4_screen.c             | 1 +
>   src/gallium/drivers/virgl/virgl_screen.c         | 1 +
>   src/gallium/include/pipe/p_defines.h             | 1 +
>   16 files changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/src/gallium/docs/source/screen.rst b/src/gallium/docs/source/screen.rst
> index 979b6c1..277a10d 100644
> --- a/src/gallium/docs/source/screen.rst
> +++ b/src/gallium/docs/source/screen.rst
> @@ -341,7 +341,8 @@ The integer capabilities:
>   * ``PIPE_CAP_PRIMITIVE_RESTART_FOR_PATCHES``: Whether primitive restart is
>     supported for patch primitives.
>   * ``PIPE_CAP_TGSI_VOTE``: Whether the ``VOTE_*`` ops can be used in shaders.
> -
> +* ``PIPE_CAP_MAX_WINDOW_RECTANGLES``: The maxium number of window rectangles
> +  supported in ``set_window_rectangle_states``.
>
>   .. _pipe_capf:
>
> diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c
> index c258074..9138024 100644
> --- a/src/gallium/drivers/freedreno/freedreno_screen.c
> +++ b/src/gallium/drivers/freedreno/freedreno_screen.c
> @@ -263,6 +263,7 @@ fd_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
>   	case PIPE_CAP_CULL_DISTANCE:
>   	case PIPE_CAP_PRIMITIVE_RESTART_FOR_PATCHES:
>   	case PIPE_CAP_TGSI_VOTE:
> +	case PIPE_CAP_MAX_WINDOW_RECTANGLES:
>   		return 0;
>
>   	case PIPE_CAP_MAX_VIEWPORTS:
> diff --git a/src/gallium/drivers/i915/i915_screen.c b/src/gallium/drivers/i915/i915_screen.c
> index a7ee381..e898f7e 100644
> --- a/src/gallium/drivers/i915/i915_screen.c
> +++ b/src/gallium/drivers/i915/i915_screen.c
> @@ -274,6 +274,7 @@ i915_get_param(struct pipe_screen *screen, enum pipe_cap cap)
>      case PIPE_CAP_CULL_DISTANCE:
>      case PIPE_CAP_PRIMITIVE_RESTART_FOR_PATCHES:
>      case PIPE_CAP_TGSI_VOTE:
> +   case PIPE_CAP_MAX_WINDOW_RECTANGLES:
>         return 0;
>
>      case PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS:
> diff --git a/src/gallium/drivers/ilo/ilo_screen.c b/src/gallium/drivers/ilo/ilo_screen.c
> index 1ae0327..a775aa6 100644
> --- a/src/gallium/drivers/ilo/ilo_screen.c
> +++ b/src/gallium/drivers/ilo/ilo_screen.c
> @@ -503,6 +503,7 @@ ilo_get_param(struct pipe_screen *screen, enum pipe_cap param)
>      case PIPE_CAP_CULL_DISTANCE:
>      case PIPE_CAP_PRIMITIVE_RESTART_FOR_PATCHES:
>      case PIPE_CAP_TGSI_VOTE:
> +   case PIPE_CAP_MAX_WINDOW_RECTANGLES:
>         return 0;
>
>      case PIPE_CAP_VENDOR_ID:
> diff --git a/src/gallium/drivers/nouveau/nv30/nv30_screen.c b/src/gallium/drivers/nouveau/nv30/nv30_screen.c
> index de798cf..0a3d8b2 100644
> --- a/src/gallium/drivers/nouveau/nv30/nv30_screen.c
> +++ b/src/gallium/drivers/nouveau/nv30/nv30_screen.c
> @@ -197,6 +197,7 @@ nv30_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
>      case PIPE_CAP_CULL_DISTANCE:
>      case PIPE_CAP_PRIMITIVE_RESTART_FOR_PATCHES:
>      case PIPE_CAP_TGSI_VOTE:
> +   case PIPE_CAP_MAX_WINDOW_RECTANGLES:
>         return 0;
>
>      case PIPE_CAP_VENDOR_ID:
> diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
> index 03f4591..d1719d3 100644
> --- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c
> +++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
> @@ -250,6 +250,7 @@ nv50_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
>      case PIPE_CAP_ROBUST_BUFFER_ACCESS_BEHAVIOR:
>      case PIPE_CAP_PRIMITIVE_RESTART_FOR_PATCHES:
>      case PIPE_CAP_TGSI_VOTE:
> +   case PIPE_CAP_MAX_WINDOW_RECTANGLES:
>         return 0;
>
>      case PIPE_CAP_VENDOR_ID:
> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> index b9437b2..1afa43a 100644
> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> @@ -261,6 +261,7 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
>      case PIPE_CAP_PCI_BUS:
>      case PIPE_CAP_PCI_DEVICE:
>      case PIPE_CAP_PCI_FUNCTION:
> +   case PIPE_CAP_MAX_WINDOW_RECTANGLES:
>         return 0;
>
>      case PIPE_CAP_VENDOR_ID:
> diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c
> index 681681b..8822b4d 100644
> --- a/src/gallium/drivers/r300/r300_screen.c
> +++ b/src/gallium/drivers/r300/r300_screen.c
> @@ -219,6 +219,7 @@ static int r300_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
>           case PIPE_CAP_CULL_DISTANCE:
>           case PIPE_CAP_PRIMITIVE_RESTART_FOR_PATCHES:
>           case PIPE_CAP_TGSI_VOTE:
> +        case PIPE_CAP_MAX_WINDOW_RECTANGLES:
>               return 0;
>
>           /* SWTCL-only features. */
> diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
> index a49b00f..42384f6 100644
> --- a/src/gallium/drivers/r600/r600_pipe.c
> +++ b/src/gallium/drivers/r600/r600_pipe.c
> @@ -369,6 +369,7 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
>   	case PIPE_CAP_CULL_DISTANCE:
>   	case PIPE_CAP_PRIMITIVE_RESTART_FOR_PATCHES:
>   	case PIPE_CAP_TGSI_VOTE:
> +	case PIPE_CAP_MAX_WINDOW_RECTANGLES:
>   		return 0;
>
>   	case PIPE_CAP_MAX_SHADER_PATCH_VARYINGS:
> diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
> index 0c601da..e65a30f 100644
> --- a/src/gallium/drivers/radeonsi/si_pipe.c
> +++ b/src/gallium/drivers/radeonsi/si_pipe.c
> @@ -415,6 +415,7 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
>   	case PIPE_CAP_CULL_DISTANCE:
>   	case PIPE_CAP_PRIMITIVE_RESTART_FOR_PATCHES:
>   	case PIPE_CAP_TGSI_VOTE:
> +	case PIPE_CAP_MAX_WINDOW_RECTANGLES:
>   		return 0;
>
>   	case PIPE_CAP_MAX_SHADER_PATCH_VARYINGS:
> diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
> index 514009c..a4b2299 100644
> --- a/src/gallium/drivers/softpipe/sp_screen.c
> +++ b/src/gallium/drivers/softpipe/sp_screen.c
> @@ -276,6 +276,7 @@ softpipe_get_param(struct pipe_screen *screen, enum pipe_cap param)
>      case PIPE_CAP_ROBUST_BUFFER_ACCESS_BEHAVIOR:
>      case PIPE_CAP_PRIMITIVE_RESTART_FOR_PATCHES:
>      case PIPE_CAP_TGSI_VOTE:
> +   case PIPE_CAP_MAX_WINDOW_RECTANGLES:
>         return 0;
>      case PIPE_CAP_SHADER_BUFFER_OFFSET_ALIGNMENT:
>         return 4;
> diff --git a/src/gallium/drivers/svga/svga_screen.c b/src/gallium/drivers/svga/svga_screen.c
> index 2432523..f6f53af 100644
> --- a/src/gallium/drivers/svga/svga_screen.c
> +++ b/src/gallium/drivers/svga/svga_screen.c
> @@ -409,6 +409,7 @@ svga_get_param(struct pipe_screen *screen, enum pipe_cap param)
>      case PIPE_CAP_CULL_DISTANCE:
>      case PIPE_CAP_PRIMITIVE_RESTART_FOR_PATCHES:
>      case PIPE_CAP_TGSI_VOTE:
> +   case PIPE_CAP_MAX_WINDOW_RECTANGLES:
>         return 0;
>      }
>
> diff --git a/src/gallium/drivers/swr/swr_screen.cpp b/src/gallium/drivers/swr/swr_screen.cpp
> index af82c93..792b09c 100644
> --- a/src/gallium/drivers/swr/swr_screen.cpp
> +++ b/src/gallium/drivers/swr/swr_screen.cpp
> @@ -362,6 +362,7 @@ swr_get_param(struct pipe_screen *screen, enum pipe_cap param)
>      case PIPE_CAP_FRAMEBUFFER_NO_ATTACHMENT:
>      case PIPE_CAP_PRIMITIVE_RESTART_FOR_PATCHES:
>      case PIPE_CAP_TGSI_VOTE:
> +   case PIPE_CAP_MAX_WINDOW_RECTANGLES:
>         return 0;
>      }
>
> diff --git a/src/gallium/drivers/vc4/vc4_screen.c b/src/gallium/drivers/vc4/vc4_screen.c
> index ecc797c..c38e4f4 100644
> --- a/src/gallium/drivers/vc4/vc4_screen.c
> +++ b/src/gallium/drivers/vc4/vc4_screen.c
> @@ -212,6 +212,7 @@ vc4_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
>           case PIPE_CAP_CULL_DISTANCE:
>           case PIPE_CAP_PRIMITIVE_RESTART_FOR_PATCHES:
>           case PIPE_CAP_TGSI_VOTE:
> +        case PIPE_CAP_MAX_WINDOW_RECTANGLES:
>                   return 0;
>
>                   /* Stream output. */
> diff --git a/src/gallium/drivers/virgl/virgl_screen.c b/src/gallium/drivers/virgl/virgl_screen.c
> index 919b64e..65574fa 100644
> --- a/src/gallium/drivers/virgl/virgl_screen.c
> +++ b/src/gallium/drivers/virgl/virgl_screen.c
> @@ -244,6 +244,7 @@ virgl_get_param(struct pipe_screen *screen, enum pipe_cap param)
>      case PIPE_CAP_CULL_DISTANCE:
>      case PIPE_CAP_PRIMITIVE_RESTART_FOR_PATCHES:
>      case PIPE_CAP_TGSI_VOTE:
> +   case PIPE_CAP_MAX_WINDOW_RECTANGLES:
>         return 0;
>      case PIPE_CAP_VENDOR_ID:
>         return 0x1af4;
> diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
> index 569725f..c46ac5a 100644
> --- a/src/gallium/include/pipe/p_defines.h
> +++ b/src/gallium/include/pipe/p_defines.h
> @@ -730,6 +730,7 @@ enum pipe_cap
>      PIPE_CAP_CULL_DISTANCE,
>      PIPE_CAP_PRIMITIVE_RESTART_FOR_PATCHES,
>      PIPE_CAP_TGSI_VOTE,
> +   PIPE_CAP_MAX_WINDOW_RECTANGLES,
>   };
>
>   #define PIPE_QUIRK_TEXTURE_BORDER_COLOR_SWIZZLE_NV50 (1 << 0)
>



More information about the mesa-dev mailing list