From da04f4cb92ff50e665a28199eba53633098eb0b4 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Tue, 26 Nov 2024 11:15:40 +0100 Subject: [PATCH] mesa/main: properly check for EXT_memory_object_win32 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This extension isn't supported in GLES 1.x, so let's tighten the check. Reviewed-by: Marek Olšák Reviewed-by: Rob Clark Part-of: --- src/mesa/main/externalobjects.c | 4 ++-- src/mesa/main/get.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/main/externalobjects.c b/src/mesa/main/externalobjects.c index d406baad1c4..f865471cafb 100644 --- a/src/mesa/main/externalobjects.c +++ b/src/mesa/main/externalobjects.c @@ -1080,7 +1080,7 @@ _mesa_ImportMemoryWin32HandleEXT(GLuint memory, const char *func = "glImportMemoryWin32HandleEXT"; - if (!ctx->Extensions.EXT_memory_object_win32) { + if (!_mesa_has_EXT_memory_object_win32(ctx)) { _mesa_error(ctx, GL_INVALID_OPERATION, "%s(unsupported)", func); return; } @@ -1111,7 +1111,7 @@ _mesa_ImportMemoryWin32NameEXT(GLuint memory, const char *func = "glImportMemoryWin32NameEXT"; - if (!ctx->Extensions.EXT_memory_object_win32) { + if (!_mesa_has_EXT_memory_object_win32(ctx)) { _mesa_error(ctx, GL_INVALID_OPERATION, "%s(unsupported)", func); return; } diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index 451a5e8da34..689cb1bebd8 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -2929,7 +2929,7 @@ find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v) return TYPE_INT_4; /* GL_EXT_memory_object_win32 */ case GL_DEVICE_LUID_EXT: - if (!ctx->Extensions.EXT_memory_object_win32 && !ctx->Extensions.EXT_semaphore_win32) + if (!_mesa_has_EXT_memory_object_win32(ctx) && !ctx->Extensions.EXT_semaphore_win32) goto invalid_enum; if (index >= 1) goto invalid_value;