[Mesa-dev] [PATCH v3 1/3] gallium: add a texture target to sampler view and a CAP to use it

Marek Olšák maraeo at gmail.com
Tue Sep 9 04:34:35 PDT 2014


Reviewed-by: Marek Olšák <marek.olsak at amd.com>

Marek

On Tue, Sep 9, 2014 at 2:59 AM, Ilia Mirkin <imirkin at alum.mit.edu> wrote:
> This allows a sampler view to have a different texture target than the
> underlying resource. This will be used to implement the type casting
> between 2d arrays and cube maps as specified in ARB_texture_view.
>
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
> Reviewed-by: Roland Scheidegger <sroland at vmware.com>
> ---
>
> Roland thought this change could benefit from another reviewer... volunteers?
>
> v2 -> v3:
>  - small adjustment to PIPE_CAP doc comment, included mention
>    of ARB_texture_view
>  - added Roland's R-b
>
>  src/gallium/auxiliary/util/u_sampler.c           | 1 +
>  src/gallium/docs/source/screen.rst               | 4 ++++
>  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/llvmpipe/lp_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/vc4/vc4_screen.c             | 1 +
>  src/gallium/include/pipe/p_defines.h             | 1 +
>  src/gallium/include/pipe/p_state.h               | 1 +
>  17 files changed, 20 insertions(+)
>
> diff --git a/src/gallium/auxiliary/util/u_sampler.c b/src/gallium/auxiliary/util/u_sampler.c
> index 227641b..86799fd 100644
> --- a/src/gallium/auxiliary/util/u_sampler.c
> +++ b/src/gallium/auxiliary/util/u_sampler.c
> @@ -45,6 +45,7 @@ default_template(struct pipe_sampler_view *view,
>     /* XXX: Check if format is compatible with texture->format.
>      */
>
> +   view->target = texture->target;
>     view->format = format;
>     view->u.tex.first_level = 0;
>     view->u.tex.last_level = texture->last_level;
> diff --git a/src/gallium/docs/source/screen.rst b/src/gallium/docs/source/screen.rst
> index 13bf705..c83be12 100644
> --- a/src/gallium/docs/source/screen.rst
> +++ b/src/gallium/docs/source/screen.rst
> @@ -226,6 +226,10 @@ The integer capabilities:
>  * ``PIPE_CAP_CONDITIONAL_RENDER_INVERTED``: Whether the driver supports inverted
>    condition for conditional rendering.
>  * ``PIPE_CAP_MAX_VERTEX_ATTRIB_STRIDE``: The maximum supported vertex stride.
> +* ``PIPE_CAP_SAMPLER_VIEW_TARGET``: Whether the sampler view's target can be
> +  different than the underlying resource's, as permitted by
> +  ARB_texture_view. For example a 2d array texture may be reinterpreted as a
> +  cube (array) texture and vice-versa.
>
>
>  .. _pipe_capf:
> diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c
> index 34594ae..461033a 100644
> --- a/src/gallium/drivers/freedreno/freedreno_screen.c
> +++ b/src/gallium/drivers/freedreno/freedreno_screen.c
> @@ -218,6 +218,7 @@ fd_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
>         case PIPE_CAP_DRAW_INDIRECT:
>         case PIPE_CAP_TGSI_FS_FINE_DERIVATIVE:
>         case PIPE_CAP_CONDITIONAL_RENDER_INVERTED:
> +       case PIPE_CAP_SAMPLER_VIEW_TARGET:
>                 return 0;
>
>         /* Stream output. */
> diff --git a/src/gallium/drivers/i915/i915_screen.c b/src/gallium/drivers/i915/i915_screen.c
> index 24e444f..9006734 100644
> --- a/src/gallium/drivers/i915/i915_screen.c
> +++ b/src/gallium/drivers/i915/i915_screen.c
> @@ -234,6 +234,7 @@ i915_get_param(struct pipe_screen *screen, enum pipe_cap cap)
>     case PIPE_CAP_BUFFER_MAP_PERSISTENT_COHERENT:
>     case PIPE_CAP_DRAW_INDIRECT:
>     case PIPE_CAP_TGSI_FS_FINE_DERIVATIVE:
> +   case PIPE_CAP_SAMPLER_VIEW_TARGET:
>        return 0;
>
>     case PIPE_CAP_MIN_MAP_BUFFER_ALIGNMENT:
> diff --git a/src/gallium/drivers/ilo/ilo_screen.c b/src/gallium/drivers/ilo/ilo_screen.c
> index 3f997a1..c56e0e5 100644
> --- a/src/gallium/drivers/ilo/ilo_screen.c
> +++ b/src/gallium/drivers/ilo/ilo_screen.c
> @@ -438,6 +438,7 @@ ilo_get_param(struct pipe_screen *screen, enum pipe_cap param)
>     case PIPE_CAP_DRAW_INDIRECT:
>     case PIPE_CAP_TGSI_FS_FINE_DERIVATIVE:
>     case PIPE_CAP_CONDITIONAL_RENDER_INVERTED:
> +   case PIPE_CAP_SAMPLER_VIEW_TARGET:
>        return 0;
>
>     case PIPE_CAP_VENDOR_ID:
> diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
> index 2da5208..e6597e9 100644
> --- a/src/gallium/drivers/llvmpipe/lp_screen.c
> +++ b/src/gallium/drivers/llvmpipe/lp_screen.c
> @@ -253,6 +253,7 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param)
>     case PIPE_CAP_TEXTURE_GATHER_OFFSETS:
>     case PIPE_CAP_TGSI_VS_WINDOW_SPACE_POSITION:
>     case PIPE_CAP_TGSI_FS_FINE_DERIVATIVE:
> +   case PIPE_CAP_SAMPLER_VIEW_TARGET:
>        return 0;
>     case PIPE_CAP_FAKE_SW_MSAA:
>        return 1;
> diff --git a/src/gallium/drivers/nouveau/nv30/nv30_screen.c b/src/gallium/drivers/nouveau/nv30/nv30_screen.c
> index 036ce9e..a1373fd 100644
> --- a/src/gallium/drivers/nouveau/nv30/nv30_screen.c
> +++ b/src/gallium/drivers/nouveau/nv30/nv30_screen.c
> @@ -155,6 +155,7 @@ nv30_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
>     case PIPE_CAP_DRAW_INDIRECT:
>     case PIPE_CAP_TGSI_FS_FINE_DERIVATIVE:
>     case PIPE_CAP_CONDITIONAL_RENDER_INVERTED:
> +   case PIPE_CAP_SAMPLER_VIEW_TARGET:
>        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 abc3407..b2a3019 100644
> --- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c
> +++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
> @@ -203,6 +203,7 @@ nv50_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
>     case PIPE_CAP_COMPUTE:
>     case PIPE_CAP_DRAW_INDIRECT:
>     case PIPE_CAP_CONDITIONAL_RENDER_INVERTED:
> +   case PIPE_CAP_SAMPLER_VIEW_TARGET:
>        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 5416ef9..4e7b8d6 100644
> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> @@ -187,6 +187,7 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
>     case PIPE_CAP_TGSI_VS_LAYER_VIEWPORT:
>     case PIPE_CAP_FAKE_SW_MSAA:
>     case PIPE_CAP_TGSI_VS_WINDOW_SPACE_POSITION:
> +   case PIPE_CAP_SAMPLER_VIEW_TARGET:
>        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 b4ccbee..c35559f 100644
> --- a/src/gallium/drivers/r300/r300_screen.c
> +++ b/src/gallium/drivers/r300/r300_screen.c
> @@ -180,6 +180,7 @@ static int r300_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
>          case PIPE_CAP_DRAW_INDIRECT:
>          case PIPE_CAP_TGSI_FS_FINE_DERIVATIVE:
>          case PIPE_CAP_CONDITIONAL_RENDER_INVERTED:
> +        case PIPE_CAP_SAMPLER_VIEW_TARGET:
>              return 0;
>
>          /* SWTCL-only features. */
> diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
> index 6e00eff..73c6e35 100644
> --- a/src/gallium/drivers/r600/r600_pipe.c
> +++ b/src/gallium/drivers/r600/r600_pipe.c
> @@ -320,6 +320,7 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
>         case PIPE_CAP_TEXTURE_GATHER_OFFSETS:
>         case PIPE_CAP_DRAW_INDIRECT:
>         case PIPE_CAP_CONDITIONAL_RENDER_INVERTED:
> +       case PIPE_CAP_SAMPLER_VIEW_TARGET:
>                 return 0;
>
>         /* Stream output. */
> diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
> index b63c5d7..5762ca7 100644
> --- a/src/gallium/drivers/radeonsi/si_pipe.c
> +++ b/src/gallium/drivers/radeonsi/si_pipe.c
> @@ -244,6 +244,7 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
>         case PIPE_CAP_TGSI_VS_WINDOW_SPACE_POSITION:
>         case PIPE_CAP_TGSI_FS_FINE_DERIVATIVE:
>         case PIPE_CAP_CONDITIONAL_RENDER_INVERTED:
> +       case PIPE_CAP_SAMPLER_VIEW_TARGET:
>                 return 0;
>
>         case PIPE_CAP_TEXTURE_BORDER_COLOR_QUIRK:
> diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
> index 956d59c..a6e7fc0 100644
> --- a/src/gallium/drivers/softpipe/sp_screen.c
> +++ b/src/gallium/drivers/softpipe/sp_screen.c
> @@ -198,6 +198,7 @@ softpipe_get_param(struct pipe_screen *screen, enum pipe_cap param)
>     case PIPE_CAP_TEXTURE_GATHER_OFFSETS:
>     case PIPE_CAP_TGSI_VS_WINDOW_SPACE_POSITION:
>     case PIPE_CAP_TGSI_FS_FINE_DERIVATIVE:
> +   case PIPE_CAP_SAMPLER_VIEW_TARGET:
>        return 0;
>     case PIPE_CAP_FAKE_SW_MSAA:
>        return 1;
> diff --git a/src/gallium/drivers/svga/svga_screen.c b/src/gallium/drivers/svga/svga_screen.c
> index edd0a39..004b4b4 100644
> --- a/src/gallium/drivers/svga/svga_screen.c
> +++ b/src/gallium/drivers/svga/svga_screen.c
> @@ -280,6 +280,7 @@ svga_get_param(struct pipe_screen *screen, enum pipe_cap param)
>     case PIPE_CAP_DRAW_INDIRECT:
>     case PIPE_CAP_TGSI_FS_FINE_DERIVATIVE:
>     case PIPE_CAP_CONDITIONAL_RENDER_INVERTED:
> +   case PIPE_CAP_SAMPLER_VIEW_TARGET:
>        return 0;
>     case PIPE_CAP_MIN_MAP_BUFFER_ALIGNMENT:
>        return 64;
> diff --git a/src/gallium/drivers/vc4/vc4_screen.c b/src/gallium/drivers/vc4/vc4_screen.c
> index b0f9710..8748999 100644
> --- a/src/gallium/drivers/vc4/vc4_screen.c
> +++ b/src/gallium/drivers/vc4/vc4_screen.c
> @@ -158,6 +158,7 @@ vc4_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
>          case PIPE_CAP_DRAW_INDIRECT:
>          case PIPE_CAP_TGSI_FS_FINE_DERIVATIVE:
>          case PIPE_CAP_CONDITIONAL_RENDER_INVERTED:
> +        case PIPE_CAP_SAMPLER_VIEW_TARGET:
>                  return 0;
>
>                  /* Stream output. */
> diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
> index aae8229..93156b9 100644
> --- a/src/gallium/include/pipe/p_defines.h
> +++ b/src/gallium/include/pipe/p_defines.h
> @@ -570,6 +570,7 @@ enum pipe_cap {
>     PIPE_CAP_UMA = 107,
>     PIPE_CAP_CONDITIONAL_RENDER_INVERTED = 108,
>     PIPE_CAP_MAX_VERTEX_ATTRIB_STRIDE = 109,
> +   PIPE_CAP_SAMPLER_VIEW_TARGET = 110,
>  };
>
>  #define PIPE_QUIRK_TEXTURE_BORDER_COLOR_SWIZZLE_NV50 (1 << 0)
> diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
> index a82686b..36d253c 100644
> --- a/src/gallium/include/pipe/p_state.h
> +++ b/src/gallium/include/pipe/p_state.h
> @@ -361,6 +361,7 @@ struct pipe_surface
>  struct pipe_sampler_view
>  {
>     struct pipe_reference reference;
> +   enum pipe_texture_target target; /**< PIPE_TEXTURE_x */
>     enum pipe_format format;      /**< typed PIPE_FORMAT_x */
>     struct pipe_resource *texture; /**< texture into which this is a view  */
>     struct pipe_context *context; /**< context this view belongs to */
> --
> 1.8.5.5
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev


More information about the mesa-dev mailing list