wine-commits November 2020

wine-commits@winehq.org

1 participants
851 discussions

Henri Verbeet : wined3d: Use command buffer IDs for synchronisation in wined3d_buffer_gl_sync_apple().
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: a7c320d184fb9d48239caf0f5529b6992477b82b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7c320d184fb9d48239caf0f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 30 18:29:25 2020 +0330 wined3d: Use command buffer IDs for synchronisation in wined3d_buffer_gl_sync_apple(). Analogous to the Vulkan adapter. This is slightly awkward in OpenGL because it doesn't have explicit command buffers like Vulkan, but calling wined3d_context_gl_submit_command_fence() on swapchain present works well enough in practice. The main advantage of this approach is that it avoids using a separate fence for each usage of each bo. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 + dlls/wined3d/buffer.c | 61 +++---------------- dlls/wined3d/context.c | 4 -- dlls/wined3d/context_gl.c | 130 +++++++++++++++++++++++++++++++++-------- dlls/wined3d/query.c | 2 +- dlls/wined3d/swapchain.c | 1 + dlls/wined3d/wined3d_private.h | 34 +++++++++-- 7 files changed, 146 insertions(+), 88 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a7c320d184fb9d48239c…

1 0

Matteo Bruni : wined3d: Use GL_ARB_buffer_storage if available.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 77f0149a6c99fc0289d12a788f630519d7dc49d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77f0149a6c99fc0289d12a78… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Nov 30 18:29:24 2020 +0330 wined3d: Use GL_ARB_buffer_storage if available. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 4 +++- dlls/wined3d/context_gl.c | 11 +++++++---- dlls/wined3d/resource.c | 15 +++++++++++++++ dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/view.c | 4 ++-- dlls/wined3d/wined3d_private.h | 5 +++-- 6 files changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 285ae7231ec..61e35dc1e45 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -201,6 +201,7 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf { const struct wined3d_gl_info *gl_info = context_gl->gl_info; GLenum usage = GL_STATIC_DRAW; + GLbitfield gl_storage_flags; struct wined3d_bo_gl *bo; bool coherent = true; GLsizeiptr size; @@ -216,8 +217,9 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf usage = GL_STREAM_DRAW_ARB; coherent = false; } + gl_storage_flags = wined3d_resource_gl_storage_flags(&buffer_gl->b.resource); bo = &buffer_gl->bo; - if (!wined3d_context_gl_create_bo(context_gl, size, binding, usage, coherent, bo)) + if (!wined3d_context_gl_create_bo(context_gl, size, binding, usage, coherent, gl_storage_flags, bo)) { ERR("Failed to create OpenGL buffer object.\n"); buffer_gl->b.flags &= ~WINED3D_BUFFER_USE_BO; diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 567d6ba56b7..12e5e088713 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2694,13 +2694,13 @@ void wined3d_context_gl_destroy_bo(struct wined3d_context_gl *context_gl, struct } bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizeiptr size, - GLenum binding, GLenum usage, bool coherent, struct wined3d_bo_gl *bo) + GLenum binding, GLenum usage, bool coherent, GLbitfield flags, struct wined3d_bo_gl *bo) { const struct wined3d_gl_info *gl_info = context_gl->gl_info; GLuint id = 0; - TRACE("context_gl %p, size %lu, binding %#x, usage %#x, coherent %#x, bo %p.\n", - context_gl, size, binding, usage, coherent, bo); + TRACE("context_gl %p, size %lu, binding %#x, usage %#x, coherent %#x, flags %#x, bo %p.\n", + context_gl, size, binding, usage, coherent, flags, bo); GL_EXTCALL(glGenBuffers(1, &id)); if (!id) @@ -2716,7 +2716,10 @@ bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizei GL_EXTCALL(glBufferParameteriAPPLE(binding, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)); } - GL_EXTCALL(glBufferData(binding, size, NULL, usage)); + if (gl_info->supported[ARB_BUFFER_STORAGE]) + GL_EXTCALL(glBufferStorage(binding, size, NULL, flags | GL_DYNAMIC_STORAGE_BIT)); + else + GL_EXTCALL(glBufferData(binding, size, NULL, usage)); wined3d_context_gl_bind_bo(context_gl, binding, 0); checkGLcall("buffer object creation"); diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index c8d5fecf9d9..97b8b68374d 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -428,6 +428,21 @@ void wined3d_resource_free_sysmem(struct wined3d_resource *resource) resource->heap_memory = NULL; } +GLbitfield wined3d_resource_gl_storage_flags(const struct wined3d_resource *resource) +{ + uint32_t access = resource->access; + GLbitfield flags = 0; + + if (resource->usage & WINED3DUSAGE_DYNAMIC) + flags |= GL_CLIENT_STORAGE_BIT; + if (access & WINED3D_RESOURCE_ACCESS_MAP_W) + flags |= GL_MAP_WRITE_BIT; + if (access & WINED3D_RESOURCE_ACCESS_MAP_R) + flags |= GL_MAP_READ_BIT; + + return flags; +} + GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) { GLbitfield ret = 0; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b311df0f896..b84b68c592b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1924,8 +1924,8 @@ static void wined3d_texture_gl_prepare_buffer_object(struct wined3d_texture_gl * if (bo->id) return; - if (!wined3d_context_gl_create_bo(context_gl, sub_resource->size, - GL_PIXEL_UNPACK_BUFFER, GL_STREAM_DRAW, true, bo)) + if (!wined3d_context_gl_create_bo(context_gl, sub_resource->size, GL_PIXEL_UNPACK_BUFFER, + GL_STREAM_DRAW, true, GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_CLIENT_STORAGE_BIT, bo)) return; TRACE("Created buffer object %u for texture %p, sub-resource %u.\n", bo->id, texture_gl, sub_resource_idx); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 1d77b0e44fb..4c85e2fefe4 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1415,8 +1415,8 @@ static void wined3d_unordered_access_view_gl_cs_init(void *object) struct wined3d_bo_gl *bo = &view_gl->counter_bo; view_gl->v.counter_bo = (uintptr_t)bo; - wined3d_context_gl_create_bo(context_gl, sizeof(uint32_t), - GL_ATOMIC_COUNTER_BUFFER, GL_STATIC_DRAW, true, bo); + wined3d_context_gl_create_bo(context_gl, sizeof(uint32_t), GL_ATOMIC_COUNTER_BUFFER, + GL_STATIC_DRAW, true, GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_CLIENT_STORAGE_BIT, bo); wined3d_unordered_access_view_set_counter(&view_gl->v, 0); } context_release(&context_gl->c); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9b12295ec52..3dcd3e26846 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2256,8 +2256,8 @@ void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, void wined3d_context_gl_check_fbo_status(const struct wined3d_context_gl *context_gl, GLenum target) DECLSPEC_HIDDEN; void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *dst, const struct wined3d_bo_address *src, size_t size) DECLSPEC_HIDDEN; -bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizeiptr size, - GLenum binding, GLenum usage, bool coherent, struct wined3d_bo_gl *bo) DECLSPEC_HIDDEN; +bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizeiptr size, GLenum binding, + GLenum usage, bool coherent, GLbitfield flags, struct wined3d_bo_gl *bo) DECLSPEC_HIDDEN; void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_destroy_bo(struct wined3d_context_gl *context_gl, struct wined3d_bo_gl *bo) DECLSPEC_HIDDEN; void wined3d_context_gl_draw_shaded_quad(struct wined3d_context_gl *context_gl, struct wined3d_texture_gl *texture_gl, @@ -4049,6 +4049,7 @@ const struct wined3d_format *wined3d_resource_get_decompress_format( unsigned int wined3d_resource_get_sample_count(const struct wined3d_resource *resource) DECLSPEC_HIDDEN; GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; +GLbitfield wined3d_resource_gl_storage_flags(const struct wined3d_resource *resource) DECLSPEC_HIDDEN; BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_HIDDEN; BOOL wined3d_resource_prepare_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) DECLSPEC_HIDDEN;

1 0

Matteo Bruni : wined3d: Introduce wined3d_context_gl_create_bo().
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 90f33067daf0b4e39c24b61dabd0ee634c1f1a36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90f33067daf0b4e39c24b61d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Nov 30 18:29:23 2020 +0330 wined3d: Introduce wined3d_context_gl_create_bo(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 77 ++++++++++-------------------------------- dlls/wined3d/context_gl.c | 35 +++++++++++++++++++ dlls/wined3d/texture.c | 20 +++++------ dlls/wined3d/view.c | 22 +++++------- dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 72 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=90f33067daf0b4e39c24…

1 0

Henri Verbeet : wined3d: Store the usage in struct wined3d_bo_gl.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: db42859977ec31b69c12fe9c6d7846d9cf725e4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=db42859977ec31b69c12fe9c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 30 18:29:22 2020 +0330 wined3d: Store the usage in struct wined3d_bo_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 10 ++++------ dlls/wined3d/texture.c | 3 ++- dlls/wined3d/view.c | 3 ++- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2b24e071c05..0caf933724a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -200,7 +200,6 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf struct wined3d_context_gl *context_gl) { const struct wined3d_gl_info *gl_info = context_gl->gl_info; - GLenum gl_usage = GL_STATIC_DRAW; struct wined3d_bo_gl *bo; GLenum error; @@ -223,6 +222,7 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf bo = &buffer_gl->bo; GL_EXTCALL(glGenBuffers(1, &bo->id)); bo->binding = wined3d_buffer_gl_binding_from_bind_flags(gl_info, buffer_gl->b.resource.bind_flags); + bo->usage = GL_STATIC_DRAW; buffer_gl->b.buffer_object = (uintptr_t)bo; error = gl_info->gl_ops.gl.p_glGetError(); if (!bo->id || error != GL_NO_ERROR) @@ -242,7 +242,7 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf if (buffer_gl->b.resource.usage & WINED3DUSAGE_DYNAMIC) { TRACE("Buffer has WINED3DUSAGE_DYNAMIC set.\n"); - gl_usage = GL_STREAM_DRAW_ARB; + bo->usage = GL_STREAM_DRAW_ARB; if (gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) { @@ -254,7 +254,7 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf /* No setup is needed here for GL_ARB_map_buffer_range. */ } - GL_EXTCALL(glBufferData(bo->binding, buffer_gl->b.resource.size, NULL, gl_usage)); + GL_EXTCALL(glBufferData(bo->binding, buffer_gl->b.resource.size, NULL, bo->usage)); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) { @@ -262,7 +262,6 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf goto fail; } - buffer_gl->buffer_object_usage = gl_usage; buffer_invalidate_bo_range(&buffer_gl->b, 0, 0); return TRUE; @@ -799,8 +798,7 @@ static void wined3d_buffer_gl_sync_apple(struct wined3d_buffer_gl *buffer_gl, { wined3d_buffer_gl_bind(buffer_gl, context_gl); - GL_EXTCALL(glBufferData(buffer_gl->bo.binding, buffer_gl->b.resource.size, - NULL, buffer_gl->buffer_object_usage)); + GL_EXTCALL(glBufferData(buffer_gl->bo.binding, buffer_gl->b.resource.size, NULL, buffer_gl->bo.usage)); checkGLcall("glBufferData"); return; } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0aef891547a..73821cc27a9 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1926,8 +1926,9 @@ static void wined3d_texture_prepare_buffer_object(struct wined3d_texture *textur GL_EXTCALL(glGenBuffers(1, &bo->id)); bo->binding = GL_PIXEL_UNPACK_BUFFER; + bo->usage = GL_STREAM_DRAW; GL_EXTCALL(glBindBuffer(bo->binding, bo->id)); - GL_EXTCALL(glBufferData(bo->binding, sub_resource->size, NULL, GL_STREAM_DRAW)); + GL_EXTCALL(glBufferData(bo->binding, sub_resource->size, NULL, bo->usage)); GL_EXTCALL(glBindBuffer(bo->binding, 0)); checkGLcall("Create buffer object"); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index a690bd4ae6b..bf4c9ca5af1 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1417,8 +1417,9 @@ static void wined3d_unordered_access_view_gl_cs_init(void *object) GL_EXTCALL(glGenBuffers(1, &bo->id)); bo->binding = GL_ATOMIC_COUNTER_BUFFER; + bo->usage = GL_STATIC_DRAW; GL_EXTCALL(glBindBuffer(bo->binding, bo->id)); - GL_EXTCALL(glBufferData(bo->binding, sizeof(initial_value), &initial_value, GL_STATIC_DRAW)); + GL_EXTCALL(glBufferData(bo->binding, sizeof(initial_value), &initial_value, bo->usage)); checkGLcall("create atomic counter buffer"); view_gl->v.counter_bo = (uintptr_t)bo; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fa718501e45..dbdb10a182a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1539,6 +1539,7 @@ struct wined3d_bo_gl { GLuint id; GLenum binding; + GLenum usage; }; static inline GLuint wined3d_bo_gl_id(uintptr_t bo) @@ -4825,7 +4826,6 @@ struct wined3d_buffer_gl struct wined3d_buffer b; struct wined3d_bo_gl bo; - GLenum buffer_object_usage; }; static inline struct wined3d_buffer_gl *wined3d_buffer_gl(struct wined3d_buffer *buffer)

1 0

Matteo Bruni : wined3d: Introduce wined3d_context_gl_destroy_bo().
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 0638d50b22f6192be734694634050523ea01d5d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0638d50b22f6192be7346946… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Nov 30 18:29:21 2020 +0330 wined3d: Introduce wined3d_context_gl_destroy_bo(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/buffer.c | 5 +---- dlls/wined3d/context_gl.c | 12 ++++++++++++ dlls/wined3d/texture.c | 14 +++++--------- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 140948beb6d..cb382cd6734 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4778,7 +4778,7 @@ static void wined3d_view_gl_destroy_object(void *object) gl_info->gl_ops.gl.p_glDeleteTextures(1, &ctx->gl_view->name); } if (counter_id) - GL_EXTCALL(glDeleteBuffers(1, &counter_id)); + wined3d_context_gl_destroy_bo(wined3d_context_gl(context), ctx->counter_bo); checkGLcall("delete resources"); context_release(context); } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f2817eeee04..2b24e071c05 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -142,7 +142,6 @@ static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct w static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context_gl *context_gl) { - const struct wined3d_gl_info *gl_info = context_gl->gl_info; struct wined3d_resource *resource = &buffer_gl->b.resource; struct wined3d_buffer *buffer = &buffer_gl->b; struct wined3d_cs *cs = resource->device->cs; @@ -185,10 +184,8 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu } } - GL_EXTCALL(glDeleteBuffers(1, &buffer_gl->bo.id)); - checkGLcall("glDeleteBuffers"); + wined3d_context_gl_destroy_bo(context_gl, &buffer_gl->bo); buffer_gl->b.buffer_object = 0; - buffer_gl->bo.id = 0; if (buffer_gl->b.fence) { diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index f2b5e8697b6..3a5718e6308 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2681,6 +2681,18 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, } } +void wined3d_context_gl_destroy_bo(struct wined3d_context_gl *context_gl, struct wined3d_bo_gl *bo) +{ + const struct wined3d_gl_info *gl_info = context_gl->gl_info; + + TRACE("context_gl %p, bo %p.\n", context_gl, bo); + + TRACE("Destroying GL buffer %u.\n", bo->id); + GL_EXTCALL(glDeleteBuffers(1, &bo->id)); + checkGLcall("buffer object destruction"); + bo->id = 0; +} + static void wined3d_context_gl_set_render_offscreen(struct wined3d_context_gl *context_gl, BOOL offscreen) { if (context_gl->c.render_offscreen == offscreen) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 41e4415f13f..0aef891547a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -751,18 +751,14 @@ void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int su /* Context activation is done by the caller. */ static void wined3d_texture_remove_buffer_object(struct wined3d_texture *texture, - unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info) + unsigned int sub_resource_idx, struct wined3d_context_gl *context_gl) { struct wined3d_bo_gl *bo = &texture->sub_resources[sub_resource_idx].bo; - GL_EXTCALL(glDeleteBuffers(1, &bo->id)); - checkGLcall("glDeleteBuffers"); - - TRACE("Deleted buffer object %u for texture %p, sub-resource %u.\n", - bo->id, texture, sub_resource_idx); + TRACE("texture %p, sub_resource_idx %u, context_gl %p.\n", texture, sub_resource_idx, context_gl); + wined3d_context_gl_destroy_bo(context_gl, bo); wined3d_texture_invalidate_location(texture, sub_resource_idx, WINED3D_LOCATION_BUFFER); - bo->id = 0; } static void wined3d_texture_update_map_binding(struct wined3d_texture *texture) @@ -781,7 +777,7 @@ static void wined3d_texture_update_map_binding(struct wined3d_texture *texture) && !wined3d_texture_load_location(texture, i, context, map_binding)) ERR("Failed to load location %s.\n", wined3d_debug_location(map_binding)); if (texture->resource.map_binding == WINED3D_LOCATION_BUFFER) - wined3d_texture_remove_buffer_object(texture, i, wined3d_context_gl(context)->gl_info); + wined3d_texture_remove_buffer_object(texture, i, wined3d_context_gl(context)); } context_release(context); @@ -3223,7 +3219,7 @@ static void wined3d_texture_gl_unload_location(struct wined3d_texture *texture, for (i = 0; i < sub_count; ++i) { if (texture_gl->t.sub_resources[i].bo.id) - wined3d_texture_remove_buffer_object(&texture_gl->t, i, context_gl->gl_info); + wined3d_texture_remove_buffer_object(&texture_gl->t, i, context_gl); } break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 15380f5ac81..fa718501e45 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2256,6 +2256,7 @@ void wined3d_context_gl_check_fbo_status(const struct wined3d_context_gl *contex void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *dst, const struct wined3d_bo_address *src, size_t size) DECLSPEC_HIDDEN; void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +void wined3d_context_gl_destroy_bo(struct wined3d_context_gl *context_gl, struct wined3d_bo_gl *bo) DECLSPEC_HIDDEN; void wined3d_context_gl_draw_shaded_quad(struct wined3d_context_gl *context_gl, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN;

1 0

Andrey Gusev : bcrypt: BCryptCreateHash is no longer a stub.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 111540ebc7d21b12c8feafcbd5d894f1e0daa3bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=111540ebc7d21b12c8feafcb… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Nov 30 15:08:38 2020 +0200 bcrypt: BCryptCreateHash is no longer a stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 380d9105e48..1b7881d4910 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -799,7 +799,7 @@ NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDL struct hash *hash; NTSTATUS status; - TRACE( "%p, %p, %p, %u, %p, %u, %08x - stub\n", algorithm, handle, object, object_len, + TRACE( "%p, %p, %p, %u, %p, %u, %08x\n", algorithm, handle, object, object_len, secret, secret_len, flags ); if (flags & ~BCRYPT_HASH_REUSABLE_FLAG) {

1 0

Derek Lesho : mf/topoloader: Unstub IMFTopologyLoader::Load.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 7c9e6a1c96712de4a152c4fb086d00a151e4e59e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c9e6a1c96712de4a152c4fb… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Nov 30 15:25:15 2020 +0300 mf/topoloader: Unstub IMFTopologyLoader::Load. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 6 ++---- dlls/mf/topology.c | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 5e5c30ec6fc..20e3e8713c6 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1735,7 +1735,6 @@ static void test_topology_loader(void) MF_CONNECT_DIRECT, MF_E_INVALIDMEDIATYPE, - LOADER_TODO, }, { @@ -1766,7 +1765,7 @@ static void test_topology_loader(void) MF_CONNECT_ALLOW_CONVERTER, S_OK, - LOADER_EXPECTED_CONVERTER, + LOADER_EXPECTED_CONVERTER | LOADER_TODO, }, { @@ -1794,7 +1793,6 @@ static void test_topology_loader(void) MF_CONNECT_DIRECT, MF_E_INVALIDMEDIATYPE, - LOADER_TODO, }, { @@ -1850,7 +1848,7 @@ static void test_topology_loader(void) MF_CONNECT_ALLOW_DECODER, S_OK, - LOADER_EXPECTED_DECODER, + LOADER_EXPECTED_DECODER | LOADER_TODO, }, }; diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index e3a4dfd5141..7001a33f088 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2429,11 +2429,9 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in break; } - /* For now return original topology. */ - *ret_topology = output_topology; - return IMFTopology_CloneFrom(output_topology, input_topology); + return hr; } static const IMFTopoLoaderVtbl topologyloadervtbl =

1 0

Derek Lesho : mf/topoloader: Implement source node to sink node branch resolver.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: d61e9f7535efcedab4e7b2d9e741d44566a7cb42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d61e9f7535efcedab4e7b2d9… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Nov 30 10:59:40 2020 -0500 mf/topoloader: Implement source node to sink node branch resolver. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/topology.c | 273 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 268 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d61e9f7535efcedab4e7…

1 0

Derek Lesho : mf/topoloader: Move node connection responsibility to connection function.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: eb28343c477705b7ca64b5865fc950e3f6500095 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb28343c477705b7ca64b586… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Nov 30 15:25:13 2020 +0300 mf/topoloader: Move node connection responsibility to connection function. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/topology.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 8032e438b73..a09f6ef0ef4 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2022,8 +2022,6 @@ static HRESULT topology_loader_resolve_branch(struct topoloader_context *context if (FAILED(IMFTopology_GetNodeByID(context->output_topology, id, &node))) topology_loader_clone_node(context, downstream_node, &node, context->marker + 1); - IMFTopologyNode_ConnectOutput(upstream_node, output_index, node, input_index); - IMFTopologyNode_GetNodeType(upstream_node, &u_type); IMFTopologyNode_GetNodeType(downstream_node, &d_type); @@ -2033,7 +2031,7 @@ static HRESULT topology_loader_resolve_branch(struct topoloader_context *context return E_FAIL; } - return connectors[u_type][d_type](context, upstream_node, output_index, downstream_node, input_index); + return connectors[u_type][d_type](context, upstream_node, output_index, node, input_index); } static HRESULT topology_loader_resolve_nodes(struct topoloader_context *context, unsigned int *layer_size)

1 0

Derek Lesho : mf/topoloader: Add partial topology resolution tests.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: de8930ff52509ac5b5ba1a6b5039efa140540999 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de8930ff52509ac5b5ba1a6b… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Nov 30 15:25:12 2020 +0300 mf/topoloader: Add partial topology resolution tests. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/Makefile.in | 2 - dlls/mf/tests/mf.c | 705 +++++++++++++++++++++++++++++++++++++++------- dlls/mf/tests/resource.rc | 22 -- dlls/mf/tests/test.wav | Bin 4488 -> 0 bytes 4 files changed, 597 insertions(+), 132 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=de8930ff52509ac5b5ba…

1 0

← Newer
1
2
3
4
5
6
7
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2020