summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2024-01-02 21:32:25 +0100
committerGitHub <noreply@github.com>2024-01-02 21:32:25 +0100
commit07b88600b793104b21244aa36d0cc37b689e9b95 (patch)
tree8dabbb082057c6ff87e1d95689ab7cc6e86bd8db
parent2158f88a88bcd5212db447e62d87082c786871b2 (diff)
parent1c5c8cf6ff828e0b992a30ec4dc0a05cc961d8c0 (diff)
downloadredot-engine-07b88600b793104b21244aa36d0cc37b689e9b95.tar.gz
Merge pull request #86522 from RandomShaper/fix_uset_rebind
RenderingDevice: Fix uniform sets wrongly assumed to be bound
-rw-r--r--servers/rendering/rendering_device.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/servers/rendering/rendering_device.cpp b/servers/rendering/rendering_device.cpp
index 93b54d24ae..30bf47a096 100644
--- a/servers/rendering/rendering_device.cpp
+++ b/servers/rendering/rendering_device.cpp
@@ -4125,7 +4125,7 @@ void RenderingDevice::draw_list_bind_render_pipeline(DrawListID p_list, RID p_re
}
for (uint32_t i = 0; i < pcount; i++) {
- dl->state.sets[i].bound = i < first_invalid_set;
+ dl->state.sets[i].bound = dl->state.sets[i].bound && i < first_invalid_set;
dl->state.sets[i].pipeline_expected_format = pformats[i];
}
@@ -4718,7 +4718,7 @@ void RenderingDevice::compute_list_bind_compute_pipeline(ComputeListID p_list, R
}
for (uint32_t i = 0; i < pcount; i++) {
- cl->state.sets[i].bound = i >= first_invalid_set;
+ cl->state.sets[i].bound = cl->state.sets[i].bound && i < first_invalid_set;
cl->state.sets[i].pipeline_expected_format = pformats[i];
}