diff --git a/src/mapi/glapi/gen/EXT_external_objects_win32.xml b/src/mapi/glapi/gen/EXT_external_objects_win32.xml new file mode 100644 index 00000000000..7fccee9284c --- /dev/null +++ b/src/mapi/glapi/gen/EXT_external_objects_win32.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index cc5d9488d84..ebef7bed397 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -12898,6 +12898,7 @@ + diff --git a/src/mapi/glapi/gen/meson.build b/src/mapi/glapi/gen/meson.build index 1b807585d1a..d82589398a4 100644 --- a/src/mapi/glapi/gen/meson.build +++ b/src/mapi/glapi/gen/meson.build @@ -115,6 +115,7 @@ api_xml_files = files( 'EXT_draw_buffers2.xml', 'EXT_external_objects.xml', 'EXT_external_objects_fd.xml', + 'EXT_external_objects_win32.xml', 'EXT_framebuffer_object.xml', 'EXT_gpu_shader4.xml', 'EXT_multisampled_render_to_texture.xml', diff --git a/src/mapi/glapi/gen/static_data.py b/src/mapi/glapi/gen/static_data.py index c634304d925..88a51036729 100644 --- a/src/mapi/glapi/gen/static_data.py +++ b/src/mapi/glapi/gen/static_data.py @@ -1691,6 +1691,8 @@ offsets = { "VertexAttribs4hvNV": 1655, "TexPageCommitmentARB": 1656, "TexturePageCommitmentEXT": 1657, + "ImportMemoryWin32HandleEXT": 1658, + "ImportSemaphoreWin32HandleEXT": 1659, } functions = [ diff --git a/src/mesa/main/consts_exts.h b/src/mesa/main/consts_exts.h index 8af55ad3085..ac436389b52 100644 --- a/src/mesa/main/consts_exts.h +++ b/src/mesa/main/consts_exts.h @@ -176,6 +176,7 @@ struct gl_extensions GLboolean EXT_gpu_shader4; GLboolean EXT_memory_object; GLboolean EXT_memory_object_fd; + GLboolean EXT_memory_object_win32; GLboolean EXT_multisampled_render_to_texture; GLboolean EXT_packed_float; GLboolean EXT_pixel_buffer_object; @@ -183,6 +184,7 @@ struct gl_extensions GLboolean EXT_render_snorm; GLboolean EXT_semaphore; GLboolean EXT_semaphore_fd; + GLboolean EXT_semaphore_win32; GLboolean EXT_shader_image_load_formatted; GLboolean EXT_shader_image_load_store; GLboolean EXT_shader_integer_mix; diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h index e1a242a598b..696a9aaea81 100644 --- a/src/mesa/main/extensions_table.h +++ b/src/mesa/main/extensions_table.h @@ -261,6 +261,7 @@ EXT(EXT_gpu_shader5 , ARB_gpu_shader5 EXT(EXT_map_buffer_range , ARB_map_buffer_range , x , x , ES1, ES2, 2012) EXT(EXT_memory_object , EXT_memory_object , GLL, GLC, x , ES2, 2017) EXT(EXT_memory_object_fd , EXT_memory_object_fd , GLL, GLC, x , ES2, 2017) +EXT(EXT_memory_object_win32 , EXT_memory_object_win32 , GLL, GLC, x , ES2, 2017) EXT(EXT_multi_draw_arrays , dummy_true , GLL, x , ES1, ES2, 1999) EXT(EXT_multisampled_render_to_texture , EXT_multisampled_render_to_texture , x , x , x , ES2, 2016) EXT(EXT_multisampled_render_to_texture2 , EXT_multisampled_render_to_texture , x , x , x , ES2, 2016) @@ -281,6 +282,7 @@ EXT(EXT_sRGB_write_control , EXT_framebuffer_sRGB EXT(EXT_secondary_color , dummy_true , GLL, x , x , x , 1999) EXT(EXT_semaphore , EXT_semaphore , GLL, GLC, x , ES2, 2017) EXT(EXT_semaphore_fd , EXT_semaphore_fd , GLL, GLC, x , ES2, 2017) +EXT(EXT_semaphore_win32 , EXT_semaphore_win32 , GLL, GLC, x , ES2, 2017) EXT(EXT_separate_shader_objects , dummy_true , x , x , x , ES2, 2013) EXT(EXT_separate_specular_color , dummy_true , GLL, x , x , x , 1997) EXT(EXT_shader_framebuffer_fetch , EXT_shader_framebuffer_fetch , GLL, GLC, x , ES2, 2013) diff --git a/src/mesa/main/externalobjects.c b/src/mesa/main/externalobjects.c index 0462df4b757..960db7390a8 100644 --- a/src/mesa/main/externalobjects.c +++ b/src/mesa/main/externalobjects.c @@ -995,6 +995,14 @@ _mesa_ImportMemoryFdEXT(GLuint memory, memObj->Immutable = GL_TRUE; } +void GLAPIENTRY +_mesa_ImportMemoryWin32HandleEXT(GLuint memory, + GLuint64 size, + GLenum handleType, + void *handle) +{ +} + void GLAPIENTRY _mesa_ImportSemaphoreFdEXT(GLuint semaphore, GLenum handleType, @@ -1030,3 +1038,10 @@ _mesa_ImportSemaphoreFdEXT(GLuint semaphore, import_semaphoreobj_fd(ctx, semObj, fd); } + +void GLAPIENTRY +_mesa_ImportSemaphoreWin32HandleEXT(GLuint semaphore, + GLenum handleType, + void *handle) +{ +} \ No newline at end of file