Reviewed-by: Marek Olšák <marek.ol...@amd.com>
Marek
On Mon, Aug 13, 2018 at 1:13 AM Kenneth Graunke <kenn...@whitecape.org> wrote:
>
> Some hardware can do PIPE_TEX_WRAP_MIRROR_REPEAT but not
> PIPE_TEX_WRAP_MIRROR_CLAMP and PIPE_TEX_WRAP_MIRROR_CLAMP_TO_BORDER.
>
> Drivers for such hardware would like to advertise support for
> ARB_texture_mirror_clamp_to_edge but not EXT_texture_mirror_clamp.
>
> This commit adds a new PIPE_CAP_TEXTURE_MIRROR_CLAMP_TO_EDGE bit,
> changes the extension enable to be based on that, and enables it
> in all upstream drivers which supported PIPE_CAP_TEXTURE_MIRROR_CLAMP
> (so they continue supporting this mode).
> ---
> src/gallium/docs/source/screen.rst | 6 ++++--
> src/gallium/drivers/etnaviv/etnaviv_screen.c | 1 +
> src/gallium/drivers/freedreno/freedreno_screen.c | 1 +
> src/gallium/drivers/i915/i915_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_get.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/v3d/v3d_screen.c | 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 +
> src/mesa/state_tracker/st_extensions.c | 2 +-
> 19 files changed, 22 insertions(+), 3 deletions(-)
>
> diff --git a/src/gallium/docs/source/screen.rst
> b/src/gallium/docs/source/screen.rst
> index e85246c4778..f4484c7db81 100644
> --- a/src/gallium/docs/source/screen.rst
> +++ b/src/gallium/docs/source/screen.rst
> @@ -40,8 +40,10 @@ The integer capabilities:
> for a 3D texture.
> * ``PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS``: The maximum number of mipmap levels
> available
> for a cubemap.
> -* ``PIPE_CAP_TEXTURE_MIRROR_CLAMP``: Whether mirrored texture coordinates
> with clamp
> - are supported.
> +* ``PIPE_CAP_TEXTURE_MIRROR_CLAMP_TO_EDGE``: Whether mirrored texture
> coordinates are
> + supported with the clamp-to-edge wrap mode.
> +* ``PIPE_CAP_TEXTURE_MIRROR_CLAMP``: Whether mirrored texture coordinates
> are supported
> + with clamp or clamp-to-border wrap modes.
> * ``PIPE_CAP_BLEND_EQUATION_SEPARATE``: Whether alpha blend equations may be
> different
> from color blend equations, in :ref:`Blend` state.
> * ``PIPE_CAP_SM3``: Whether the vertex shader and fragment shader support
> equivalent
> diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c
> b/src/gallium/drivers/etnaviv/etnaviv_screen.c
> index 35707e60445..f57e2e8b57e 100644
> --- a/src/gallium/drivers/etnaviv/etnaviv_screen.c
> +++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c
> @@ -181,6 +181,7 @@ etna_screen_get_param(struct pipe_screen *pscreen, enum
> pipe_cap param)
> case PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS: /* no dual-source supported
> */
> case PIPE_CAP_TEXTURE_MULTISAMPLE: /* no texture multisample */
> case PIPE_CAP_TEXTURE_MIRROR_CLAMP: /* only mirrored repeat */
> + case PIPE_CAP_TEXTURE_MIRROR_CLAMP_TO_EDGE: /* only mirrored repeat */
> case PIPE_CAP_INDEP_BLEND_ENABLE:
> case PIPE_CAP_INDEP_BLEND_FUNC:
> case PIPE_CAP_DEPTH_CLIP_DISABLE:
> diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c
> b/src/gallium/drivers/freedreno/freedreno_screen.c
> index 4d54446ec7e..7d91a940817 100644
> --- a/src/gallium/drivers/freedreno/freedreno_screen.c
> +++ b/src/gallium/drivers/freedreno/freedreno_screen.c
> @@ -211,6 +211,7 @@ fd_screen_get_param(struct pipe_screen *pscreen, enum
> pipe_cap param)
> case PIPE_CAP_TGSI_TEXCOORD:
> case PIPE_CAP_PREFER_BLIT_BASED_TEXTURE_TRANSFER:
> case PIPE_CAP_TEXTURE_MIRROR_CLAMP:
> + case PIPE_CAP_TEXTURE_MIRROR_CLAMP_TO_EDGE:
> case PIPE_CAP_QUERY_MEMORY_INFO:
> case PIPE_CAP_PCI_GROUP:
> case PIPE_CAP_PCI_BUS:
> diff --git a/src/gallium/drivers/i915/i915_screen.c
> b/src/gallium/drivers/i915/i915_screen.c
> index dda7c5baee5..e63115c0cb0 100644
> --- a/src/gallium/drivers/i915/i915_screen.c
> +++ b/src/gallium/drivers/i915/i915_screen.c
> @@ -214,6 +214,7 @@ i915_get_param(struct pipe_screen *screen, enum pipe_cap
> cap)
> case PIPE_CAP_INDEP_BLEND_FUNC:
> case PIPE_CAP_SHADER_STENCIL_EXPORT:
> case PIPE_CAP_TEXTURE_MIRROR_CLAMP:
> + case PIPE_CAP_TEXTURE_MIRROR_CLAMP_TO_EDGE:
> case PIPE_CAP_TEXTURE_SWIZZLE:
> case PIPE_CAP_QUERY_TIME_ELAPSED:
> case PIPE_CAP_SM3:
> diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c
> b/src/gallium/drivers/llvmpipe/lp_screen.c
> index 261bca907a6..d749bd041d6 100644
> --- a/src/gallium/drivers/llvmpipe/lp_screen.c
> +++ b/src/gallium/drivers/llvmpipe/lp_screen.c
> @@ -132,6 +132,7 @@ llvmpipe_get_param(struct pipe_screen *screen, enum
> pipe_cap param)
> case PIPE_CAP_QUERY_PIPELINE_STATISTICS:
> return 1;
> case PIPE_CAP_TEXTURE_MIRROR_CLAMP:
> + case PIPE_CAP_TEXTURE_MIRROR_CLAMP_TO_EDGE:
> return 1;
> case PIPE_CAP_TEXTURE_SWIZZLE:
> return 1;
> diff --git a/src/gallium/drivers/nouveau/nv30/nv30_screen.c
> b/src/gallium/drivers/nouveau/nv30/nv30_screen.c
> index 556bd9bbbbe..e9eb2083e2f 100644
> --- a/src/gallium/drivers/nouveau/nv30/nv30_screen.c
> +++ b/src/gallium/drivers/nouveau/nv30/nv30_screen.c
> @@ -104,6 +104,7 @@ nv30_screen_get_param(struct pipe_screen *pscreen, enum
> pipe_cap param)
> case PIPE_CAP_NPOT_TEXTURES:
> case PIPE_CAP_CONDITIONAL_RENDER:
> case PIPE_CAP_TEXTURE_MIRROR_CLAMP:
> + case PIPE_CAP_TEXTURE_MIRROR_CLAMP_TO_EDGE:
> case PIPE_CAP_PRIMITIVE_RESTART:
> return (eng3d->oclass >= NV40_3D_CLASS) ? 1 : 0;
> /* unsupported */
> diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c
> b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
> index cea6818bc9a..2259bb37d65 100644
> --- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c
> +++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
> @@ -147,6 +147,7 @@ nv50_screen_get_param(struct pipe_screen *pscreen, enum
> pipe_cap param)
>
> /* supported caps */
> case PIPE_CAP_TEXTURE_MIRROR_CLAMP:
> + case PIPE_CAP_TEXTURE_MIRROR_CLAMP_TO_EDGE:
> case PIPE_CAP_TEXTURE_SWIZZLE:
> case PIPE_CAP_NPOT_TEXTURES:
> case PIPE_CAP_MIXED_FRAMEBUFFER_SIZES:
> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> index daa4edb0dca..d99eba5c259 100644
> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> @@ -173,6 +173,7 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, enum
> pipe_cap param)
>
> /* supported caps */
> case PIPE_CAP_TEXTURE_MIRROR_CLAMP:
> + case PIPE_CAP_TEXTURE_MIRROR_CLAMP_TO_EDGE:
> case PIPE_CAP_TEXTURE_SWIZZLE:
> case PIPE_CAP_NPOT_TEXTURES:
> case PIPE_CAP_MIXED_FRAMEBUFFER_SIZES:
> diff --git a/src/gallium/drivers/r300/r300_screen.c
> b/src/gallium/drivers/r300/r300_screen.c
> index 046d68c0b59..0ab5da48dd3 100644
> --- a/src/gallium/drivers/r300/r300_screen.c
> +++ b/src/gallium/drivers/r300/r300_screen.c
> @@ -100,6 +100,7 @@ static int r300_get_param(struct pipe_screen* pscreen,
> enum pipe_cap param)
> case PIPE_CAP_POINT_SPRITE:
> case PIPE_CAP_OCCLUSION_QUERY:
> case PIPE_CAP_TEXTURE_MIRROR_CLAMP:
> + case PIPE_CAP_TEXTURE_MIRROR_CLAMP_TO_EDGE:
> case PIPE_CAP_BLEND_EQUATION_SEPARATE:
> case PIPE_CAP_VERTEX_ELEMENT_INSTANCE_DIVISOR:
> case PIPE_CAP_TGSI_FS_COORD_ORIGIN_UPPER_LEFT:
> diff --git a/src/gallium/drivers/r600/r600_pipe.c
> b/src/gallium/drivers/r600/r600_pipe.c
> index ffed69a081e..d3bb307cad9 100644
> --- a/src/gallium/drivers/r600/r600_pipe.c
> +++ b/src/gallium/drivers/r600/r600_pipe.c
> @@ -260,6 +260,7 @@ static int r600_get_param(struct pipe_screen* pscreen,
> enum pipe_cap param)
> case PIPE_CAP_POINT_SPRITE:
> case PIPE_CAP_OCCLUSION_QUERY:
> case PIPE_CAP_TEXTURE_MIRROR_CLAMP:
> + case PIPE_CAP_TEXTURE_MIRROR_CLAMP_TO_EDGE:
> case PIPE_CAP_BLEND_EQUATION_SEPARATE:
> case PIPE_CAP_TEXTURE_SWIZZLE:
> case PIPE_CAP_DEPTH_CLIP_DISABLE:
> diff --git a/src/gallium/drivers/radeonsi/si_get.c
> b/src/gallium/drivers/radeonsi/si_get.c
> index 6e804797bab..fcc75b5364f 100644
> --- a/src/gallium/drivers/radeonsi/si_get.c
> +++ b/src/gallium/drivers/radeonsi/si_get.c
> @@ -96,6 +96,7 @@ static int si_get_param(struct pipe_screen *pscreen, enum
> pipe_cap param)
> case PIPE_CAP_POINT_SPRITE:
> case PIPE_CAP_OCCLUSION_QUERY:
> case PIPE_CAP_TEXTURE_MIRROR_CLAMP:
> + case PIPE_CAP_TEXTURE_MIRROR_CLAMP_TO_EDGE:
> case PIPE_CAP_BLEND_EQUATION_SEPARATE:
> case PIPE_CAP_TEXTURE_SWIZZLE:
> case PIPE_CAP_DEPTH_CLIP_DISABLE:
> diff --git a/src/gallium/drivers/softpipe/sp_screen.c
> b/src/gallium/drivers/softpipe/sp_screen.c
> index 302bebfc396..25a55c0ee7e 100644
> --- a/src/gallium/drivers/softpipe/sp_screen.c
> +++ b/src/gallium/drivers/softpipe/sp_screen.c
> @@ -86,6 +86,7 @@ softpipe_get_param(struct pipe_screen *screen, enum
> pipe_cap param)
> case PIPE_CAP_QUERY_PIPELINE_STATISTICS:
> return 1;
> case PIPE_CAP_TEXTURE_MIRROR_CLAMP:
> + case PIPE_CAP_TEXTURE_MIRROR_CLAMP_TO_EDGE:
> return 1;
> case PIPE_CAP_TEXTURE_SWIZZLE:
> return 1;
> diff --git a/src/gallium/drivers/svga/svga_screen.c
> b/src/gallium/drivers/svga/svga_screen.c
> index b8f936ee967..fffb27857a2 100644
> --- a/src/gallium/drivers/svga/svga_screen.c
> +++ b/src/gallium/drivers/svga/svga_screen.c
> @@ -343,6 +343,7 @@ svga_get_param(struct pipe_screen *screen, enum pipe_cap
> param)
>
> /* Unsupported features */
> case PIPE_CAP_TEXTURE_MIRROR_CLAMP:
> + case PIPE_CAP_TEXTURE_MIRROR_CLAMP_TO_EDGE:
> case PIPE_CAP_SHADER_STENCIL_EXPORT:
> case PIPE_CAP_SEAMLESS_CUBE_MAP_PER_TEXTURE:
> case PIPE_CAP_INDEP_BLEND_FUNC:
> diff --git a/src/gallium/drivers/swr/swr_screen.cpp
> b/src/gallium/drivers/swr/swr_screen.cpp
> index 084f55dab99..0994a9fe4da 100644
> --- a/src/gallium/drivers/swr/swr_screen.cpp
> +++ b/src/gallium/drivers/swr/swr_screen.cpp
> @@ -216,6 +216,7 @@ swr_get_param(struct pipe_screen *screen, enum pipe_cap
> param)
> case PIPE_CAP_QUERY_TIME_ELAPSED:
> case PIPE_CAP_QUERY_PIPELINE_STATISTICS:
> case PIPE_CAP_TEXTURE_MIRROR_CLAMP:
> + case PIPE_CAP_TEXTURE_MIRROR_CLAMP_TO_EDGE:
> case PIPE_CAP_TEXTURE_SWIZZLE:
> case PIPE_CAP_BLEND_EQUATION_SEPARATE:
> case PIPE_CAP_INDEP_BLEND_ENABLE:
> diff --git a/src/gallium/drivers/v3d/v3d_screen.c
> b/src/gallium/drivers/v3d/v3d_screen.c
> index 28334aeba4c..0e245d22f88 100644
> --- a/src/gallium/drivers/v3d/v3d_screen.c
> +++ b/src/gallium/drivers/v3d/v3d_screen.c
> @@ -171,6 +171,7 @@ v3d_screen_get_param(struct pipe_screen *pscreen, enum
> pipe_cap param)
> case PIPE_CAP_BUFFER_SAMPLER_VIEW_RGBA_ONLY:
> case PIPE_CAP_CUBE_MAP_ARRAY:
> case PIPE_CAP_TEXTURE_MIRROR_CLAMP:
> + case PIPE_CAP_TEXTURE_MIRROR_CLAMP_TO_EDGE:
> case PIPE_CAP_SEAMLESS_CUBE_MAP:
> case PIPE_CAP_VERTEX_BUFFER_OFFSET_4BYTE_ALIGNED_ONLY:
> case PIPE_CAP_VERTEX_BUFFER_STRIDE_4BYTE_ALIGNED_ONLY:
> diff --git a/src/gallium/drivers/vc4/vc4_screen.c
> b/src/gallium/drivers/vc4/vc4_screen.c
> index 646e7fa7231..c8d8c29d420 100644
> --- a/src/gallium/drivers/vc4/vc4_screen.c
> +++ b/src/gallium/drivers/vc4/vc4_screen.c
> @@ -184,6 +184,7 @@ vc4_screen_get_param(struct pipe_screen *pscreen, enum
> pipe_cap param)
> case PIPE_CAP_BUFFER_SAMPLER_VIEW_RGBA_ONLY:
> case PIPE_CAP_CUBE_MAP_ARRAY:
> case PIPE_CAP_TEXTURE_MIRROR_CLAMP:
> + case PIPE_CAP_TEXTURE_MIRROR_CLAMP_TO_EDGE:
> case PIPE_CAP_VERTEX_ELEMENT_INSTANCE_DIVISOR:
> case PIPE_CAP_MIXED_COLORBUFFER_FORMATS:
> case PIPE_CAP_SEAMLESS_CUBE_MAP:
> diff --git a/src/gallium/drivers/virgl/virgl_screen.c
> b/src/gallium/drivers/virgl/virgl_screen.c
> index 421fde5249d..0d372cd9627 100644
> --- a/src/gallium/drivers/virgl/virgl_screen.c
> +++ b/src/gallium/drivers/virgl/virgl_screen.c
> @@ -72,6 +72,7 @@ virgl_get_param(struct pipe_screen *screen, enum pipe_cap
> param)
> case PIPE_CAP_OCCLUSION_QUERY:
> return vscreen->caps.caps.v1.bset.occlusion_query;
> case PIPE_CAP_TEXTURE_MIRROR_CLAMP:
> + case PIPE_CAP_TEXTURE_MIRROR_CLAMP_TO_EDGE:
> return vscreen->caps.caps.v1.bset.mirror_clamp;
> case PIPE_CAP_TEXTURE_SWIZZLE:
> return 1;
> diff --git a/src/gallium/include/pipe/p_defines.h
> b/src/gallium/include/pipe/p_defines.h
> index 9909b2b9ae0..094acbe89d1 100644
> --- a/src/gallium/include/pipe/p_defines.h
> +++ b/src/gallium/include/pipe/p_defines.h
> @@ -815,6 +815,7 @@ enum pipe_cap
> PIPE_CAP_MAX_CONSERVATIVE_RASTER_SUBPIXEL_PRECISION_BIAS,
> PIPE_CAP_CONSERVATIVE_RASTER_POST_DEPTH_COVERAGE,
> PIPE_CAP_PROGRAMMABLE_SAMPLE_LOCATIONS,
> + PIPE_CAP_TEXTURE_MIRROR_CLAMP_TO_EDGE,
> };
>
> /**
> diff --git a/src/mesa/state_tracker/st_extensions.c
> b/src/mesa/state_tracker/st_extensions.c
> index db08d5169af..af2fcf37e36 100644
> --- a/src/mesa/state_tracker/st_extensions.c
> +++ b/src/mesa/state_tracker/st_extensions.c
> @@ -679,7 +679,7 @@ void st_init_extensions(struct pipe_screen *screen,
> { o(ARB_texture_buffer_object), PIPE_CAP_TEXTURE_BUFFER_OBJECTS
> },
> { o(ARB_texture_cube_map_array), PIPE_CAP_CUBE_MAP_ARRAY
> },
> { o(ARB_texture_gather),
> PIPE_CAP_MAX_TEXTURE_GATHER_COMPONENTS },
> - { o(ARB_texture_mirror_clamp_to_edge), PIPE_CAP_TEXTURE_MIRROR_CLAMP
> },
> + { o(ARB_texture_mirror_clamp_to_edge),
> PIPE_CAP_TEXTURE_MIRROR_CLAMP_TO_EDGE },
> { o(ARB_texture_multisample), PIPE_CAP_TEXTURE_MULTISAMPLE
> },
> { o(ARB_texture_non_power_of_two), PIPE_CAP_NPOT_TEXTURES
> },
> { o(ARB_texture_query_lod), PIPE_CAP_TEXTURE_QUERY_LOD
> },
> --
> 2.18.0
>
> _______________________________________________
> 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
