fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-07 00:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa/main: properly check for EXT_memory_object_win32

Browse source 
This extension isn't supported in GLES 1.x, so let's tighten the check.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32349>
This commit is contained in:
Erik Faye-Lund 2024-11-26 11:15:40 +01:00 • committed by Marge Bot
parent d90c81740d
commit da04f4cb92
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/main/externalobjects.c
View file

@ -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;
}

2
src/mesa/main/get.c
View file

@ -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;