From 973e1d4555faf979266d3e74caeec87d565cefe6 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Sat, 27 May 2023 12:05:57 -0700 Subject: [PATCH] freedreno/a6xx: Add missing cap Fixes wrong value reported for GL_MAX_VERTEX_STREAMS. Signed-off-by: Rob Clark Part-of: --- src/freedreno/ci/freedreno-a618-fails.txt | 3 --- src/freedreno/ci/freedreno-a630-fails.txt | 3 --- src/freedreno/ci/freedreno-a660-fails.txt | 3 --- src/gallium/drivers/freedreno/freedreno_screen.c | 4 ++++ 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/freedreno/ci/freedreno-a618-fails.txt b/src/freedreno/ci/freedreno-a618-fails.txt index faaee69c8bf..18e01f441c3 100644 --- a/src/freedreno/ci/freedreno-a618-fails.txt +++ b/src/freedreno/ci/freedreno-a618-fails.txt @@ -19,9 +19,6 @@ KHR-GL45.texture_cube_map_array.color_depth_attachments,Fail # new fails with gl45: # -# Various limits we cannot or do not support: -KHR-GL45.limits.max_vertex_streams,Fail - # MESA: warning: sample averaging on fallback z24s8 blit when we shouldn't. KHR-GL45.direct_state_access.renderbuffers_storage_multisample,Fail diff --git a/src/freedreno/ci/freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt index 336f8fab4dc..b03b6ebd518 100644 --- a/src/freedreno/ci/freedreno-a630-fails.txt +++ b/src/freedreno/ci/freedreno-a630-fails.txt @@ -22,9 +22,6 @@ KHR-GL45.texture_cube_map_array.color_depth_attachments,Fail # new fails with gl45: # -# Various limits we cannot or do not support: -KHR-GL45.limits.max_vertex_streams,Fail - # MESA: warning: sample averaging on fallback z24s8 blit when we shouldn't. KHR-GL45.direct_state_access.renderbuffers_storage_multisample,Fail diff --git a/src/freedreno/ci/freedreno-a660-fails.txt b/src/freedreno/ci/freedreno-a660-fails.txt index 853c3575e8b..7456dc6da2a 100644 --- a/src/freedreno/ci/freedreno-a660-fails.txt +++ b/src/freedreno/ci/freedreno-a660-fails.txt @@ -1,9 +1,6 @@ # Shader compilation error log: 0:6(1): error: invalid stream specified 1 is larger than MAX_VERTEX_STREAMS - 1 KHR-GL45.transform_feedback.draw_xfb_stream_instanced_test,Fail -# Various limits we cannot or do not support: -KHR-GL45.limits.max_vertex_streams,Fail - KHR-GL45.direct_state_access.renderbuffers_storage_multisample,Fail KHR-GL45.gpu_shader_fp64.fp64.max_uniform_components,Fail KHR-GL45.multi_bind.dispatch_bind_image_textures,Fail diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c index 22042a88e2e..d0e46bbc1f4 100644 --- a/src/gallium/drivers/freedreno/freedreno_screen.c +++ b/src/gallium/drivers/freedreno/freedreno_screen.c @@ -473,6 +473,10 @@ fd_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) return !is_a5xx(screen); /* Stream output. */ + case PIPE_CAP_MAX_VERTEX_STREAMS: + if (is_a6xx(screen)) /* has SO + GS */ + return PIPE_MAX_SO_BUFFERS; + return 0; case PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS: if (is_ir3(screen)) return PIPE_MAX_SO_BUFFERS;