diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2022-01-31 10:43:54 -0500 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2022-02-07 21:49:42 -0800 |
| commit | a04818a500e162d32aac2b62313e671e8d3c3df4 (patch) | |
| tree | cb9b8f974747f406f797197cbb3757dedf50a984 | |
| parent | 59b2c1dddeed061843e783f0514b6913cddd937d (diff) | |
zink: fix PIPE_CAP_TGSI_BALLOT export conditional
this requires VK_EXT_shader_subgroup_ballot
cc: mesa-stable
fixes (lavapipe):
KHR-GL46.shader_ballot_tests.ShaderBallotAvailability
KHR-GL46.shader_ballot_tests.ShaderBallotFunctionRead
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14858>
(cherry picked from commit e38c13830fcbe8f3784dc3adbd736ea72b67fdea)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/zink/zink_screen.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index 44a692a5f6f..2e2fb3c9fc5 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -31,7 +31,7 @@ "description": "zink: fix PIPE_CAP_TGSI_BALLOT export conditional", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index 1713226e3c8..90add7e8c18 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -468,7 +468,7 @@ zink_get_param(struct pipe_screen *pscreen, enum pipe_cap param) return 1; case PIPE_CAP_TGSI_BALLOT: - return screen->vk_version >= VK_MAKE_VERSION(1,2,0) && screen->info.props11.subgroupSize <= 64; + return screen->info.have_vulkan12 && screen->info.have_EXT_shader_subgroup_ballot && screen->info.props11.subgroupSize <= 64; case PIPE_CAP_SAMPLE_SHADING: return screen->info.feats.features.sampleRateShading; |