[PATCH 0/2] MR1944: wined3d: Map the destination BO with WINED3D_MAP_DISCARD when replacing the entire destination in wined3d_context_gl_copy_bo_address().
From: Zebediah Figura <zfigura(a)codeweavers.com> Analogous to the Vulkan backend. This is not particularly impactful, though, since it only affects buffer-buffer copies in the case where ARB_copy_buffer is not supported. --- dlls/wined3d/context_gl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 65d40f05ab2..8c27b661617 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3062,6 +3062,7 @@ 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, unsigned int range_count, const struct wined3d_range *ranges) { + uint32_t map_flags = WINED3D_MAP_WRITE; const struct wined3d_gl_info *gl_info; struct wined3d_bo_gl *src_bo, *dst_bo; BYTE *dst_ptr, *src_ptr; @@ -3071,6 +3072,9 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, src_bo = src->buffer_object ? wined3d_bo_gl(src->buffer_object) : NULL; dst_bo = dst->buffer_object ? wined3d_bo_gl(dst->buffer_object) : NULL; + if (dst_bo && !dst->addr && !ranges->offset && ranges->size == dst_bo->size) + map_flags |= WINED3D_MAP_DISCARD; + if (dst_bo && src_bo) { if (gl_info->supported[ARB_COPY_BUFFER]) @@ -3092,7 +3096,7 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, src_ptr = wined3d_context_gl_map_bo_address(context_gl, src, src_bo->size - (uintptr_t)src->addr, WINED3D_MAP_READ); dst_ptr = wined3d_context_gl_map_bo_address(context_gl, dst, - dst_bo->size - (uintptr_t)dst->addr, WINED3D_MAP_WRITE); + dst_bo->size - (uintptr_t)dst->addr, map_flags); for (i = 0; i < range_count; ++i) memcpy(dst_ptr + ranges[i].offset, src_ptr + ranges[i].offset, ranges[i].size); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1944
From: Zebediah Figura <zfigura(a)codeweavers.com> Instead of using glBufferSubData(). In practice, this means that we will either discard and rename the BO (if it's still in use) or write directly into it (if not). This improves performance drastically on NVidia GL drivers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53408 --- dlls/wined3d/context_gl.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 8c27b661617..0217e12d903 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3118,14 +3118,23 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, } else if (dst_bo && !src_bo) { - wined3d_context_gl_bind_bo(context_gl, dst_bo->binding, dst_bo->id); - for (i = 0; i < range_count; ++i) - GL_EXTCALL(glBufferSubData(dst_bo->binding, - dst_bo->b.buffer_offset + (GLintptr)dst->addr + ranges[i].offset, - ranges[i].size, src->addr + ranges[i].offset)); - checkGLcall("buffer upload"); + if ((map_flags & WINED3D_MAP_DISCARD) && (dst_bo->flags & GL_MAP_WRITE_BIT)) + { + dst_ptr = wined3d_context_gl_map_bo_address(context_gl, dst, dst_bo->size, map_flags); + memcpy(dst_ptr, src->addr, dst_bo->size); + wined3d_context_gl_unmap_bo_address(context_gl, dst, range_count, ranges); + } + else + { + wined3d_context_gl_bind_bo(context_gl, dst_bo->binding, dst_bo->id); + for (i = 0; i < range_count; ++i) + GL_EXTCALL(glBufferSubData(dst_bo->binding, + dst_bo->b.buffer_offset + (GLintptr)dst->addr + ranges[i].offset, + ranges[i].size, src->addr + ranges[i].offset)); + checkGLcall("buffer upload"); - wined3d_context_gl_reference_bo(context_gl, dst_bo); + wined3d_context_gl_reference_bo(context_gl, dst_bo); + } } else { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1944
This merge request was approved by Jan Sikorski. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1944
participants (3)
-
Jan Sikorski (＠jsikorski) -
Zebediah Figura
-
Zebediah Figura (＠zfigura)