From 7241b3e010a0b544e9f33d355d83074a7321f2ce Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Fri, 17 Apr 2026 13:56:38 +0200 Subject: [PATCH] mesa/st: do not advertise CL subgroup features on the GL side MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: 2a5227981e3 ("gallium: add SUBGROUP_FEATURE bits for rotate and rotate_clustered") Reviewed-by: Marek Olšák (cherry picked from commit 9fb54a209276157f291c212eb5f944483952ef86) Part-of: --- .pick_status.json | 2 +- src/mesa/state_tracker/st_extensions.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index a9db48290ee..e01344800b3 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1664,7 +1664,7 @@ "description": "mesa/st: do not advertise CL subgroup features on the GL side", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "2a5227981e3634313a9358aa8a9632d924675572", "notes": null diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index 97860d3c5bb..7dde5cb652a 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -639,7 +639,8 @@ void st_init_limits(struct pipe_screen *screen, c->ShaderSubgroupSupportedStages = mesa_to_gl_stages(screen->caps.shader_subgroup_supported_stages); c->ShaderSubgroupSupportedFeatures = - screen->caps.shader_subgroup_supported_features; + screen->caps.shader_subgroup_supported_features & + BITFIELD_MASK(PIPE_SHADER_SUBGROUP_NUM_FEATURES); c->ShaderSubgroupQuadAllStages = screen->caps.shader_subgroup_quad_all_stages; }