diff options
| author | Peter Kim <pk15950@gmail.com> | 2022-09-08 07:00:12 +0300 |
|---|---|---|
| committer | Peter Kim <pk15950@gmail.com> | 2022-09-08 07:00:12 +0300 |
| commit | 00dcfdf916c69672210b006e62d966f1bc2fbeb7 (patch) | |
| tree | 0cbb1b91fe26c750197126085b74224a795a103c /source/blender/gpu/opengl/gl_backend.hh | |
| parent | a39532670f6b668da7be5810fb1f844b82feeba3 (diff) | |
| parent | d5934974219135102f364f57c45a8b1465e2b8d9 (diff) | |
Merge branch 'master' into xr-devxr-dev
Diffstat (limited to 'source/blender/gpu/opengl/gl_backend.hh')
| -rw-r--r-- | source/blender/gpu/opengl/gl_backend.hh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/gpu/opengl/gl_backend.hh b/source/blender/gpu/opengl/gl_backend.hh index 29249111294..8646d94e2fd 100644 --- a/source/blender/gpu/opengl/gl_backend.hh +++ b/source/blender/gpu/opengl/gl_backend.hh @@ -42,11 +42,15 @@ class GLBackend : public GPUBackend { } ~GLBackend() { - GLTexture::samplers_free(); - GLBackend::platform_exit(); } + void delete_resources() override + { + /* Delete any resources with context active. */ + GLTexture::samplers_free(); + } + static GLBackend *get() { return static_cast<GLBackend *>(GPUBackend::get()); @@ -129,11 +133,11 @@ class GLBackend : public GPUBackend { dynamic_cast<GLStorageBuf *>(indirect_buf)->bind_as(GL_DISPATCH_INDIRECT_BUFFER); /* This barrier needs to be here as it only work on the currently bound indirect buffer. */ - glMemoryBarrier(GL_DRAW_INDIRECT_BUFFER); + glMemoryBarrier(GL_COMMAND_BARRIER_BIT); glDispatchComputeIndirect((GLintptr)0); /* Unbind. */ - glBindBuffer(GL_DRAW_INDIRECT_BUFFER, 0); + glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, 0); } /* Render Frame Coordination */ |