[Mesa-dev] [PATCH] gallium: drop all the guard band float caps.
Roland Scheidegger
sroland at vmware.com
Mon Feb 12 22:16:15 UTC 2018
Looks alright to me. Not sure why they were introduced - d3d9 has
queryable caps for them (d3d10 does not, allows guard band but not
required). Maybe they were relevant for d3d9 software vertex processing
mode at some point, but it looks like we never actually used them with
gallium.
Reviewed-by: Roland Scheidegger <sroland at vmware.com>
Am 12.02.2018 um 20:32 schrieb Dave Airlie:
> From: Dave Airlie <airlied at redhat.com>
>
> Nobody queries these and nobody sets them to anything useful,
> the docs say TODO.
>
> Drop them until a use appears.
>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
> ---
> src/gallium/docs/source/screen.rst | 4 ----
> src/gallium/drivers/etnaviv/etnaviv_screen.c | 5 -----
> src/gallium/drivers/freedreno/freedreno_screen.c | 5 -----
> src/gallium/drivers/llvmpipe/lp_screen.c | 5 -----
> src/gallium/drivers/nouveau/nv50/nv50_screen.c | 6 ------
> src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 6 ------
> src/gallium/drivers/r300/r300_screen.c | 5 -----
> src/gallium/drivers/r600/r600_pipe_common.c | 5 -----
> src/gallium/drivers/radeonsi/si_get.c | 5 -----
> src/gallium/drivers/softpipe/sp_screen.c | 5 -----
> src/gallium/drivers/svga/svga_screen.c | 5 -----
> src/gallium/drivers/swr/swr_screen.cpp | 5 -----
> src/gallium/drivers/vc4/vc4_screen.c | 5 -----
> src/gallium/drivers/vc5/vc5_screen.c | 5 -----
> src/gallium/drivers/virgl/virgl_screen.c | 5 -----
> src/gallium/include/pipe/p_defines.h | 4 ----
> 16 files changed, 80 deletions(-)
>
> diff --git a/src/gallium/docs/source/screen.rst b/src/gallium/docs/source/screen.rst
> index cb3418fce35..95b62534493 100644
> --- a/src/gallium/docs/source/screen.rst
> +++ b/src/gallium/docs/source/screen.rst
> @@ -431,10 +431,6 @@ The floating-point capabilities are:
> applied to anisotropically filtered textures.
> * ``PIPE_CAPF_MAX_TEXTURE_LOD_BIAS``: The maximum :term:`LOD` bias that may be applied
> to filtered textures.
> -* ``PIPE_CAPF_GUARD_BAND_LEFT``,
> - ``PIPE_CAPF_GUARD_BAND_TOP``,
> - ``PIPE_CAPF_GUARD_BAND_RIGHT``,
> - ``PIPE_CAPF_GUARD_BAND_BOTTOM``: TODO
>
>
> .. _pipe_shader_cap:
> diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c b/src/gallium/drivers/etnaviv/etnaviv_screen.c
> index d5d1f4fdad2..16b58d3f03f 100644
> --- a/src/gallium/drivers/etnaviv/etnaviv_screen.c
> +++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c
> @@ -367,11 +367,6 @@ etna_screen_get_paramf(struct pipe_screen *pscreen, enum pipe_capf param)
> return 16.0f;
> case PIPE_CAPF_MAX_TEXTURE_LOD_BIAS:
> return util_last_bit(screen->specs.max_texture_size);
> - case PIPE_CAPF_GUARD_BAND_LEFT:
> - case PIPE_CAPF_GUARD_BAND_TOP:
> - case PIPE_CAPF_GUARD_BAND_RIGHT:
> - case PIPE_CAPF_GUARD_BAND_BOTTOM:
> - return 0.0f;
> }
>
> debug_printf("unknown paramf %d", param);
> diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c
> index 438817d0034..eb5c436e109 100644
> --- a/src/gallium/drivers/freedreno/freedreno_screen.c
> +++ b/src/gallium/drivers/freedreno/freedreno_screen.c
> @@ -476,11 +476,6 @@ fd_screen_get_paramf(struct pipe_screen *pscreen, enum pipe_capf param)
> return 16.0f;
> case PIPE_CAPF_MAX_TEXTURE_LOD_BIAS:
> return 15.0f;
> - case PIPE_CAPF_GUARD_BAND_LEFT:
> - case PIPE_CAPF_GUARD_BAND_TOP:
> - case PIPE_CAPF_GUARD_BAND_RIGHT:
> - case PIPE_CAPF_GUARD_BAND_BOTTOM:
> - return 0.0f;
> }
> debug_printf("unknown paramf %d\n", param);
> return 0;
> diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
> index b46ea06775d..439e15bc1a7 100644
> --- a/src/gallium/drivers/llvmpipe/lp_screen.c
> +++ b/src/gallium/drivers/llvmpipe/lp_screen.c
> @@ -420,11 +420,6 @@ llvmpipe_get_paramf(struct pipe_screen *screen, enum pipe_capf param)
> return 16.0; /* not actually signficant at this time */
> case PIPE_CAPF_MAX_TEXTURE_LOD_BIAS:
> return 16.0; /* arbitrary */
> - case PIPE_CAPF_GUARD_BAND_LEFT:
> - case PIPE_CAPF_GUARD_BAND_TOP:
> - case PIPE_CAPF_GUARD_BAND_RIGHT:
> - case PIPE_CAPF_GUARD_BAND_BOTTOM:
> - return 0.0;
> }
> /* should only get here on unhandled cases */
> debug_printf("Unexpected PIPE_CAP %d query\n", param);
> diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
> index 4c13d04eb75..5c006e6be75 100644
> --- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c
> +++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
> @@ -396,12 +396,6 @@ nv50_screen_get_paramf(struct pipe_screen *pscreen, enum pipe_capf param)
> return 16.0f;
> case PIPE_CAPF_MAX_TEXTURE_LOD_BIAS:
> return 4.0f;
> - case PIPE_CAPF_GUARD_BAND_LEFT:
> - case PIPE_CAPF_GUARD_BAND_TOP:
> - return 0.0f;
> - case PIPE_CAPF_GUARD_BAND_RIGHT:
> - case PIPE_CAPF_GUARD_BAND_BOTTOM:
> - return 0.0f; /* that or infinity */
> }
>
> NOUVEAU_ERR("unknown PIPE_CAPF %d\n", param);
> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> index 7ba8086a533..322382adceb 100644
> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> @@ -449,12 +449,6 @@ nvc0_screen_get_paramf(struct pipe_screen *pscreen, enum pipe_capf param)
> return 16.0f;
> case PIPE_CAPF_MAX_TEXTURE_LOD_BIAS:
> return 15.0f;
> - case PIPE_CAPF_GUARD_BAND_LEFT:
> - case PIPE_CAPF_GUARD_BAND_TOP:
> - return 0.0f;
> - case PIPE_CAPF_GUARD_BAND_RIGHT:
> - case PIPE_CAPF_GUARD_BAND_BOTTOM:
> - return 0.0f; /* that or infinity */
> }
>
> NOUVEAU_ERR("unknown PIPE_CAPF %d\n", param);
> diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c
> index e0ae57c5858..825b1118c2a 100644
> --- a/src/gallium/drivers/r300/r300_screen.c
> +++ b/src/gallium/drivers/r300/r300_screen.c
> @@ -473,11 +473,6 @@ static float r300_get_paramf(struct pipe_screen* pscreen,
> return 16.0f;
> case PIPE_CAPF_MAX_TEXTURE_LOD_BIAS:
> return 16.0f;
> - case PIPE_CAPF_GUARD_BAND_LEFT:
> - case PIPE_CAPF_GUARD_BAND_TOP:
> - case PIPE_CAPF_GUARD_BAND_RIGHT:
> - case PIPE_CAPF_GUARD_BAND_BOTTOM:
> - return 0.0f;
> default:
> debug_printf("r300: Warning: Unknown CAP %d in get_paramf.\n",
> param);
> diff --git a/src/gallium/drivers/r600/r600_pipe_common.c b/src/gallium/drivers/r600/r600_pipe_common.c
> index 5d14e588b51..026e8dc9868 100644
> --- a/src/gallium/drivers/r600/r600_pipe_common.c
> +++ b/src/gallium/drivers/r600/r600_pipe_common.c
> @@ -910,11 +910,6 @@ static float r600_get_paramf(struct pipe_screen* pscreen,
> return 16.0f;
> case PIPE_CAPF_MAX_TEXTURE_LOD_BIAS:
> return 16.0f;
> - case PIPE_CAPF_GUARD_BAND_LEFT:
> - case PIPE_CAPF_GUARD_BAND_TOP:
> - case PIPE_CAPF_GUARD_BAND_RIGHT:
> - case PIPE_CAPF_GUARD_BAND_BOTTOM:
> - return 0.0f;
> }
> return 0.0f;
> }
> diff --git a/src/gallium/drivers/radeonsi/si_get.c b/src/gallium/drivers/radeonsi/si_get.c
> index 14d7ca5ba6a..ef03a962d1e 100644
> --- a/src/gallium/drivers/radeonsi/si_get.c
> +++ b/src/gallium/drivers/radeonsi/si_get.c
> @@ -364,11 +364,6 @@ static float si_get_paramf(struct pipe_screen* pscreen, enum pipe_capf param)
> return 16.0f;
> case PIPE_CAPF_MAX_TEXTURE_LOD_BIAS:
> return 16.0f;
> - case PIPE_CAPF_GUARD_BAND_LEFT:
> - case PIPE_CAPF_GUARD_BAND_TOP:
> - case PIPE_CAPF_GUARD_BAND_RIGHT:
> - case PIPE_CAPF_GUARD_BAND_BOTTOM:
> - return 0.0f;
> }
> return 0.0f;
> }
> diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
> index b790d3e7571..f02da809469 100644
> --- a/src/gallium/drivers/softpipe/sp_screen.c
> +++ b/src/gallium/drivers/softpipe/sp_screen.c
> @@ -360,11 +360,6 @@ softpipe_get_paramf(struct pipe_screen *screen, enum pipe_capf param)
> return 16.0;
> case PIPE_CAPF_MAX_TEXTURE_LOD_BIAS:
> return 16.0; /* arbitrary */
> - case PIPE_CAPF_GUARD_BAND_LEFT:
> - case PIPE_CAPF_GUARD_BAND_TOP:
> - case PIPE_CAPF_GUARD_BAND_RIGHT:
> - case PIPE_CAPF_GUARD_BAND_BOTTOM:
> - return 0.0;
> }
> /* should only get here on unhandled cases */
> debug_printf("Unexpected PIPE_CAPF %d query\n", param);
> diff --git a/src/gallium/drivers/svga/svga_screen.c b/src/gallium/drivers/svga/svga_screen.c
> index 4a6a0a9c5e8..29f383ea3b8 100644
> --- a/src/gallium/drivers/svga/svga_screen.c
> +++ b/src/gallium/drivers/svga/svga_screen.c
> @@ -167,11 +167,6 @@ svga_get_paramf(struct pipe_screen *screen, enum pipe_capf param)
> case PIPE_CAPF_MAX_TEXTURE_LOD_BIAS:
> return 15.0;
>
> - case PIPE_CAPF_GUARD_BAND_LEFT:
> - case PIPE_CAPF_GUARD_BAND_TOP:
> - case PIPE_CAPF_GUARD_BAND_RIGHT:
> - case PIPE_CAPF_GUARD_BAND_BOTTOM:
> - return 0.0;
> }
>
> debug_printf("Unexpected PIPE_CAPF_ query %u\n", param);
> diff --git a/src/gallium/drivers/swr/swr_screen.cpp b/src/gallium/drivers/swr/swr_screen.cpp
> index 888b62f8b08..ff0c2bb8a5c 100644
> --- a/src/gallium/drivers/swr/swr_screen.cpp
> +++ b/src/gallium/drivers/swr/swr_screen.cpp
> @@ -398,11 +398,6 @@ swr_get_paramf(struct pipe_screen *screen, enum pipe_capf param)
> return 0.0;
> case PIPE_CAPF_MAX_TEXTURE_LOD_BIAS:
> return 16.0; /* arbitrary */
> - case PIPE_CAPF_GUARD_BAND_LEFT:
> - case PIPE_CAPF_GUARD_BAND_TOP:
> - case PIPE_CAPF_GUARD_BAND_RIGHT:
> - case PIPE_CAPF_GUARD_BAND_BOTTOM:
> - return 0.0;
> }
> /* should only get here on unhandled cases */
> debug_printf("Unexpected PIPE_CAPF %d query\n", param);
> diff --git a/src/gallium/drivers/vc4/vc4_screen.c b/src/gallium/drivers/vc4/vc4_screen.c
> index ccf4b3c8fa6..606a92101a8 100644
> --- a/src/gallium/drivers/vc4/vc4_screen.c
> +++ b/src/gallium/drivers/vc4/vc4_screen.c
> @@ -373,11 +373,6 @@ vc4_screen_get_paramf(struct pipe_screen *pscreen, enum pipe_capf param)
> return 0.0f;
> case PIPE_CAPF_MAX_TEXTURE_LOD_BIAS:
> return 0.0f;
> - case PIPE_CAPF_GUARD_BAND_LEFT:
> - case PIPE_CAPF_GUARD_BAND_TOP:
> - case PIPE_CAPF_GUARD_BAND_RIGHT:
> - case PIPE_CAPF_GUARD_BAND_BOTTOM:
> - return 0.0f;
> default:
> fprintf(stderr, "unknown paramf %d\n", param);
> return 0;
> diff --git a/src/gallium/drivers/vc5/vc5_screen.c b/src/gallium/drivers/vc5/vc5_screen.c
> index b69562389b2..66f4dd9cf94 100644
> --- a/src/gallium/drivers/vc5/vc5_screen.c
> +++ b/src/gallium/drivers/vc5/vc5_screen.c
> @@ -332,11 +332,6 @@ vc5_screen_get_paramf(struct pipe_screen *pscreen, enum pipe_capf param)
> return 0.0f;
> case PIPE_CAPF_MAX_TEXTURE_LOD_BIAS:
> return 16.0f;
> - case PIPE_CAPF_GUARD_BAND_LEFT:
> - case PIPE_CAPF_GUARD_BAND_TOP:
> - case PIPE_CAPF_GUARD_BAND_RIGHT:
> - case PIPE_CAPF_GUARD_BAND_BOTTOM:
> - return 0.0f;
> default:
> fprintf(stderr, "unknown paramf %d\n", param);
> return 0;
> diff --git a/src/gallium/drivers/virgl/virgl_screen.c b/src/gallium/drivers/virgl/virgl_screen.c
> index ca73b90e0fd..72c675cc645 100644
> --- a/src/gallium/drivers/virgl/virgl_screen.c
> +++ b/src/gallium/drivers/virgl/virgl_screen.c
> @@ -363,11 +363,6 @@ virgl_get_paramf(struct pipe_screen *screen, enum pipe_capf param)
> return 16.0;
> case PIPE_CAPF_MAX_TEXTURE_LOD_BIAS:
> return 16.0; /* arbitrary */
> - case PIPE_CAPF_GUARD_BAND_LEFT:
> - case PIPE_CAPF_GUARD_BAND_TOP:
> - case PIPE_CAPF_GUARD_BAND_RIGHT:
> - case PIPE_CAPF_GUARD_BAND_BOTTOM:
> - return 0.0;
> }
> /* should only get here on unhandled cases */
> debug_printf("Unexpected PIPE_CAPF %d query\n", param);
> diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
> index 778e5f4e539..ab9d6a81ef2 100644
> --- a/src/gallium/include/pipe/p_defines.h
> +++ b/src/gallium/include/pipe/p_defines.h
> @@ -832,10 +832,6 @@ enum pipe_capf
> PIPE_CAPF_MAX_POINT_WIDTH_AA,
> PIPE_CAPF_MAX_TEXTURE_ANISOTROPY,
> PIPE_CAPF_MAX_TEXTURE_LOD_BIAS,
> - PIPE_CAPF_GUARD_BAND_LEFT,
> - PIPE_CAPF_GUARD_BAND_TOP,
> - PIPE_CAPF_GUARD_BAND_RIGHT,
> - PIPE_CAPF_GUARD_BAND_BOTTOM
> };
>
> /** Shader caps not specific to any single stage */
>
More information about the mesa-dev
mailing list