From c7729effa67a6fdf420a0dbd8dc7c14ecb141cd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 17 Nov 2023 16:08:01 -0500 Subject: [PATCH] radeonsi: group equal CAP cases Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/gallium/drivers/radeonsi/si_get.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_get.c b/src/gallium/drivers/radeonsi/si_get.c index 672c0cce298..1ed7f474ca0 100644 --- a/src/gallium/drivers/radeonsi/si_get.c +++ b/src/gallium/drivers/radeonsi/si_get.c @@ -259,15 +259,13 @@ static int si_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_VERTEX_BUFFER_STRIDE_4BYTE_ALIGNED_ONLY: case PIPE_CAP_VERTEX_ELEMENT_SRC_OFFSET_4BYTE_ALIGNED_ONLY: case PIPE_CAP_PREFER_BACK_BUFFER_REUSE: + case PIPE_CAP_UMA: + case PIPE_CAP_PREFER_IMM_ARRAYS_AS_CONSTBUF: return 0; case PIPE_CAP_SPARSE_BUFFER_PAGE_SIZE: return enable_sparse ? RADEON_SPARSE_PAGE_SIZE : 0; - case PIPE_CAP_UMA: - case PIPE_CAP_PREFER_IMM_ARRAYS_AS_CONSTBUF: - return 0; - case PIPE_CAP_CONTEXT_PRIORITY_MASK: if (!(sscreen->info.is_amdgpu && sscreen->info.drm_minor >= 22)) return 0; @@ -293,6 +291,7 @@ static int si_get_param(struct pipe_screen *pscreen, enum pipe_cap param) return 30; case PIPE_CAP_MAX_VARYINGS: + case PIPE_CAP_MAX_GS_INVOCATIONS: return 32; case PIPE_CAP_TEXTURE_BORDER_COLOR_QUIRK: @@ -311,9 +310,6 @@ static int si_get_param(struct pipe_screen *pscreen, enum pipe_cap param) return 256; case PIPE_CAP_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS: return 1024; - case PIPE_CAP_MAX_GS_INVOCATIONS: - /* Even though the hw supports more, we officially wanna expose only 32. */ - return 32; case PIPE_CAP_MAX_VERTEX_ATTRIB_STRIDE: return 2048;