Mesa (main): turnip: Drop unused vshs_workgroup param
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Jul 14 02:20:02 UTC 2021
Module: Mesa
Branch: main
Commit: 948d87dab8d29668fbc43a141f146ca02773881c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=948d87dab8d29668fbc43a141f146ca02773881c
Author: Rob Clark <robdclark at chromium.org>
Date: Thu Jul 8 08:49:18 2021 -0700
turnip: Drop unused vshs_workgroup param
Unused since d968995c67f5e3a48e49015184f9ea1f143251ec, and this gets rid
of one more gpu_id check.
Signed-off-by: Rob Clark <robdclark at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11790>
---
src/freedreno/vulkan/tu_clear_blit.c | 2 +-
src/freedreno/vulkan/tu_pipeline.c | 6 ++----
src/freedreno/vulkan/tu_private.h | 3 +--
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/freedreno/vulkan/tu_clear_blit.c b/src/freedreno/vulkan/tu_clear_blit.c
index b1880edfcad..5384b9e5bd7 100644
--- a/src/freedreno/vulkan/tu_clear_blit.c
+++ b/src/freedreno/vulkan/tu_clear_blit.c
@@ -492,7 +492,7 @@ r3d_common(struct tu_cmd_buffer *cmd, struct tu_cs *cs, bool blit, uint32_t num_
tu_cs_emit(cs, 0);
tu_cs_emit_regs(cs, A6XX_VFD_MULTIVIEW_CNTL());
- tu6_emit_vpc(cs, &vs, NULL, NULL, NULL, &fs, 0, false);
+ tu6_emit_vpc(cs, &vs, NULL, NULL, NULL, &fs, 0);
/* REPL_MODE for varying with RECTLIST (2 vertices only) */
tu_cs_emit_regs(cs, A6XX_VPC_VARYING_INTERP_MODE(0, 0));
diff --git a/src/freedreno/vulkan/tu_pipeline.c b/src/freedreno/vulkan/tu_pipeline.c
index f69e9db17b2..3e2f51e0db6 100644
--- a/src/freedreno/vulkan/tu_pipeline.c
+++ b/src/freedreno/vulkan/tu_pipeline.c
@@ -846,8 +846,7 @@ tu6_emit_vpc(struct tu_cs *cs,
const struct ir3_shader_variant *ds,
const struct ir3_shader_variant *gs,
const struct ir3_shader_variant *fs,
- uint32_t patch_control_points,
- bool vshs_workgroup)
+ uint32_t patch_control_points)
{
/* note: doesn't compile as static because of the array regs.. */
const struct reg_config {
@@ -1630,8 +1629,7 @@ tu6_emit_program(struct tu_cs *cs,
tu_cs_emit_pkt4(cs, REG_A6XX_SP_HS_WAVE_INPUT_SIZE, 1);
tu_cs_emit(cs, 0);
- tu6_emit_vpc(cs, vs, hs, ds, gs, fs, cps_per_patch,
- builder->device->physical_device->gpu_id == 650);
+ tu6_emit_vpc(cs, vs, hs, ds, gs, fs, cps_per_patch);
tu6_emit_vpc_varying_modes(cs, fs);
bool no_earlyz = builder->depth_attachment_format == VK_FORMAT_S8_UINT;
diff --git a/src/freedreno/vulkan/tu_private.h b/src/freedreno/vulkan/tu_private.h
index b7338c4058a..a2ba4b8f47b 100644
--- a/src/freedreno/vulkan/tu_private.h
+++ b/src/freedreno/vulkan/tu_private.h
@@ -1255,8 +1255,7 @@ tu6_emit_vpc(struct tu_cs *cs,
const struct ir3_shader_variant *ds,
const struct ir3_shader_variant *gs,
const struct ir3_shader_variant *fs,
- uint32_t patch_control_points,
- bool vshs_workgroup);
+ uint32_t patch_control_points);
void
tu6_emit_fs_inputs(struct tu_cs *cs, const struct ir3_shader_variant *fs);
More information about the mesa-commit
mailing list