From dcaa2903c3bb96e97bf679d0a721536aaa019a29 Mon Sep 17 00:00:00 2001 From: Mike Date: Mon, 5 Oct 2026 01:47:40 -0500 Subject: Avoid the Apple OpenGL null-fence crash during precache (#30) glDeleteBuffers and glWaitSync on a failed fence both fault in GLDFenceRec::getStatus on Apple's GL/Metal translator. Finish and unbind before deleting buffers, skip a null upload fence, and resize depth targets with the unsized format Apple accepts. --- indra/llrender/llvertexbuffer.cpp | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'indra/llrender/llvertexbuffer.cpp') diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index 8a73a68c54..a827927809 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -315,7 +315,28 @@ static void delete_buffers(S32 count, GLuint* buffers) if (!sFreeList[idx].empty()) { - glDeleteBuffers((GLsizei)sFreeList[idx].size(), sFreeList[idx].data()); + if (gGLManager.mIsApple) + { + // Apple's GL/Metal translator crashes in GLDFenceRec::getStatus + // (null fence, fault at +0x24) when glDeleteBuffers waits on a + // sync that was never created. Unbind and finish first. + glBindBuffer(GL_ARRAY_BUFFER, 0); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); + LLVertexBuffer::sGLRenderBuffer = 0; + LLVertexBuffer::sGLRenderIndices = 0; + glFinish(); + for (GLuint name : sFreeList[idx]) + { + if (name) + { + glDeleteBuffers(1, &name); + } + } + } + else + { + glDeleteBuffers((GLsizei)sFreeList[idx].size(), sFreeList[idx].data()); + } sFreeList[idx].resize(0); } } -- cgit v1.3