Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions crates/overlay/src/renderer/opengl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,7 @@ impl GlInteropTexture {
&& gl::ImportMemoryWin32HandleEXT::is_loaded()
{
return Ok(Self::MemoryObject(
MemoryObjectTexture::open(surface, extensions)
.context("external memory texture")?,
MemoryObjectTexture::open(surface).context("external memory texture")?,
));
}

Expand Down Expand Up @@ -211,7 +210,7 @@ struct MemoryObjectTexture {
}

impl MemoryObjectTexture {
fn open(surface: &OverlaySurface, extensions: &HashSet<String>) -> anyhow::Result<Self> {
fn open(surface: &OverlaySurface) -> anyhow::Result<Self> {
unsafe {
let memory_object = scopeguard::guard(
{
Expand Down Expand Up @@ -278,9 +277,11 @@ impl MemoryObjectTexture {

Ok(Self {
memory_object: ScopeGuard::into_inner(memory_object),
keyed_mutex: surface.mutex().is_some()
&& extensions.contains("GL_EXT_win32_keyed_mutex")
&& gl::AcquireKeyedMutexWin32EXT::is_loaded(),
// Disable keyed mutex until freeze issue is resolved.
// keyed_mutex: surface.mutex().is_some()
// && extensions.contains("GL_EXT_win32_keyed_mutex")
// && gl::AcquireKeyedMutexWin32EXT::is_loaded(),
keyed_mutex: false,
id: ScopeGuard::into_inner(texture),
})
}
Expand Down
Loading