Fix OpenGL ES 2.0 descriptor set crash (#8176)

google · Oct 4, 2024 · c3c9fe1 · c3c9fe1
1 parent e9e7911
commit c3c9fe1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/filament/backend/src/opengl/GLDescriptorSet.cpp b/filament/backend/src/opengl/GLDescriptorSet.cpp
@@ -67,7 +67,9 @@ GLDescriptorSet::GLDescriptorSet(OpenGLContext& gl, DescriptorSetLayoutHandle ds
                 bool const dynamicOffset = any(entry.flags & DescriptorFlags::DYNAMIC_OFFSET);
                 dynamicBuffers.set(index, dynamicOffset);
                 if (UTILS_UNLIKELY(gl.isES2())) {
-                    dynamicBufferCount++;
+                    if (dynamicOffset) {
+                        dynamicBufferCount++;
+                    }
                     desc.emplace<BufferGLES2>(dynamicOffset);
                 } else {
                     auto const type = GLUtils::getBufferBindingType(BufferObjectBinding::UNIFORM);

diff --git a/filament/backend/src/opengl/OpenGLDriver.cpp b/filament/backend/src/opengl/OpenGLDriver.cpp
@@ -3892,6 +3892,7 @@ void OpenGLDriver::bindDescriptorSet(
         // `offsets` data's lifetime will end when this function returns. We have to make a copy.
         // (the data is allocated inside the CommandStream)
         mBoundDescriptorSets[set].dsh = dsh;
+        assert_invariant(offsets.data() != nullptr || ds->getDynamicBufferCount() == 0);
         std::copy_n(offsets.data(), ds->getDynamicBufferCount(),
                 mBoundDescriptorSets[set].offsets.data());
     }