allow bindDescriptorSet() to take a null handle

google · Oct 29, 2024 · ecedbad · ecedbad
1 parent d1998c1
commit ecedbad
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/filament/backend/src/opengl/OpenGLDriver.cpp b/filament/backend/src/opengl/OpenGLDriver.cpp
@@ -3875,6 +3875,14 @@ void OpenGLDriver::bindDescriptorSet(
         backend::DescriptorSetHandle dsh,
         backend::descriptor_set_t set,
         backend::DescriptorSetOffsetArray&& offsets) {
+
+    if (UTILS_UNLIKELY(!dsh)) {
+        mBoundDescriptorSets[set].dsh = dsh;
+        mInvalidDescriptorSetBindings.set(set, true);
+        mInvalidDescriptorSetBindingOffsets.set(set, true);
+        return;
+    }
+
     // handle_cast<> here also serves to validate the handle (it actually cannot return nullptr)
     GLDescriptorSet const* const ds = handle_cast<GLDescriptorSet*>(dsh);
     if (ds) {