November 2020 - Wine-commits

Jacek Caban : server: Set console renderer thread in get_next_console_request.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 50650d6e94487bca4ad0dca7250399f1dfcec51b URL: https://source.winehq.org/git/wine.git/?a=commit;h=50650d6e94487bca4ad0dca7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 18:42:09 2020 +0100 server: Set console renderer thread in get_next_console_request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/console.c b/server/console.c index 0e779c77816..a2171b3c1b4 100644 --- a/server/console.c +++ b/server/console.c @@ -1476,6 +1476,8 @@ DECL_HANDLER(get_next_console_request) return; } + if (!server->console->renderer) server->console->renderer = current; + if (!req->signal) server->console->signaled = 0; else if (!server->console->signaled) {

1 0

Damjan Jovanovic : ntdll: Fix backward compatibility for struct link_map on FreeBSD.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 6d829f2baf156738326acc77548b37c90024a93c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d829f2baf156738326acc77… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Nov 30 20:08:01 2020 +0200 ntdll: Fix backward compatibility for struct link_map on FreeBSD. Checking for the _rtld_version_laddr_offset symbol only works when header and library versions match. Checking for the offset of l_addr instead lets us use the older header with the new library too. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 0e827315ac3..72f215eb2d3 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1417,7 +1417,7 @@ found: #ifdef __FreeBSD__ /* On older FreeBSD versions, l_addr was the absolute load address, now it's the relocation offset. */ - if (!dlsym(RTLD_DEFAULT, "_rtld_version_laddr_offset")) + if (offsetof(struct link_map, l_addr) == 0) if (!get_relocbase(map->l_addr, &relocbase)) return; #endif switch (dyn->d_tag)

1 0

Kevin Puetz : winebuild: Select all __wine_spec_exe* entry inside winebuild.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: a1078d47707eaa1e7fc574bd5a080c8360056ba5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1078d47707eaa1e7fc574bd… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Wed Nov 25 13:00:26 2020 -0600 winebuild: Select all __wine_spec_exe* entry inside winebuild. Override --entry in winegcc only when it applies to any compiler (e.g. kernel drivers or msvcrt) but leave spec details to winebuild. Forward -municode so winebuild will know which to use. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 9 +++++++-- tools/winegcc/winegcc.c | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 03715af9563..26a0539c500 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -136,6 +136,7 @@ typedef struct int subsystem; /* subsystem id */ int subsystem_major; /* subsystem version major number */ int subsystem_minor; /* subsystem version minor number */ + int unicode_app; /* default to unicode entry point */ ORDDEF *entry_points; /* dll entry points */ ORDDEF **names; /* array of entry point names (points into entry_points) */ ORDDEF **ordinals; /* array of dll ordinals (points into entry_points) */ diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 0e5e1627dda..b1e6d115717 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -396,8 +396,12 @@ static const char *get_default_entry_point( const DLLSPEC *spec ) { if (spec->characteristics & IMAGE_FILE_DLL) return "DllMain"; if (spec->subsystem == IMAGE_SUBSYSTEM_NATIVE) return "DriverEntry"; - if (spec->type == SPEC_WIN16) return "__wine_spec_exe16_entry"; - return "__wine_spec_exe_entry"; + if (spec->type == SPEC_WIN16) + return "__wine_spec_exe16_entry"; + else if (spec->unicode_app) + return "__wine_spec_exe_wentry"; + else + return "__wine_spec_exe_entry"; } /* parse options from the argv array and remove all the recognized ones */ @@ -448,6 +452,7 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) else if (!strcmp( optarg, "thumb" )) thumb_mode = 1; else if (!strcmp( optarg, "no-cygwin" )) use_msvcrt = 1; else if (!strcmp( optarg, "unix" )) unix_lib = 1; + else if (!strcmp( optarg, "unicode" )) spec->unicode_app = 1; else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "fpu=", 4 )) fpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "arch=", 5 )) arch_option = xstrdup( optarg + 5 ); diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index e9707a73774..6decb02ee04 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1255,8 +1255,6 @@ static void build(struct options* opts) entry_point = (is_pe && opts->target_cpu == CPU_x86) ? "DriverEntry(a)8" : "DriverEntry"; else if (opts->use_msvcrt && !opts->shared && !opts->win16_app) entry_point = opts->unicode_app ? "wmainCRTStartup" : "mainCRTStartup"; - else if (!is_pe && !opts->shared && opts->unicode_app) - entry_point = "__wine_spec_exe_wentry"; } else entry_point = opts->entry_point; @@ -1268,6 +1266,8 @@ static void build(struct options* opts) spec_o_name = get_temp_file(output_name, ".spec.o"); if (opts->force_pointer_size) strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); + if(opts->unicode_app) + strarray_add(spec_args, "-municode"); strarray_add(spec_args, "-D_REENTRANT"); if (opts->pic && !is_pe) strarray_add(spec_args, "-fPIC"); strarray_add(spec_args, opts->shared ? "--dll" : "--exe");

1 0

Kevin Puetz : winebuild: Find main/wmain in static libraries.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: bf5893f4899b0539fbae39879c46b6b7da33c6f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf5893f4899b0539fbae3987… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Wed Nov 25 13:00:27 2020 -0600 winebuild: Find main/wmain in static libraries. Have the winebuild -spec.o include an undefined .globl referencing symbols we know the winecrt0 entry point will eventually reference, so ld knows about that need while scanning library archives. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 11 +++++++++++ tools/winebuild/spec32.c | 12 ++++++++++++ 3 files changed, 24 insertions(+) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 26a0539c500..a4b9bc97e3e 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -300,6 +300,7 @@ extern void output_gnu_stack_note(void); extern void add_import_dll( const char *name, const char *filename ); extern void add_delayed_import( const char *name ); extern void add_extra_ld_symbol( const char *name ); +extern void add_spec_extra_ld_symbol( const char *name ); extern void read_undef_symbols( DLLSPEC *spec, char **argv ); extern void resolve_imports( DLLSPEC *spec ); extern int is_undefined( const char *name ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index b1e6d115717..b37aec9cf6f 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -397,11 +397,22 @@ static const char *get_default_entry_point( const DLLSPEC *spec ) if (spec->characteristics & IMAGE_FILE_DLL) return "DllMain"; if (spec->subsystem == IMAGE_SUBSYSTEM_NATIVE) return "DriverEntry"; if (spec->type == SPEC_WIN16) + { + add_spec_extra_ld_symbol("WinMain16"); return "__wine_spec_exe16_entry"; + } else if (spec->unicode_app) + { + /* __wine_spec_exe_wentry always calls wmain */ + add_spec_extra_ld_symbol("wmain"); return "__wine_spec_exe_wentry"; + } else + { + /* __wine_spec_exe_entry always calls main */ + add_spec_extra_ld_symbol("main"); return "__wine_spec_exe_entry"; + } } /* parse options from the argv array and remove all the recognized ones */ diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index ba2edfb588f..a12e7d38aac 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -50,6 +50,13 @@ int needs_get_pc_thunk = 0; static const char builtin_signature[32] = "Wine builtin DLL"; static const char fakedll_signature[32] = "Wine placeholder DLL"; +static struct strarray spec_extra_ld_symbols = { 0 }; /* list of extra symbols that ld should resolve */ + +/* add a symbol to the list of extra symbols that ld must resolve */ +void add_spec_extra_ld_symbol( const char *name ) +{ + strarray_add( &spec_extra_ld_symbols, name, NULL ); +} static unsigned int hash_filename( const char *name ) { @@ -610,6 +617,7 @@ void output_exports( DLLSPEC *spec ) void output_module( DLLSPEC *spec ) { int machine = 0; + int i; unsigned int page_size = get_page_size(); const char *data_dirs[16] = { NULL }; @@ -688,6 +696,10 @@ void output_module( DLLSPEC *spec ) output( "\t.long 0\n" ); /* SizeOfCode */ output( "\t.long 0\n" ); /* SizeOfInitializedData */ output( "\t.long 0\n" ); /* SizeOfUninitializedData */ + + for (i = 0; i < spec_extra_ld_symbols.count; i++) + output( "\t.globl %s\n", asm_name(spec_extra_ld_symbols.str[i]) ); + /* note: we expand the AddressOfEntryPoint field on 64-bit by overwriting the BaseOfCode field */ output( "\t%s %s\n", /* AddressOfEntryPoint */ get_asm_ptr_keyword(), spec->init_func ? asm_name(spec->init_func) : "0" );

1 0

Kevin Puetz : winebuild: Find WinMain/wWinMain in static libraries.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 48cccee394e998ce2a686357f332a80189cca6a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48cccee394e998ce2a686357… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Wed Nov 25 13:00:28 2020 -0600 winebuild: Find WinMain/wWinMain in static libraries. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index b37aec9cf6f..572b4d74ae7 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -405,12 +405,16 @@ static const char *get_default_entry_point( const DLLSPEC *spec ) { /* __wine_spec_exe_wentry always calls wmain */ add_spec_extra_ld_symbol("wmain"); + if (spec->subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) + add_spec_extra_ld_symbol("wWinMain"); return "__wine_spec_exe_wentry"; } else { /* __wine_spec_exe_entry always calls main */ add_spec_extra_ld_symbol("main"); + if (spec->subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) + add_spec_extra_ld_symbol("WinMain"); return "__wine_spec_exe_entry"; } }

1 0

Daniel Lehman : shcore: Return failure on Read past end of memory stream.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: f12a775b273163065db9de1845b6e9a05f7bbdaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f12a775b273163065db9de18… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Nov 26 15:21:24 2020 -0800 shcore: Return failure on Read past end of memory stream. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/main.c | 18 ++++++++------- dlls/shlwapi/tests/istream.c | 55 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 62 insertions(+), 11 deletions(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index dc782e8be08..d5fce76eade 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -603,17 +603,19 @@ static HRESULT WINAPI memstream_Read(IStream *iface, void *buff, ULONG buff_size TRACE("(%p)->(%p, %u, %p)\n", stream, buff, buff_size, read_len); if (stream->u.mem.position >= stream->u.mem.length) - length = 0; - else - length = stream->u.mem.length - stream->u.mem.position; - - length = buff_size > length ? length : buff_size; - if (length != 0) /* not at end of buffer and we want to read something */ { - memmove(buff, stream->u.mem.buffer + stream->u.mem.position, length); - stream->u.mem.position += length; /* adjust pointer */ + if (read_len) + *read_len = 0; + return S_FALSE; } + length = stream->u.mem.length - stream->u.mem.position; + if (buff_size < length) + length = buff_size; + + memmove(buff, stream->u.mem.buffer + stream->u.mem.position, length); + stream->u.mem.position += length; + if (read_len) *read_len = length; diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index d3e7dbb8810..84957ac8cd1 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -736,8 +736,10 @@ static void test_SHCreateMemStream(void) { static const BYTE initial[10]; IStream *stream, *stream2; + LARGE_INTEGER off; IUnknown *unk; char buff[10]; + ULONG i, num; HRESULT hr; stream = SHCreateMemStream(initial, 0); @@ -756,9 +758,56 @@ static void test_SHCreateMemStream(void) if (unk) IUnknown_Release(unk); - hr = IStream_Read(stream, buff, sizeof(buff), NULL); -todo_wine - ok(hr == S_FALSE || broken(hr == S_OK) /* WinXP */, "Unexpected hr %#x.\n", hr); + num = ~0; + hr = IStream_Read(stream, buff, sizeof(buff), &num); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(num == 0, "expected 0, got 0x%08x\n", num); + + num = ~0; + memset(buff, 0x55, sizeof(buff)); + hr = IStream_Write(stream, buff, sizeof(buff), &num); + ok(hr == S_OK, "Failed to write, hr %#x.\n", hr); + ok(num == sizeof(buff), "expected %u, got %u\n", sizeof(buff), num); + + off.QuadPart = 0; + hr = IStream_Seek(stream, off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "Failed to seek, hr %#x.\n", hr); + + num = ~0; + memset(buff, 0, sizeof(buff)); + hr = IStream_Read(stream, buff, sizeof(buff), &num); + ok(hr == S_OK, "Failed to read, hr %#x.\n", hr); + ok(num == sizeof(buff), "expected %u, got %u\n", sizeof(buff), num); + for (i = 0; i < ARRAY_SIZE(buff); i++) + ok(buff[i] == 0x55, "expected 0x55, got 0x%02x at %u\n", buff[i], i); + + num = ~0; + hr = IStream_Read(stream, buff, sizeof(buff), &num); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(num == 0, "expected 0, got 0x%08x\n", num); + + num = ~0; + memset(buff, 0x11, sizeof(buff)); + hr = IStream_Write(stream, buff, sizeof(buff), &num); + ok(hr == S_OK, "Failed to write, hr %#x.\n", hr); + ok(num == sizeof(buff), "expected %u, got %u\n", sizeof(buff), num); + + off.QuadPart = -sizeof(buff); + hr = IStream_Seek(stream, off, STREAM_SEEK_CUR, NULL); + ok(hr == S_OK, "Failed to seek, hr %#x.\n", hr); + + num = ~0; + memset(buff, 0, sizeof(buff)); + hr = IStream_Read(stream, buff, sizeof(buff), &num); + ok(hr == S_OK, "Failed to read, hr %#x.\n", hr); + ok(num == sizeof(buff), "expected %u, got %u\n", sizeof(buff), num); + for (i = 0; i < ARRAY_SIZE(buff); i++) + ok(buff[i] == 0x11, "expected 0x11, got 0x%02x at %u\n", buff[i], i); + + num = ~0; + hr = IStream_Read(stream, buff, sizeof(buff), &num); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(num == 0, "expected 0, got 0x%08x\n", num); hr = IStream_Clone(stream, &stream2); todo_wine

1 0

Zhennan Cai : ntoskrnl.exe: Fix a reversed spin lock loop condition.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 2ad09b01673381261815bfc804a2f69ce4d85f86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ad09b01673381261815bfc8… Author: Zhennan Cai <zhennan5991(a)gmail.com> Date: Fri Nov 27 10:16:57 2020 +0800 ntoskrnl.exe: Fix a reversed spin lock loop condition. Signed-off-by: Zhennan Cai <zhennan5991(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 0ddb1b353c5..671398594e8 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -555,7 +555,7 @@ static inline void small_pause(void) void WINAPI KeAcquireSpinLockAtDpcLevel( KSPIN_LOCK *lock ) { TRACE("lock %p.\n", lock); - while (!InterlockedCompareExchangePointer( (void **)lock, (void *)1, (void *)0 )) + while (InterlockedCompareExchangePointer( (void **)lock, (void *)1, (void *)0 )) small_pause(); }

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_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

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