Mesa (main): radv: Assert that there is no GS copy shader when the pipeline has NGG.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Jun 7 22:23:11 UTC 2021
Module: Mesa
Branch: main
Commit: 18d48c01c2f81034d218dc8fd5f5e9e2830ee0f5
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=18d48c01c2f81034d218dc8fd5f5e9e2830ee0f5
Author: Timur Kristóf <timur.kristof at gmail.com>
Date: Mon May 31 17:46:19 2021 +0200
radv: Assert that there is no GS copy shader when the pipeline has NGG.
Signed-off-by: Timur Kristóf <timur.kristof at gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11092>
---
src/amd/vulkan/radv_pipeline.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index 64c6afae704..d862be9188e 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -5070,8 +5070,10 @@ radv_pipeline_generate_vgt_shader_config(struct radeon_cmdbuf *ctx_cs,
else if (pipeline->shaders[MESA_SHADER_VERTEX])
vs_size = pipeline->shaders[MESA_SHADER_VERTEX]->info.wave_size;
- if (radv_pipeline_has_ngg(pipeline))
+ if (radv_pipeline_has_ngg(pipeline)) {
+ assert(!radv_pipeline_has_gs_copy_shader(pipeline));
gs_size = vs_size;
+ }
/* legacy GS only supports Wave64 */
stages |= S_028B54_HS_W32_EN(hs_size == 32 ? 1 : 0) |
More information about the mesa-commit
mailing list