April 2020 - Wine-Devel - list.winehq.org

DDOS on WineHQ.org
by Jeremy Newman April 21, 2020

April 21, 2020

There is a DDOS going on on WineHQ.org right now, specifically with our Mailman subscription and listinfo URLs. We are trying to block this, but in the meantime we have disabled the two with 500 server errors. So, for the moment, subscribing and editing your mailman subscription is disabled. -N

1 1

[PATCH] configure: Check for "struct esr_context" used on ARM64
by Martin Storsjo April 21, 2020

April 21, 2020

If not found, use the old codepath from before 85c01202ac70af0c83f894d7a8986adf66983459. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- configure.ac | 3 +++ dlls/ntdll/signal_arm64.c | 27 ++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f30e8b92b0..199139697e 100644 --- a/configure.ac +++ b/configure.ac @@ -2448,6 +2448,9 @@ AC_CHECK_MEMBERS([scsireq_t.cmd, sg_io_hdr_t.interface_id],,, dnl Check for siginfo_t members AC_CHECK_MEMBERS([siginfo_t.si_fd],,,[#include <signal.h>]) +dnl Check for esr_context members +AC_CHECK_MEMBERS([struct esr_context.esr],,,[#include <signal.h>]) + dnl Check for struct mtget members AC_CHECK_MEMBERS([struct mtget.mt_blksiz, struct mtget.mt_gstat, struct mtget.mt_blkno],,, [#include <sys/types.h> diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 5fffd45f7b..f6157ba04f 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -101,12 +101,14 @@ static struct fpsimd_context *get_fpsimd_context( ucontext_t *sigcontext ) return (struct fpsimd_context *)get_extended_sigcontext( sigcontext, FPSIMD_MAGIC ); } +#ifdef HAVE_STRUCT_ESR_CONTEXT_ESR static DWORD64 get_fault_esr( ucontext_t *sigcontext ) { struct esr_context *esr = (struct esr_context *)get_extended_sigcontext( sigcontext, ESR_MAGIC ); if (esr) return esr->esr; return 0; } +#endif #endif /* linux */ @@ -1027,6 +1029,28 @@ static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout * REGn_sig(18, sigcontext) = (ULONG_PTR)NtCurrentTeb(); } +static inline DWORD is_write_fault( DWORD *pc, ucontext_t *sigcontext ) +{ +#ifdef HAVE_STRUCT_ESR_CONTEXT_ESR + return (get_fault_esr( sigcontext ) & 0x40) != 0 ? + EXCEPTION_WRITE_FAULT : EXCEPTION_READ_FAULT; +#else + DWORD inst = *pc; + if ((inst & 0xbfff0000) == 0x0c000000 /* C3.3.1 */ || + (inst & 0xbfe00000) == 0x0c800000 /* C3.3.2 */ || + (inst & 0xbfdf0000) == 0x0d000000 /* C3.3.3 */ || + (inst & 0xbfc00000) == 0x0d800000 /* C3.3.4 */ || + (inst & 0x3f400000) == 0x08000000 /* C3.3.6 */ || + (inst & 0x3bc00000) == 0x38000000 /* C3.3.8-12 */ || + (inst & 0x3fe00000) == 0x3c800000 /* C3.3.8-12 128bit */ || + (inst & 0x3bc00000) == 0x39000000 /* C3.3.13 */ || + (inst & 0x3fc00000) == 0x3d800000 /* C3.3.13 128bit */ || + (inst & 0x3a400000) == 0x28000000) /* C3.3.7,14-16 */ + return EXCEPTION_WRITE_FAULT; + return EXCEPTION_READ_FAULT; +#endif +} + /********************************************************************** * segv_handler * @@ -1036,6 +1060,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) { struct stack_layout *stack; ucontext_t *context = ucontext; + DWORD *orig_pc = (DWORD *)PC_sig(context); /* check for page fault inside the thread stack */ if (signal == SIGSEGV) @@ -1061,7 +1086,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) break; case SIGSEGV: /* Segmentation fault */ stack->rec.NumberParameters = 2; - stack->rec.ExceptionInformation[0] = (get_fault_esr( context ) & 0x40) != 0; + stack->rec.ExceptionInformation[0] = is_write_fault( orig_pc, context ); stack->rec.ExceptionInformation[1] = (ULONG_PTR)info->si_addr; if (!(stack->rec.ExceptionCode = virtual_handle_fault( (void *)stack->rec.ExceptionInformation[1], stack->rec.ExceptionInformation[0], FALSE ))) -- 2.17.1

3 3

[PATCH v4 3/3] mshtml: if unspecified, the res:// protocol also searches for resource type id 2110 (RT_FILE)
by Damjan Jovanovic April 21, 2020

April 21, 2020

If the resource type id isn't specified in the res:// URL, mshtml searches for both RT_HTML and RT_FILE ids. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47999 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/mshtml/protocol.c | 18 ++++++++++--- dlls/mshtml/tests/protocol.c | 49 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/rsrc.rc | 3 +++ 3 files changed, 66 insertions(+), 4 deletions(-)

2 1

[PATCH 3/3] ddraw: Handle more cases in hr_ddraw_from_wined3d().
by Zhiyi Zhang April 21, 2020

April 21, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ddraw/ddraw.c | 6 +----- dlls/ddraw/surface.c | 9 +-------- dlls/ddraw/utils.c | 7 +++++-- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 1c104548f64..7cfb56f45cc 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1146,11 +1146,7 @@ static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD width, DW wined3d_mutex_unlock(); - switch (hr) - { - case WINED3DERR_NOTAVAILABLE: return DDERR_UNSUPPORTED; - default: return hr; - } + return hr_ddraw_from_wined3d(hr); } static HRESULT WINAPI ddraw4_SetDisplayMode(IDirectDraw4 *iface, DWORD width, DWORD height, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 04b398855ba..c418bb7b2b3 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3931,14 +3931,7 @@ static HRESULT WINAPI ddraw_surface7_UpdateOverlay(IDirectDrawSurface7 *iface, R src_rect, dst_wined3d_texture, dst_sub_resource_idx, dst_rect, flags); wined3d_mutex_unlock(); - switch (hr) - { - case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS; - case WINEDDERR_NOTAOVERLAYSURFACE: return DDERR_NOTAOVERLAYSURFACE; - case WINEDDERR_OVERLAYNOTVISIBLE: return DDERR_OVERLAYNOTVISIBLE; - default: - return hr; - } + return hr_ddraw_from_wined3d(hr); } static HRESULT WINAPI ddraw_surface4_UpdateOverlay(IDirectDrawSurface4 *iface, RECT *src_rect, diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 23e75a32fc7..efc1dddd189 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -1189,8 +1189,11 @@ hr_ddraw_from_wined3d(HRESULT hr) { switch(hr) { - case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS; - default: return hr; + case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS; + case WINED3DERR_NOTAVAILABLE: return DDERR_UNSUPPORTED; + case WINEDDERR_NOTAOVERLAYSURFACE: return DDERR_NOTAOVERLAYSURFACE; + case WINEDDERR_OVERLAYNOTVISIBLE: return DDERR_OVERLAYNOTVISIBLE; + default: return hr; } } -- 2.20.1

2 1

[PATCH 2/3] wined3d: Fix uninitialised variable warnings.
by Zhiyi Zhang April 21, 2020

April 21, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/utils.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6a247f46441..ddde6e0c104 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12781,7 +12781,7 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter enum complex_fixup complex_fixup = get_complex_fixup(args->fixup); struct wined3d_string_buffer *buffer, *output; GLuint program, vshader_id, fshader_id; - const char *tex_type, *swizzle, *ptr; + const char *tex_type = NULL, *swizzle = NULL, *ptr; unsigned int i; GLint loc; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d08485c8d4b..06857f22845 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2586,7 +2586,7 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for && format->format != GL_LUMINANCE && format->format != GL_LUMINANCE_ALPHA && (format->f.red_size || format->f.alpha_size)) { - DWORD readback[16 * 16 * 16], color, r_range, a_range; + DWORD readback[16 * 16 * 16], color = 0, r_range, a_range; BYTE r, a; BOOL match = TRUE; GLuint rb; -- 2.20.1 >From 7365adcac61478d385c5a1c3762df4c7bdc2a1db Mon Sep 17 00:00:00 2001 From:

2 1

[PATCH 1/3] wined3d: Correct a comment in wined3d_check_device_type().
by Zhiyi Zhang April 21, 2020

April 21, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wined3d/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 42e1578561f..b65f13e7751 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1755,7 +1755,7 @@ HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, debug_d3dformat(backbuffer_format), windowed); /* The task of this function is to check whether a certain display / backbuffer format - * combination is available on the given adapter. In fullscreen mode microsoft specified + * combination is available on the given output. In fullscreen mode microsoft specified * that the display format shouldn't provide alpha and that ignoring alpha the backbuffer * and display format should match exactly. * In windowed mode format conversion can occur and this depends on the driver. */ -- 2.20.1 >From dcb6944f11ddc24986f5dd028a309cf5fd6f8800 Mon Sep 17 00:00:00 2001 From:

2 1

[PATCH 5/5] wined3d: Implement wined3d_unordered_access_view_set_counter() on top of wined3d_context_copy_bo_address().
by Henri Verbeet April 21, 2020

April 21, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/view.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index a004ec9e0be..834eaa71023 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1041,18 +1041,22 @@ void wined3d_unordered_access_view_gl_clear_uint(struct wined3d_unordered_access void wined3d_unordered_access_view_set_counter(struct wined3d_unordered_access_view *view, unsigned int value) { - struct wined3d_unordered_access_view_gl *view_gl = wined3d_unordered_access_view_gl(view); - const struct wined3d_gl_info *gl_info; + struct wined3d_bo_address dst, src; struct wined3d_context *context; - if (!view_gl->counter_bo.id) + if (!view->counter_bo) return; - context = context_acquire(view_gl->v.resource->device, NULL, 0); - gl_info = wined3d_context_gl(context)->gl_info; - GL_EXTCALL(glBindBuffer(GL_ATOMIC_COUNTER_BUFFER, view_gl->counter_bo.id)); - GL_EXTCALL(glBufferSubData(GL_ATOMIC_COUNTER_BUFFER, 0, sizeof(value), &value)); - checkGLcall("set atomic counter"); + context = context_acquire(view->resource->device, NULL, 0); + + src.buffer_object = 0; + src.addr = (void *)&value; + + dst.buffer_object = view->counter_bo; + dst.addr = NULL; + + wined3d_context_copy_bo_address(context, &dst, WINED3D_BIND_UNORDERED_ACCESS, &src, 0, sizeof(uint32_t)); + context_release(context); } -- 2.20.1

1 0

[PATCH 4/5] wined3d: Implement wined3d_unordered_access_view_copy_counter() on top of wined3d_context_copy_bo_address().
by Henri Verbeet April 21, 2020

April 21, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/view.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index cb0f2e2e25b..a004ec9e0be 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1059,21 +1059,20 @@ void wined3d_unordered_access_view_set_counter(struct wined3d_unordered_access_v void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_view *view, struct wined3d_buffer *buffer, unsigned int offset, struct wined3d_context *context) { - struct wined3d_unordered_access_view_gl *view_gl = wined3d_unordered_access_view_gl(view); - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct wined3d_bo_address dst, src; DWORD dst_location; - if (!view_gl->counter_bo.id) + if (!view->counter_bo) return; dst_location = wined3d_buffer_get_memory(buffer, &dst, buffer->locations); dst.addr += offset; - src.buffer_object = (uintptr_t)&view_gl->counter_bo; + src.buffer_object = view->counter_bo; src.addr = NULL; - wined3d_context_gl_copy_bo_address(context_gl, &dst, &src, sizeof(GLuint)); + wined3d_context_copy_bo_address(context, &dst, buffer->resource.bind_flags, + &src, WINED3D_BIND_UNORDERED_ACCESS, sizeof(uint32_t)); wined3d_buffer_invalidate_location(buffer, ~dst_location); } @@ -1105,6 +1104,7 @@ static void wined3d_unordered_access_view_gl_cs_init(void *object) GL_EXTCALL(glBindBuffer(bo->binding, bo->id)); GL_EXTCALL(glBufferData(bo->binding, sizeof(initial_value), &initial_value, GL_STATIC_DRAW)); checkGLcall("create atomic counter buffer"); + view_gl->v.counter_bo = (uintptr_t)bo; } context_release(context); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 86986209683..5f0b1eee7f2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4582,6 +4582,7 @@ struct wined3d_unordered_access_view const struct wined3d_format *format; struct wined3d_view_desc desc; + uintptr_t counter_bo; }; void wined3d_unordered_access_view_cleanup(struct wined3d_unordered_access_view *view) DECLSPEC_HIDDEN; -- 2.20.1

1 0

[PATCH 3/5] wined3d: Use the bo bindings in wined3d_context_gl_copy_bo_address().
by Henri Verbeet April 21, 2020

April 21, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 9 +-------- dlls/wined3d/context_gl.c | 19 +++++++++---------- dlls/wined3d/view.c | 3 +-- dlls/wined3d/wined3d_private.h | 3 +-- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 49b9c7bcd97..ec8a2cadd23 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4654,14 +4654,7 @@ static void adapter_gl_copy_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *dst, uint32_t dst_bind_flags, const struct wined3d_bo_address *src, uint32_t src_bind_flags, size_t size) { - struct wined3d_context_gl *context_gl; - GLenum dst_binding, src_binding; - - context_gl = wined3d_context_gl(context); - dst_binding = wined3d_buffer_gl_binding_from_bind_flags(context_gl->gl_info, dst_bind_flags); - src_binding = wined3d_buffer_gl_binding_from_bind_flags(context_gl->gl_info, src_bind_flags); - - wined3d_context_gl_copy_bo_address(context_gl, dst, dst_binding, src, src_binding, size); + wined3d_context_gl_copy_bo_address(wined3d_context_gl(context), dst, src, size); } static HRESULT adapter_gl_create_swapchain(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index f435c7e7607..4e0af7474c1 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2581,8 +2581,7 @@ void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, } void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, - const struct wined3d_bo_address *dst, GLenum dst_binding, - const struct wined3d_bo_address *src, GLenum src_binding, size_t size) + const struct wined3d_bo_address *dst, const struct wined3d_bo_address *src, size_t size) { const struct wined3d_gl_info *gl_info; struct wined3d_bo_gl *src_bo, *dst_bo; @@ -2605,27 +2604,27 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, } else { - src_ptr = wined3d_context_gl_map_bo_address(context_gl, src, size, src_binding, WINED3D_MAP_READ); - dst_ptr = wined3d_context_gl_map_bo_address(context_gl, dst, size, dst_binding, WINED3D_MAP_WRITE); + src_ptr = wined3d_context_gl_map_bo_address(context_gl, src, size, src_bo->binding, WINED3D_MAP_READ); + dst_ptr = wined3d_context_gl_map_bo_address(context_gl, dst, size, dst_bo->binding, WINED3D_MAP_WRITE); memcpy(dst_ptr, src_ptr, size); range.offset = 0; range.size = size; - wined3d_context_gl_unmap_bo_address(context_gl, dst, dst_binding, 1, &range); - wined3d_context_gl_unmap_bo_address(context_gl, src, src_binding, 0, NULL); + wined3d_context_gl_unmap_bo_address(context_gl, dst, dst_bo->binding, 1, &range); + wined3d_context_gl_unmap_bo_address(context_gl, src, src_bo->binding, 0, NULL); } } else if (!dst_bo && src_bo) { - wined3d_context_gl_bind_bo(context_gl, src_binding, src_bo->id); - GL_EXTCALL(glGetBufferSubData(src_binding, (GLintptr)src->addr, size, dst->addr)); + wined3d_context_gl_bind_bo(context_gl, src_bo->binding, src_bo->id); + GL_EXTCALL(glGetBufferSubData(src_bo->binding, (GLintptr)src->addr, size, dst->addr)); checkGLcall("buffer download"); } else if (dst_bo && !src_bo) { - wined3d_context_gl_bind_bo(context_gl, dst_binding, dst_bo->id); - GL_EXTCALL(glBufferSubData(dst_binding, (GLintptr)dst->addr, size, src->addr)); + wined3d_context_gl_bind_bo(context_gl, dst_bo->binding, dst_bo->id); + GL_EXTCALL(glBufferSubData(dst_bo->binding, (GLintptr)dst->addr, size, src->addr)); checkGLcall("buffer upload"); } else diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index e1dd4de8dab..cb0f2e2e25b 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1073,8 +1073,7 @@ void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_ src.buffer_object = (uintptr_t)&view_gl->counter_bo; src.addr = NULL; - wined3d_context_gl_copy_bo_address(context_gl, &dst, wined3d_buffer_gl(buffer)->bo.binding, - &src, GL_ATOMIC_COUNTER_BUFFER, sizeof(GLuint)); + wined3d_context_gl_copy_bo_address(context_gl, &dst, &src, sizeof(GLuint)); wined3d_buffer_invalidate_location(buffer, ~dst_location); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e6cbfce17d8..86986209683 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2176,8 +2176,7 @@ void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLenum target, GLuint name) DECLSPEC_HIDDEN; 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, GLenum dst_binding, - const struct wined3d_bo_address *src, GLenum src_binding, size_t size) DECLSPEC_HIDDEN; + 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_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, -- 2.20.1

1 0

[PATCH 2/5] wined3d: Store the preferred binding in the wined3d_bo_gl structure.
by Henri Verbeet April 21, 2020

April 21, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 22 ++++++++++------------ dlls/wined3d/texture.c | 7 ++++--- dlls/wined3d/view.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b7ba2be16d1..a9d9d8fb71d 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -135,7 +135,7 @@ void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD loc /* Context activation is done by the caller. */ static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context_gl *context_gl) { - wined3d_context_gl_bind_bo(context_gl, buffer_gl->buffer_type_hint, buffer_gl->bo.id); + wined3d_context_gl_bind_bo(context_gl, buffer_gl->bo.binding, buffer_gl->bo.id); } /* Context activation is done by the caller. */ @@ -225,6 +225,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); buffer_gl->b.buffer_object = (uintptr_t)bo; error = gl_info->gl_ops.gl.p_glGetError(); if (!bo->id || error != GL_NO_ERROR) @@ -248,17 +249,15 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf if (gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) { - GL_EXTCALL(glBufferParameteriAPPLE(buffer_gl->buffer_type_hint, - GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)); - GL_EXTCALL(glBufferParameteriAPPLE(buffer_gl->buffer_type_hint, - GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)); + GL_EXTCALL(glBufferParameteriAPPLE(bo->binding, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)); + GL_EXTCALL(glBufferParameteriAPPLE(bo->binding, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)); checkGLcall("glBufferParameteriAPPLE"); buffer_gl->b.flags |= WINED3D_BUFFER_APPLESYNC; } /* No setup is needed here for GL_ARB_map_buffer_range. */ } - GL_EXTCALL(glBufferData(buffer_gl->buffer_type_hint, buffer_gl->b.resource.size, NULL, gl_usage)); + GL_EXTCALL(glBufferData(bo->binding, buffer_gl->b.resource.size, NULL, gl_usage)); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) { @@ -803,7 +802,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->buffer_type_hint, buffer_gl->b.resource.size, + GL_EXTCALL(glBufferData(buffer_gl->bo.binding, buffer_gl->b.resource.size, NULL, buffer_gl->buffer_object_usage)); checkGLcall("glBufferData"); return; @@ -854,7 +853,7 @@ drop_fence: gl_info->gl_ops.gl.p_glFinish(); wined3d_buffer_gl_bind(buffer_gl, context_gl); - GL_EXTCALL(glBufferParameteriAPPLE(buffer_gl->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)); + GL_EXTCALL(glBufferParameteriAPPLE(buffer_gl->bo.binding, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)); checkGLcall("glBufferParameteriAPPLE(buffer_gl->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)"); buffer_gl->b.flags &= ~WINED3D_BUFFER_APPLESYNC; } @@ -1172,7 +1171,7 @@ static HRESULT buffer_resource_sub_resource_unmap(struct wined3d_resource *resou wined3d_buffer_gl_bind(buffer_gl, context_gl); for (i = 0; i < range_count; ++i) { - GL_EXTCALL(glFlushMappedBufferRangeAPPLE(buffer_gl->buffer_type_hint, + GL_EXTCALL(glFlushMappedBufferRangeAPPLE(buffer_gl->bo.binding, buffer->maps[i].offset, buffer->maps[i].size)); checkGLcall("glFlushMappedBufferRangeAPPLE"); } @@ -1503,7 +1502,7 @@ static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer *buffer, struc while (range_count--) { range = &ranges[range_count]; - GL_EXTCALL(glBufferSubData(buffer_gl->buffer_type_hint, + GL_EXTCALL(glBufferSubData(buffer_gl->bo.binding, range->offset, range->size, (BYTE *)data + range->offset - data_offset)); } checkGLcall("buffer upload"); @@ -1526,7 +1525,7 @@ static void wined3d_buffer_gl_download_ranges(struct wined3d_buffer *buffer, str while (range_count--) { range = &ranges[range_count]; - GL_EXTCALL(glGetBufferSubData(buffer_gl->buffer_type_hint, + GL_EXTCALL(glGetBufferSubData(buffer_gl->bo.binding, range->offset, range->size, (BYTE *)data + range->offset - data_offset)); } checkGLcall("buffer download"); @@ -1561,7 +1560,6 @@ HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined TRACE("Not creating a BO because the buffer has dynamic usage and no GL support.\n"); else buffer_gl->b.flags |= WINED3D_BUFFER_USE_BO; - buffer_gl->buffer_type_hint = wined3d_buffer_gl_binding_from_bind_flags(gl_info, desc->bind_flags); return wined3d_buffer_init(&buffer_gl->b, device, desc, data, parent, parent_ops, &wined3d_buffer_gl_ops); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e41c0f3999b..d075ccc9cd2 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1638,9 +1638,10 @@ static void wined3d_texture_prepare_buffer_object(struct wined3d_texture *textur return; GL_EXTCALL(glGenBuffers(1, &bo->id)); - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, bo->id)); - GL_EXTCALL(glBufferData(GL_PIXEL_UNPACK_BUFFER, sub_resource->size, NULL, GL_STREAM_DRAW)); - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + bo->binding = GL_PIXEL_UNPACK_BUFFER; + GL_EXTCALL(glBindBuffer(bo->binding, bo->id)); + GL_EXTCALL(glBufferData(bo->binding, sub_resource->size, NULL, GL_STREAM_DRAW)); + GL_EXTCALL(glBindBuffer(bo->binding, 0)); checkGLcall("Create buffer object"); TRACE("Created buffer object %u for texture %p, sub-resource %u.\n", bo->id, texture, sub_resource_idx); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 19339424682..e1dd4de8dab 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1032,8 +1032,8 @@ void wined3d_unordered_access_view_gl_clear_uint(struct wined3d_unordered_access wined3d_unordered_access_view_invalidate_location(&view_gl->v, ~WINED3D_LOCATION_BUFFER); get_buffer_view_range(&buffer_gl->b, &view_gl->v.desc, &format->f, &offset, &size); - wined3d_context_gl_bind_bo(context_gl, buffer_gl->buffer_type_hint, buffer_gl->bo.id); - GL_EXTCALL(glClearBufferSubData(buffer_gl->buffer_type_hint, format->internal, + wined3d_context_gl_bind_bo(context_gl, buffer_gl->bo.binding, buffer_gl->bo.id); + GL_EXTCALL(glClearBufferSubData(buffer_gl->bo.binding, format->internal, offset, size, format->format, format->type, clear_value)); checkGLcall("clear unordered access view"); } @@ -1073,7 +1073,7 @@ void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_ src.buffer_object = (uintptr_t)&view_gl->counter_bo; src.addr = NULL; - wined3d_context_gl_copy_bo_address(context_gl, &dst, wined3d_buffer_gl(buffer)->buffer_type_hint, + wined3d_context_gl_copy_bo_address(context_gl, &dst, wined3d_buffer_gl(buffer)->bo.binding, &src, GL_ATOMIC_COUNTER_BUFFER, sizeof(GLuint)); wined3d_buffer_invalidate_location(buffer, ~dst_location); @@ -1102,9 +1102,9 @@ static void wined3d_unordered_access_view_gl_cs_init(void *object) static const GLuint initial_value = 0; GL_EXTCALL(glGenBuffers(1, &bo->id)); - GL_EXTCALL(glBindBuffer(GL_ATOMIC_COUNTER_BUFFER, bo->id)); - GL_EXTCALL(glBufferData(GL_ATOMIC_COUNTER_BUFFER, - sizeof(initial_value), &initial_value, GL_STATIC_DRAW)); + bo->binding = GL_ATOMIC_COUNTER_BUFFER; + GL_EXTCALL(glBindBuffer(bo->binding, bo->id)); + GL_EXTCALL(glBufferData(bo->binding, sizeof(initial_value), &initial_value, GL_STATIC_DRAW)); checkGLcall("create atomic counter buffer"); } context_release(context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8b7f518b4d9..e6cbfce17d8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1522,6 +1522,7 @@ do { \ struct wined3d_bo_gl { GLuint id; + GLenum binding; }; static inline GLuint wined3d_bo_gl_id(uintptr_t bo) @@ -4422,7 +4423,6 @@ struct wined3d_buffer_gl struct wined3d_bo_gl bo; GLenum buffer_object_usage; - GLenum buffer_type_hint; }; static inline struct wined3d_buffer_gl *wined3d_buffer_gl(struct wined3d_buffer *buffer) -- 2.20.1

1 0