Mesa (master): freedreno/a5xx+: Stop recompiling on texture samples changes.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 9522087b7544d6f717d6b6aa48ddcd2bfab6566d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9522087b7544d6f717d6b6aa48ddcd2bfab6566d

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Feb 24 14:51:42 2021 -0800

freedreno/a5xx+: Stop recompiling on texture samples changes.

The shader only looks at this bit of the key on a3xx, and a4xx already
didn't set it.  This will help give us precompile hits for MSAA texture
sampling.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9267>

---

 src/gallium/drivers/freedreno/a5xx/fd5_draw.c | 2 --
 src/gallium/drivers/freedreno/a6xx/fd6_draw.c | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_draw.c b/src/gallium/drivers/freedreno/a5xx/fd5_draw.c
index a2bbf887495..97fd45bd6ba 100644
--- a/src/gallium/drivers/freedreno/a5xx/fd5_draw.c
+++ b/src/gallium/drivers/freedreno/a5xx/fd5_draw.c
@@ -114,8 +114,6 @@ fd5_draw_vbo(struct fd_context *ctx, const struct pipe_draw_info *info,
 			.has_per_samp = fd5_ctx->fastc_srgb || fd5_ctx->vastc_srgb,
 			.vastc_srgb = fd5_ctx->vastc_srgb,
 			.fastc_srgb = fd5_ctx->fastc_srgb,
-			.vsamples = ctx->tex[PIPE_SHADER_VERTEX].samples,
-			.fsamples = ctx->tex[PIPE_SHADER_FRAGMENT].samples,
 		},
 		.rasterflat = ctx->rasterizer->flatshade,
 		.sprite_coord_enable = ctx->rasterizer->sprite_coord_enable,
diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_draw.c b/src/gallium/drivers/freedreno/a6xx/fd6_draw.c
index c7af50aa4e5..87f9c922bde 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_draw.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_draw.c
@@ -189,8 +189,6 @@ fd6_draw_vbo(struct fd_context *ctx, const struct pipe_draw_info *info,
 				.rasterflat = ctx->rasterizer->flatshade,
 				.ucp_enables = ctx->rasterizer->clip_plane_enable,
 				.layer_zero = !gs_info || !(gs_info->outputs_written & VARYING_BIT_LAYER),
-				.vsamples = ctx->tex[PIPE_SHADER_VERTEX].samples,
-				.fsamples = ctx->tex[PIPE_SHADER_FRAGMENT].samples,
 				.sample_shading = (ctx->min_samples > 1),
 				.msaa = (ctx->framebuffer.samples > 1),
 			},