From: Rémi Bernon <rbernon@codeweavers.com> It is EGL specific. --- dlls/opengl32/make_opengl | 3 +- dlls/opengl32/thunks.c | 21 ----------- dlls/opengl32/unix_thunks.c | 72 ------------------------------------- dlls/opengl32/unixlib.h | 22 ------------ include/wine/wgl.h | 5 --- 5 files changed, 1 insertion(+), 122 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index fcca05838bf..9824efd3375 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -301,14 +301,12 @@ my %wow64_invalidate_buffer = "glBufferData" => 1, "glBufferDataARB" => 1, "glBufferStorage" => 1, - "glBufferStorageExternalEXT" => 1, "glBufferStorageMemEXT" => 1, "glNamedBufferAttachMemoryNV" => 1, "glNamedBufferData" => 1, "glNamedBufferDataEXT" => 1, "glNamedBufferStorage" => 1, "glNamedBufferStorageEXT" => 1, - "glNamedBufferStorageExternalEXT" => 1, "glNamedBufferStorageMemEXT" => 1, ); my %pointer_array_count = @@ -1106,6 +1104,7 @@ my %unsupported_extgroups = ); my %unsupported_extensions = ( + "GL_EXT_external_buffer" => 1, "WGL_AMD_gpu_association" => 1, "WGL_ARB_buffer_region" => 1, "WGL_EXT_display_color_table" => 1, diff --git a/dlls/opengl32/thunks.c b/dlls/opengl32/thunks.c index 1c471268d8b..3083ad3ad60 100644 --- a/dlls/opengl32/thunks.c +++ b/dlls/opengl32/thunks.c @@ -4022,14 +4022,6 @@ static void WINAPI glBufferStorage( GLenum target, GLsizeiptr size, const void * if ((status = UNIX_CALL( glBufferStorage, &args ))) WARN( "glBufferStorage returned %#lx\n", status ); } -static void WINAPI glBufferStorageExternalEXT( GLenum target, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags ) -{ - struct glBufferStorageExternalEXT_params args = { .teb = NtCurrentTeb(), .target = target, .offset = offset, .size = size, .clientBuffer = clientBuffer, .flags = flags }; - NTSTATUS status; - TRACE( "target %d, offset %Id, size %Id, clientBuffer %p, flags %d\n", target, offset, size, clientBuffer, flags ); - if ((status = UNIX_CALL( glBufferStorageExternalEXT, &args ))) WARN( "glBufferStorageExternalEXT returned %#lx\n", status ); -} - static void WINAPI glBufferStorageMemEXT( GLenum target, GLsizeiptr size, GLuint memory, GLuint64 offset ) { struct glBufferStorageMemEXT_params args = { .teb = NtCurrentTeb(), .target = target, .size = size, .offset = offset }; @@ -15220,15 +15212,6 @@ static void WINAPI glNamedBufferStorageEXT( GLuint buffer, GLsizeiptr size, cons if ((status = UNIX_CALL( glNamedBufferStorageEXT, &args ))) WARN( "glNamedBufferStorageEXT returned %#lx\n", status ); } -static void WINAPI glNamedBufferStorageExternalEXT( GLuint buffer, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags ) -{ - struct glNamedBufferStorageExternalEXT_params args = { .teb = NtCurrentTeb(), .offset = offset, .size = size, .clientBuffer = clientBuffer, .flags = flags }; - NTSTATUS status; - TRACE( "buffer %d, offset %Id, size %Id, clientBuffer %p, flags %d\n", buffer, offset, size, clientBuffer, flags ); - args.buffer = *map_context_objects( OBJ_TYPE_BUFFER, 1, &buffer ); - if ((status = UNIX_CALL( glNamedBufferStorageExternalEXT, &args ))) WARN( "glNamedBufferStorageExternalEXT returned %#lx\n", status ); -} - static void WINAPI glNamedBufferStorageMemEXT( GLuint buffer, GLsizeiptr size, GLuint memory, GLuint64 offset ) { struct glNamedBufferStorageMemEXT_params args = { .teb = NtCurrentTeb(), .size = size, .offset = offset }; @@ -26248,7 +26231,6 @@ const void *extension_procs[] = glBufferParameteriAPPLE, glBufferRegionEnabled, glBufferStorage, - glBufferStorageExternalEXT, glBufferStorageMemEXT, glBufferSubData, glBufferSubDataARB, @@ -27569,7 +27551,6 @@ const void *extension_procs[] = glNamedBufferPageCommitmentMemNV, glNamedBufferStorage, glNamedBufferStorageEXT, - glNamedBufferStorageExternalEXT, glNamedBufferStorageMemEXT, glNamedBufferSubData, glNamedBufferSubDataEXT, @@ -29009,7 +28990,6 @@ const struct registry_entry extension_registry[] = { "glBufferParameteriAPPLE", glBufferParameteriAPPLE, 0, 0, { GL_APPLE_flush_buffer_range, GL_EXTENSION_COUNT }}, { "glBufferRegionEnabled", glBufferRegionEnabled, 0, 0, { GL_KTX_buffer_region, GL_EXTENSION_COUNT }}, { "glBufferStorage", glBufferStorage, 4, 4, { GL_ARB_buffer_storage, GL_EXTENSION_COUNT }}, - { "glBufferStorageExternalEXT", glBufferStorageExternalEXT, 0, 0, { GL_EXT_external_buffer, GL_EXTENSION_COUNT }}, { "glBufferStorageMemEXT", glBufferStorageMemEXT, 0, 0, { GL_EXT_memory_object, GL_EXTENSION_COUNT }}, { "glBufferSubData", glBufferSubData, 1, 5, { GL_EXTENSION_COUNT }}, { "glBufferSubDataARB", glBufferSubDataARB, 0, 0, { GL_ARB_vertex_buffer_object, GL_EXTENSION_COUNT }}, @@ -30330,7 +30310,6 @@ const struct registry_entry extension_registry[] = { "glNamedBufferPageCommitmentMemNV", glNamedBufferPageCommitmentMemNV, 0, 0, { GL_NV_memory_object_sparse, GL_EXTENSION_COUNT }}, { "glNamedBufferStorage", glNamedBufferStorage, 4, 5, { GL_ARB_direct_state_access, GL_EXTENSION_COUNT }}, { "glNamedBufferStorageEXT", glNamedBufferStorageEXT, 0, 0, { GL_EXT_direct_state_access, GL_EXTENSION_COUNT }}, - { "glNamedBufferStorageExternalEXT", glNamedBufferStorageExternalEXT, 0, 0, { GL_EXT_external_buffer, GL_EXTENSION_COUNT }}, { "glNamedBufferStorageMemEXT", glNamedBufferStorageMemEXT, 0, 0, { GL_EXT_memory_object, GL_EXTENSION_COUNT }}, { "glNamedBufferSubData", glNamedBufferSubData, 4, 5, { GL_ARB_direct_state_access, GL_EXTENSION_COUNT }}, { "glNamedBufferSubDataEXT", glNamedBufferSubDataEXT, 0, 0, { GL_EXT_direct_state_access, GL_EXTENSION_COUNT }}, diff --git a/dlls/opengl32/unix_thunks.c b/dlls/opengl32/unix_thunks.c index 1d3f8a8dbd3..04b6b25bfd5 100644 --- a/dlls/opengl32/unix_thunks.c +++ b/dlls/opengl32/unix_thunks.c @@ -4818,16 +4818,6 @@ static NTSTATUS ext_glBufferStorage( void *args ) return STATUS_SUCCESS; } -static NTSTATUS ext_glBufferStorageExternalEXT( void *args ) -{ - struct glBufferStorageExternalEXT_params *params = args; - const struct opengl_funcs *funcs = params->teb->glTable; - if (!funcs->p_glBufferStorageExternalEXT) return STATUS_NOT_IMPLEMENTED; - funcs->p_glBufferStorageExternalEXT( params->target, params->offset, params->size, params->clientBuffer, params->flags ); - set_context_attribute( params->teb, -1 /* unsupported */, NULL, 0 ); - return STATUS_SUCCESS; -} - static NTSTATUS ext_glBufferStorageMemEXT( void *args ) { struct glBufferStorageMemEXT_params *params = args; @@ -17627,16 +17617,6 @@ static NTSTATUS ext_glNamedBufferStorageEXT( void *args ) return STATUS_SUCCESS; } -static NTSTATUS ext_glNamedBufferStorageExternalEXT( void *args ) -{ - struct glNamedBufferStorageExternalEXT_params *params = args; - const struct opengl_funcs *funcs = params->teb->glTable; - if (!funcs->p_glNamedBufferStorageExternalEXT) return STATUS_NOT_IMPLEMENTED; - funcs->p_glNamedBufferStorageExternalEXT( params->buffer, params->offset, params->size, params->clientBuffer, params->flags ); - set_context_attribute( params->teb, -1 /* unsupported */, NULL, 0 ); - return STATUS_SUCCESS; -} - static NTSTATUS ext_glNamedBufferStorageMemEXT( void *args ) { struct glNamedBufferStorageMemEXT_params *params = args; @@ -31006,7 +30986,6 @@ const unixlib_entry_t __wine_unix_call_funcs[] = ext_glBufferParameteriAPPLE, ext_glBufferRegionEnabled, ext_glBufferStorage, - ext_glBufferStorageExternalEXT, ext_glBufferStorageMemEXT, ext_glBufferSubData, ext_glBufferSubDataARB, @@ -32327,7 +32306,6 @@ const unixlib_entry_t __wine_unix_call_funcs[] = ext_glNamedBufferPageCommitmentMemNV, ext_glNamedBufferStorage, ext_glNamedBufferStorageEXT, - ext_glNamedBufferStorageExternalEXT, ext_glNamedBufferStorageMemEXT, ext_glNamedBufferSubData, ext_glNamedBufferSubDataEXT, @@ -41649,30 +41627,6 @@ static NTSTATUS wow64_ext_glBufferStorage( void *args ) return STATUS_SUCCESS; } -static NTSTATUS wow64_ext_glBufferStorageExternalEXT( void *args ) -{ - struct - { - PTR32 teb; - GLenum target; - PTR32 offset; - PTR32 size; - PTR32 clientBuffer; - GLbitfield flags; - } *params = args; - TEB *teb = get_teb64( params->teb ); - struct buffer *buffer; - const struct opengl_funcs *funcs = teb->glTable; - if (!funcs->p_glBufferStorageExternalEXT) return STATUS_NOT_IMPLEMENTED; - pthread_mutex_lock( &wgl_lock ); - buffer = invalidate_buffer_target( teb, params->target ); - funcs->p_glBufferStorageExternalEXT( params->target, (GLintptr)ULongToPtr(params->offset), (GLsizeiptr)ULongToPtr(params->size), ULongToPtr(params->clientBuffer), params->flags ); - pthread_mutex_unlock( &wgl_lock ); - set_context_attribute( teb, -1 /* unsupported */, NULL, 0 ); - if (buffer) free_buffer( funcs, buffer ); - return STATUS_SUCCESS; -} - static NTSTATUS wow64_ext_glBufferStorageMemEXT( void *args ) { struct @@ -64353,30 +64307,6 @@ static NTSTATUS wow64_ext_glNamedBufferStorageEXT( void *args ) return STATUS_SUCCESS; } -static NTSTATUS wow64_ext_glNamedBufferStorageExternalEXT( void *args ) -{ - struct - { - PTR32 teb; - GLuint buffer; - PTR32 offset; - PTR32 size; - PTR32 clientBuffer; - GLbitfield flags; - } *params = args; - TEB *teb = get_teb64( params->teb ); - struct buffer *buffer; - const struct opengl_funcs *funcs = teb->glTable; - if (!funcs->p_glNamedBufferStorageExternalEXT) return STATUS_NOT_IMPLEMENTED; - pthread_mutex_lock( &wgl_lock ); - buffer = invalidate_buffer_name( teb, params->buffer ); - funcs->p_glNamedBufferStorageExternalEXT( params->buffer, (GLintptr)ULongToPtr(params->offset), (GLsizeiptr)ULongToPtr(params->size), ULongToPtr(params->clientBuffer), params->flags ); - pthread_mutex_unlock( &wgl_lock ); - set_context_attribute( teb, -1 /* unsupported */, NULL, 0 ); - if (buffer) free_buffer( funcs, buffer ); - return STATUS_SUCCESS; -} - static NTSTATUS wow64_ext_glNamedBufferStorageMemEXT( void *args ) { struct @@ -87322,7 +87252,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_ext_glBufferParameteriAPPLE, wow64_ext_glBufferRegionEnabled, wow64_ext_glBufferStorage, - wow64_ext_glBufferStorageExternalEXT, wow64_ext_glBufferStorageMemEXT, wow64_ext_glBufferSubData, wow64_ext_glBufferSubDataARB, @@ -88643,7 +88572,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_ext_glNamedBufferPageCommitmentMemNV, wow64_ext_glNamedBufferStorage, wow64_ext_glNamedBufferStorageEXT, - wow64_ext_glNamedBufferStorageExternalEXT, wow64_ext_glNamedBufferStorageMemEXT, wow64_ext_glNamedBufferSubData, wow64_ext_glNamedBufferSubDataEXT, diff --git a/dlls/opengl32/unixlib.h b/dlls/opengl32/unixlib.h index 8f5f6391bbe..6df1d2fafd4 100644 --- a/dlls/opengl32/unixlib.h +++ b/dlls/opengl32/unixlib.h @@ -3699,16 +3699,6 @@ struct glBufferStorage_params GLbitfield flags; }; -struct glBufferStorageExternalEXT_params -{ - TEB *teb; - GLenum target; - GLintptr offset; - GLsizeiptr size; - GLeglClientBufferEXT clientBuffer; - GLbitfield flags; -}; - struct glBufferStorageMemEXT_params { TEB *teb; @@ -14898,16 +14888,6 @@ struct glNamedBufferStorageEXT_params GLbitfield flags; }; -struct glNamedBufferStorageExternalEXT_params -{ - TEB *teb; - GLuint buffer; - GLintptr offset; - GLsizeiptr size; - GLeglClientBufferEXT clientBuffer; - GLbitfield flags; -}; - struct glNamedBufferStorageMemEXT_params { TEB *teb; @@ -26293,7 +26273,6 @@ enum unix_funcs unix_glBufferParameteriAPPLE, unix_glBufferRegionEnabled, unix_glBufferStorage, - unix_glBufferStorageExternalEXT, unix_glBufferStorageMemEXT, unix_glBufferSubData, unix_glBufferSubDataARB, @@ -27614,7 +27593,6 @@ enum unix_funcs unix_glNamedBufferPageCommitmentMemNV, unix_glNamedBufferStorage, unix_glNamedBufferStorageEXT, - unix_glNamedBufferStorageExternalEXT, unix_glNamedBufferStorageMemEXT, unix_glNamedBufferSubData, unix_glNamedBufferSubDataEXT, diff --git a/include/wine/wgl.h b/include/wine/wgl.h index 3b46ee51b87..36df3a2d5ee 100644 --- a/include/wine/wgl.h +++ b/include/wine/wgl.h @@ -7880,7 +7880,6 @@ typedef void (GLAPIENTRY *PFN_glBufferParameteriAPPLE)( GLenum target, GLe typedef GLuint (GLAPIENTRY *PFN_glBufferRegionEnabled)(void); typedef void (GLAPIENTRY *PFN_glBufferStorage)( GLenum target, GLsizeiptr size, const void *data, GLbitfield flags ); typedef void (GLAPIENTRY *PFN_glBufferStorageEXT)( GLenum target, GLsizeiptr size, const void *data, GLbitfield flags ); -typedef void (GLAPIENTRY *PFN_glBufferStorageExternalEXT)( GLenum target, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags ); typedef void (GLAPIENTRY *PFN_glBufferStorageMemEXT)( GLenum target, GLsizeiptr size, GLuint memory, GLuint64 offset ); typedef void (GLAPIENTRY *PFN_glBufferSubData)( GLenum target, GLintptr offset, GLsizeiptr size, const void *data ); typedef void (GLAPIENTRY *PFN_glBufferSubDataARB)( GLenum target, GLintptrARB offset, GLsizeiptrARB size, const void *data ); @@ -9353,7 +9352,6 @@ typedef void (GLAPIENTRY *PFN_glNamedBufferPageCommitmentEXT)( GLuint buff typedef void (GLAPIENTRY *PFN_glNamedBufferPageCommitmentMemNV)( GLuint buffer, GLintptr offset, GLsizeiptr size, GLuint memory, GLuint64 memOffset, GLboolean commit ); typedef void (GLAPIENTRY *PFN_glNamedBufferStorage)( GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags ); typedef void (GLAPIENTRY *PFN_glNamedBufferStorageEXT)( GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags ); -typedef void (GLAPIENTRY *PFN_glNamedBufferStorageExternalEXT)( GLuint buffer, GLintptr offset, GLsizeiptr size, GLeglClientBufferEXT clientBuffer, GLbitfield flags ); typedef void (GLAPIENTRY *PFN_glNamedBufferStorageMemEXT)( GLuint buffer, GLsizeiptr size, GLuint memory, GLuint64 offset ); typedef void (GLAPIENTRY *PFN_glNamedBufferSubData)( GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data ); typedef void (GLAPIENTRY *PFN_glNamedBufferSubDataEXT)( GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data ); @@ -11444,7 +11442,6 @@ typedef BOOL (GLAPIENTRY *PFN_wglSwapIntervalEXT)( int interval ); USE_GL_EXT(GL_EXT_draw_buffers2) \ USE_GL_EXT(GL_EXT_draw_instanced) \ USE_GL_EXT(GL_EXT_draw_range_elements) \ - USE_GL_EXT(GL_EXT_external_buffer) \ USE_GL_EXT(GL_EXT_float_blend) \ USE_GL_EXT(GL_EXT_fog_coord) \ USE_GL_EXT(GL_EXT_frag_depth) \ @@ -12434,7 +12431,6 @@ typedef BOOL (GLAPIENTRY *PFN_wglSwapIntervalEXT)( int interval ); USE_GL_FUNC(glBufferRegionEnabled) \ USE_GL_FUNC(glBufferStorage) \ USE_GL_FUNC(glBufferStorageEXT) \ - USE_GL_FUNC(glBufferStorageExternalEXT) \ USE_GL_FUNC(glBufferStorageMemEXT) \ USE_GL_FUNC(glBufferSubData) \ USE_GL_FUNC(glBufferSubDataARB) \ @@ -13907,7 +13903,6 @@ typedef BOOL (GLAPIENTRY *PFN_wglSwapIntervalEXT)( int interval ); USE_GL_FUNC(glNamedBufferPageCommitmentMemNV) \ USE_GL_FUNC(glNamedBufferStorage) \ USE_GL_FUNC(glNamedBufferStorageEXT) \ - USE_GL_FUNC(glNamedBufferStorageExternalEXT) \ USE_GL_FUNC(glNamedBufferStorageMemEXT) \ USE_GL_FUNC(glNamedBufferSubData) \ USE_GL_FUNC(glNamedBufferSubDataEXT) \ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11226