fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 15:48:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

nvk: Only run one INVALIDATE_SHADER_CACHES

Browse source 
This is presumably the same cache across compute and 3d, so we only need
to run one of these, not two.

Reviewed-by: Mary Guillemard <mary@mary.zone>
Reviewed-by: Mohamed Ahmed <mohamedahmedegypt2001@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37671>
This commit is contained in:
Mel Henning 2025-08-06 18:42:19 -04:00 • committed by Marge Bot
parent b56b5b90f7
commit 6c44390e80
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/nouveau/vulkan/nvk_cmd_buffer.c
View file

@ -525,6 +525,10 @@ nvk_cmd_flush_wait_dep(struct nvk_cmd_buffer *cmd,
const VkDependencyInfo *dep,
bool wait)
{
VkQueueFlags queue_flags = nvk_cmd_buffer_queue_flags(cmd);
enum nvkmd_engines engines =
nvk_queue_engines_from_queue_flags(queue_flags);
enum nvk_barrier barriers = 0;
for (uint32_t i = 0; i < dep->memoryBarrierCount; i++) {
@ -548,18 +552,16 @@ nvk_cmd_flush_wait_dep(struct nvk_cmd_buffer *cmd,
if (!barriers)
return;
struct nv_push *p = nvk_cmd_buffer_push(cmd, 4);
struct nv_push *p = nvk_cmd_buffer_push(cmd, 2);
if (barriers & NVK_BARRIER_FLUSH_SHADER_DATA) {
assert(barriers & (NVK_BARRIER_RENDER_WFI | NVK_BARRIER_COMPUTE_WFI));
if (barriers & NVK_BARRIER_RENDER_WFI) {
/* This is also implicitly a WFI */
if (engines & NVKMD_ENGINE_3D) {
P_IMMD(p, NVA097, INVALIDATE_SHADER_CACHES, {
.data = DATA_TRUE,
.flush_data = FLUSH_DATA_TRUE,
});
}
if (barriers & NVK_BARRIER_COMPUTE_WFI) {
} else {
P_IMMD(p, NVA0C0, INVALIDATE_SHADER_CACHES, {
.data = DATA_TRUE,
.flush_data = FLUSH_DATA_TRUE,