wine-devel February 2022

wine-devel@winehq.org

87 participants
926 discussions

[PATCH v2 1/4] winedbg: Sanity check the dwType field of MSVC thread naming exceptions.
by Brendan Shanks 24 Feb '22

24 Feb '22

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- programs/winedbg/gdbproxy.c | 2 ++ programs/winedbg/tgt_active.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index e7f9ddaf226..89985c06666 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -485,6 +485,8 @@ static BOOL handle_exception(struct gdb_context* gdbctx, EXCEPTION_DEBUG_INFO* e char name[9]; SIZE_T read; + if (threadname->dwType != 0x1000) + return FALSE; if (threadname->dwThreadID == -1) thread = dbg_get_thread(gdbctx->process, gdbctx->de.dwThreadId); else diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 8c365a1e55d..50f48e8d1b8 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -245,6 +245,9 @@ static DWORD dbg_handle_exception(const EXCEPTION_RECORD* rec, BOOL first_chance break; case EXCEPTION_WINE_NAME_THREAD: pThreadName = (const THREADNAME_INFO*)(rec->ExceptionInformation); + + if (pThreadName->dwType != 0x1000) + return DBG_EXCEPTION_NOT_HANDLED; if (pThreadName->dwThreadID == -1) pThread = dbg_curr_thread; else -- 2.34.1

1 3

[PATCH 1/3] winhttp: Don't allow websocket send if another non-control send is pending.
by Paul Gofman 24 Feb '22

24 Feb '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Similar to WinHttpWebSocketReceive() but requires a separate variable because control frame send may be queued from read operation for pong. It is not quite straightforward to add to test as most of the time the send is executed synchronously. I tested that manually however and repeated sends without wait in between trigger this error on Windows. I am not aware of any app depending on this behaviour but it simplifies the synchronization for the next patch. dlls/winhttp/request.c | 16 +++++++++++++++- dlls/winhttp/winhttp_private.h | 1 + 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index d0732952e11..de011060236 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3349,6 +3349,7 @@ static void CALLBACK task_socket_send( TP_CALLBACK_INSTANCE *instance, void *ctx else ret = socket_send( s->socket, s->type, s->buf, s->len, NULL ); send_io_complete( &s->socket->hdr ); + InterlockedExchange( &s->socket->pending_noncontrol_send, 0 ); socket_send_complete( s->socket, ret, s->type, s->len ); release_object( &s->socket->hdr ); @@ -3386,8 +3387,16 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ BOOL async_send, complete_async = FALSE; struct socket_send *s; + if (InterlockedCompareExchange( &socket->pending_noncontrol_send, 1, 0 )) + { + WARN( "Previous send is still queued.\n" ); + release_object( &socket->hdr ); + return ERROR_INVALID_OPERATION; + } + if (!(s = malloc( sizeof(*s) ))) { + InterlockedExchange( &socket->pending_noncontrol_send, 0 ); release_object( &socket->hdr ); return ERROR_OUTOFMEMORY; } @@ -3417,11 +3426,16 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ if ((ret = queue_task( &socket->send_q, task_socket_send, s ))) { InterlockedDecrement( &socket->hdr.pending_sends ); + InterlockedExchange( &socket->pending_noncontrol_send, 0 ); release_object( &socket->hdr ); free( s ); } } - else InterlockedDecrement( &socket->hdr.pending_sends ); + else + { + InterlockedDecrement( &socket->hdr.pending_sends ); + InterlockedExchange( &socket->pending_noncontrol_send, 0 ); + } ReleaseSRWLockExclusive( &socket->send_lock ); if (!async_send) { diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 732f0afaa88..cf6655f561f 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -260,6 +260,7 @@ struct socket unsigned int bytes_in_send_frame_buffer; unsigned int client_buffer_offset; SRWLOCK send_lock; + volatile LONG pending_noncontrol_send; }; struct send_request -- 2.35.1

2 5

[tools 1/3] testbot/TestAgent: Make the SetTime() leeway configurable.
by Francois Gouget 24 Feb '22

24 Feb '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/TestAgent.pm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 7934070779..6457b4dd7d 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -1400,16 +1400,17 @@ sub Rm($@) return $self->_RecvErrorList(); } -sub SetTime($) +sub SetTime($;$) { - my ($self) = @_; - debug("SetTime\n"); + my ($self, $Leeway) = @_; + $Leeway ||= 30; + debug("SetTime $Leeway\n"); # Send the command if (!$self->_StartRPC($RPC_SETTIME) or !$self->_SendListSize('ArgC', 2) or !$self->_SendUInt64('Time', time()) or - !$self->_SendUInt32('Leeway', 30)) + !$self->_SendUInt32('Leeway', $Leeway)) { return undef; } -- 2.30.2

1 2

[tools] testbot/testagentd: Update the .gitignore file for 64-bit.
by Francois Gouget 24 Feb '22

24 Feb '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/testagentd/.gitignore | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/src/testagentd/.gitignore b/testbot/src/testagentd/.gitignore index 1fbbafe2fe..d1228c223b 100644 --- a/testbot/src/testagentd/.gitignore +++ b/testbot/src/testagentd/.gitignore @@ -1,4 +1,6 @@ *.o -*.obj -TestAgentd.exe +*.obj32 +*.obj64 +TestAgentd32.exe +TestAgentd64.exe winetestbot.iso -- 2.30.2

1 0

[tools] testbot/reporttest: Add a .gitignore file.
by Francois Gouget 24 Feb '22

24 Feb '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/reporttest/.gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 testbot/src/reporttest/.gitignore diff --git a/testbot/src/reporttest/.gitignore b/testbot/src/reporttest/.gitignore new file mode 100644 index 0000000000..4626a6a193 --- /dev/null +++ b/testbot/src/reporttest/.gitignore @@ -0,0 +1,3 @@ +*.obj +*.res +ReportTest.exe -- 2.30.2

1 0

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 24 Feb '22

24 Feb '22

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/po/fi.po b/po/fi.po index b121eaa546f..319f69b2b57 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6950,54 +6950,40 @@ msgid "This network connection does not exist.\n" msgstr "Tätä verkkoyhteyttä ei ole.\n" #: dlls/kernel32/winerror.mc:3748 -#, fuzzy -#| msgid "Invalid at interrupt time.\n" msgid "Call interrupted.\n" -msgstr "Keskeytysaikana virheellinen.\n" +msgstr "Kutsu keskeytetty.\n" #: dlls/kernel32/winerror.mc:3753 -#, fuzzy -#| msgid "Invalid handle.\n" msgid "Invalid file handle.\n" -msgstr "Kahva ei kelpaa.\n" +msgstr "Tiedoston kahva ei kelpaa.\n" #: dlls/kernel32/winerror.mc:3763 -#, fuzzy -#| msgid "Invalid network address.\n" msgid "Invalid pointer address.\n" -msgstr "Verkko-osoite ei kelpaa.\n" +msgstr "Osoittimen osoite ei kelpaa.\n" #: dlls/kernel32/winerror.mc:3768 -#, fuzzy -#| msgid "Invalid name.\n" msgid "Invalid argument.\n" -msgstr "Nimi ei kelpaa.\n" +msgstr "Argumentti ei kelpaa.\n" #: dlls/kernel32/winerror.mc:3778 msgid "Connection reset by peer.\n" msgstr "Vastapuoli nollasi yhteyden.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "Point not found.\n" msgid "Host not found.\n" -msgstr "Pistettä ei löydy.\n" +msgstr "Isäntää ei löydy.\n" #: dlls/kernel32/winerror.mc:3793 -#, fuzzy -#| msgid "Attribute is not found.\n" msgid "Nonauthoritative host not found.\n" -msgstr "Attribuuttia ei löydy.\n" +msgstr "Isäntää ei löydy (ei-autoritatiivinen).\n" #: dlls/kernel32/winerror.mc:3798 -#, fuzzy -#| msgid "Unrecoverable error occurred.\n" msgid "Nonrecoverable error.\n" -msgstr "On tapahtunut peruuttamaton virhe.\n" +msgstr "Peruuttamaton virhe.\n" #: dlls/kernel32/winerror.mc:3803 msgid "Name valid, no data record.\n" -msgstr "" +msgstr "Nimi kelpaa, ei tietuetta.\n" #: dlls/kernel32/winerror.mc:3817 msgid "Not implemented.\n" -- 2.35.1

1 0

[PATCH 0/4] wined3d: Rework resource fencing
by Stefan Dösinger 24 Feb '22

24 Feb '22

This is the patchset described in https://www.winehq.org/pipermail/wine-devel/2022-January/204020.html . It simplifies and speeds up d3d resource tracking in a few ways: *) Completely remove any burden on the CS thread. *) Replace interlocked ops on the client thread with a plain assignment. *) Piggy-pack onto the queue's head and tail counters, which we already increment with interlocked ops. I tested the impact with a microbenchmark: https://github.com/stefand/perftest/blob/main/resource_tracking_d3d11/resou… Depending on the CPU it doubles or tripples draw speed in that microbenchmark. In real games the effect is much less pronounced, but I do see about a 2% gain in World of Tanks. I also see a gain in Rocket League, but only if I hack away other known issues with Rocket League (UpdateSubResource in particular). I have further improvements to resource tracking in my mind that can be done on top of these patches: *) Separate read and write access times. *) Remove draw and compute tracking for d3d10+ clients and only track staging resources. Matteo had some ideas to make the queue multi-writer thread safe to further reduce the use of wined3d_cs. This patchset makes this a bit more complicated because the head value cannot be infered from the return value of require_space() and thus needs to be passed around separately to submit(). This can be done either with thread local storage or via a separate parameter to require_space() and submit(). Stefan Dösinger (4): wined3d: Use extra bits in the queue head and tail counters. wined3d: Use the default queue index for resource fencing. wined3d: Remove the no-op wined3d_resource_release. wined3d: Move resource->type away from the access time field. dlls/wined3d/cs.c | 170 ++++----------------------------- dlls/wined3d/resource.c | 1 - dlls/wined3d/wined3d_private.h | 97 +++++++++++++++---- 3 files changed, 100 insertions(+), 168 deletions(-) -- 2.34.1

2 5

[PATCH 1/5] wined3d: Handle WINED3D_LOCATION_CLEARED in wined3d_texture_load_location().
by Zebediah Figura 24 Feb '22

24 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/texture.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1323d533eff..64cc7c8c3eb 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -789,6 +789,19 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, return TRUE; } + if (current & WINED3D_LOCATION_CLEARED) + { + struct wined3d_bo_address addr; + + /* FIXME: Clear textures on the GPU if possible. */ + + if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, WINED3D_LOCATION_SYSMEM)) + return FALSE; + wined3d_texture_get_memory(texture, sub_resource_idx, &addr, WINED3D_LOCATION_SYSMEM); + memset(addr.addr, 0, texture->sub_resources[sub_resource_idx].size); + current = WINED3D_LOCATION_SYSMEM; + } + if (!current) { ERR("Sub-resource %u of texture %p does not have any up to date location.\n", -- 2.34.1

4 12

[PATCH v2 1/8] wined3d: Introduce a wined3d_texture_get_bo_address() helper.
by Zebediah Figura 24 Feb '22

24 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: New patch. dlls/wined3d/cs.c | 2 +- dlls/wined3d/surface.c | 15 ++++---- dlls/wined3d/texture.c | 63 ++++++++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 4 +-- 4 files changed, 49 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 81cdb51f207..c65379fe46d 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2673,7 +2673,7 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * goto error; } - wined3d_texture_get_memory(src_texture, op->src_sub_resource_idx, &addr, location); + wined3d_texture_get_bo_address(src_texture, op->src_sub_resource_idx, &addr, location); wined3d_texture_get_pitch(src_texture, op->src_sub_resource_idx % src_texture->level_count, &row_pitch, &slice_pitch); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3309df951dc..8c931d0b225 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -354,7 +354,7 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr if (!wined3d_texture_load_location(src_texture, sub_resource_idx, context, map_binding)) ERR("Failed to load the source sub-resource into %s.\n", wined3d_debug_location(map_binding)); wined3d_texture_get_pitch(src_texture, texture_level, &src_row_pitch, &src_slice_pitch); - wined3d_texture_get_memory(src_texture, sub_resource_idx, &src_data, map_binding); + wined3d_texture_get_bo_address(src_texture, sub_resource_idx, &src_data, map_binding); if (conv) { @@ -368,7 +368,7 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr if (!wined3d_texture_load_location(dst_texture, 0, context, map_binding)) ERR("Failed to load the destination sub-resource into %s.\n", wined3d_debug_location(map_binding)); wined3d_texture_get_pitch(dst_texture, 0, &dst_row_pitch, &dst_slice_pitch); - wined3d_texture_get_memory(dst_texture, 0, &dst_data, map_binding); + wined3d_texture_get_bo_address(dst_texture, 0, &dst_data, map_binding); src = wined3d_context_map_bo_address(context, &src_data, src_texture->sub_resources[sub_resource_idx].size, WINED3D_MAP_READ); @@ -422,7 +422,8 @@ void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned i uint8_t *offset; unsigned int i; - wined3d_texture_get_memory(texture, sub_resource_idx, &data, dst_location); + /* dst_location was already prepared by the caller. */ + wined3d_texture_get_bo_address(texture, sub_resource_idx, &data, dst_location); offset = data.addr; restore_texture = context->current_rt.texture; @@ -763,7 +764,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int ERR("Failed to load the destination sub-resource into %s.\n", wined3d_debug_location(map_binding)); wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~map_binding); wined3d_texture_get_pitch(dst_texture, texture_level, &dst_map.row_pitch, &dst_map.slice_pitch); - wined3d_texture_get_memory(dst_texture, dst_sub_resource_idx, &dst_data, map_binding); + wined3d_texture_get_bo_address(dst_texture, dst_sub_resource_idx, &dst_data, map_binding); dst_map.data = wined3d_context_map_bo_address(context, &dst_data, dst_texture->sub_resources[dst_sub_resource_idx].size, WINED3D_MAP_READ | WINED3D_MAP_WRITE); @@ -800,7 +801,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int if (!wined3d_texture_load_location(src_texture, src_sub_resource_idx, context, map_binding)) ERR("Failed to load the source sub-resource into %s.\n", wined3d_debug_location(map_binding)); wined3d_texture_get_pitch(src_texture, texture_level, &src_map.row_pitch, &src_map.slice_pitch); - wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &src_data, map_binding); + wined3d_texture_get_bo_address(src_texture, src_sub_resource_idx, &src_data, map_binding); src_map.data = wined3d_context_map_bo_address(context, &src_data, src_texture->sub_resources[src_sub_resource_idx].size, WINED3D_MAP_READ); @@ -819,7 +820,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~map_binding); wined3d_texture_get_pitch(dst_texture, texture_level, &dst_map.row_pitch, &dst_map.slice_pitch); - wined3d_texture_get_memory(dst_texture, dst_sub_resource_idx, &dst_data, map_binding); + wined3d_texture_get_bo_address(dst_texture, dst_sub_resource_idx, &dst_data, map_binding); dst_map.data = wined3d_context_map_bo_address(context, &dst_data, dst_texture->sub_resources[dst_sub_resource_idx].size, WINED3D_MAP_WRITE); } @@ -1287,7 +1288,7 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, ERR("Failed to load the sub-resource into %s.\n", wined3d_debug_location(map_binding)); wined3d_texture_invalidate_location(texture, view->sub_resource_idx, ~map_binding); wined3d_texture_get_pitch(texture, level, &map.row_pitch, &map.slice_pitch); - wined3d_texture_get_memory(texture, view->sub_resource_idx, &data, map_binding); + wined3d_texture_get_bo_address(texture, view->sub_resource_idx, &data, map_binding); map.data = wined3d_context_map_bo_address(context, &data, texture->sub_resources[view->sub_resource_idx].size, WINED3D_MAP_WRITE); map.data = (BYTE *)map.data diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3bbdb492998..35b41a2f70b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -737,6 +737,32 @@ void wined3d_texture_invalidate_location(struct wined3d_texture *texture, sub_resource_idx, texture); } +void wined3d_texture_get_bo_address(const struct wined3d_texture *texture, + unsigned int sub_resource_idx, struct wined3d_bo_address *data, DWORD location) +{ + struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; + + if (location == WINED3D_LOCATION_BUFFER) + { + data->addr = NULL; + data->buffer_object = &sub_resource->bo.b; + } + else + { + assert(location == WINED3D_LOCATION_SYSMEM); + if (sub_resource->user_memory) + { + data->addr = sub_resource->user_memory; + } + else + { + data->addr = texture->resource.heap_memory; + data->addr += sub_resource->offset; + } + data->buffer_object = 0; + } +} + void wined3d_texture_clear_dirty_regions(struct wined3d_texture *texture) { unsigned int i; @@ -804,8 +830,8 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) return FALSE; - wined3d_texture_get_memory(texture, sub_resource_idx, &source, current); - wined3d_texture_get_memory(texture, sub_resource_idx, &destination, location); + wined3d_texture_get_bo_address(texture, sub_resource_idx, &source, (current & wined3d_texture_sysmem_locations)); + wined3d_texture_get_bo_address(texture, sub_resource_idx, &destination, location); range.offset = 0; range.size = texture->sub_resources[sub_resource_idx].size; wined3d_context_copy_bo_address(context, &destination, &source, 1, &range); @@ -820,34 +846,21 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, return ret; } -void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int sub_resource_idx, +static void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_bo_address *data, DWORD locations) { - struct wined3d_texture_sub_resource *sub_resource; - TRACE("texture %p, sub_resource_idx %u, data %p, locations %s.\n", texture, sub_resource_idx, data, wined3d_debug_location(locations)); - sub_resource = &texture->sub_resources[sub_resource_idx]; if (locations & WINED3D_LOCATION_BUFFER) { - data->addr = NULL; - data->buffer_object = &sub_resource->bo.b; + wined3d_texture_get_bo_address(texture, sub_resource_idx, data, WINED3D_LOCATION_BUFFER); return; } if (locations & WINED3D_LOCATION_SYSMEM) { - if (texture->sub_resources[sub_resource_idx].user_memory) - { - data->addr = texture->sub_resources[sub_resource_idx].user_memory; - } - else - { - data->addr = texture->resource.heap_memory; - data->addr += sub_resource->offset; - } - data->buffer_object = 0; + wined3d_texture_get_bo_address(texture, sub_resource_idx, data, WINED3D_LOCATION_SYSMEM); return; } @@ -1085,7 +1098,7 @@ static void wined3d_texture_create_dc(void *object) } wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); wined3d_texture_get_pitch(texture, level, &row_pitch, &slice_pitch); - wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding); + wined3d_texture_get_bo_address(texture, sub_resource_idx, &data, texture->resource.map_binding); if (data.buffer_object) { if (!context) @@ -1158,7 +1171,7 @@ static void wined3d_texture_destroy_dc(void *object) dc_info->dc = NULL; dc_info->bitmap = NULL; - wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding); + wined3d_texture_get_bo_address(texture, sub_resource_idx, &data, texture->resource.map_binding); if (data.buffer_object) { context = context_acquire(device, NULL, 0); @@ -2998,7 +3011,7 @@ static BOOL wined3d_texture_gl_load_sysmem(struct wined3d_texture_gl *texture_gl unsigned int src_location; level = sub_resource_idx % texture_gl->t.level_count; - wined3d_texture_get_memory(&texture_gl->t, sub_resource_idx, &data, dst_location); + wined3d_texture_get_bo_address(&texture_gl->t, sub_resource_idx, &data, dst_location); src_location = sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB ? WINED3D_LOCATION_TEXTURE_RGB : WINED3D_LOCATION_TEXTURE_SRGB; wined3d_texture_get_level_box(&texture_gl->t, level, &src_box); @@ -3573,7 +3586,7 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour && (!(flags & WINED3D_MAP_NO_DIRTY_UPDATE) || (resource->usage & WINED3DUSAGE_DYNAMIC))) wined3d_texture_invalidate_location(texture, sub_resource_idx, ~resource->map_binding); - wined3d_texture_get_memory(texture, sub_resource_idx, &data, resource->map_binding); + wined3d_texture_get_bo_address(texture, sub_resource_idx, &data, resource->map_binding); base_memory = wined3d_context_map_bo_address(context, &data, sub_resource->size, flags); sub_resource->map_flags = flags; TRACE("Base memory pointer %p.\n", base_memory); @@ -3623,7 +3636,7 @@ static HRESULT texture_resource_sub_resource_unmap(struct wined3d_resource *reso context = context_acquire(device, NULL, 0); - wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding); + wined3d_texture_get_bo_address(texture, sub_resource_idx, &data, texture->resource.map_binding); range.offset = 0; range.size = sub_resource->size; wined3d_context_unmap_bo_address(context, &data, !!(sub_resource->map_flags & WINED3D_MAP_WRITE), &range); @@ -4512,7 +4525,7 @@ void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture, context = context_acquire(src_texture->resource.device, NULL, 0); wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); - wined3d_texture_get_memory(dst_texture, dst_sub_resource_idx, &data, dst_location); + wined3d_texture_get_bo_address(dst_texture, dst_sub_resource_idx, &data, dst_location); if (src_texture->sub_resources[src_sub_resource_idx].locations & WINED3D_LOCATION_TEXTURE_RGB) src_location = WINED3D_LOCATION_TEXTURE_RGB; @@ -5139,7 +5152,7 @@ static BOOL wined3d_texture_vk_load_sysmem(struct wined3d_texture_vk *texture_vk } level = sub_resource_idx % texture_vk->t.level_count; - wined3d_texture_get_memory(&texture_vk->t, sub_resource_idx, &data, location); + wined3d_texture_get_bo_address(&texture_vk->t, sub_resource_idx, &data, location); wined3d_texture_get_level_box(&texture_vk->t, level, &src_box); wined3d_texture_get_pitch(&texture_vk->t, level, &row_pitch, &slice_pitch); wined3d_texture_vk_download_data(context, &texture_vk->t, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 277d5a94fb0..6fd51b77e2a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4625,9 +4625,9 @@ void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned i void wined3d_texture_cleanup(struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx) DECLSPEC_HIDDEN; +void wined3d_texture_get_bo_address(const struct wined3d_texture *texture, + unsigned int sub_resource_idx, struct wined3d_bo_address *data, DWORD location) DECLSPEC_HIDDEN; GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) DECLSPEC_HIDDEN; -void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_bo_address *data, DWORD locations) DECLSPEC_HIDDEN; void wined3d_texture_invalidate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; void wined3d_texture_load(struct wined3d_texture *texture, -- 2.35.1

2 15

[PATCH vkd3d] include: Clarify docs for PFN_vkd3d_shader_close_include.
by Giovanni Mascellani 24 Feb '22

24 Feb '22

Clarify the contract about memory management of the code parameter and reference callbacks by their name as fields of struct vkd3d_shader_preprocess_info rather than by their type (like it is already done above). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- include/vkd3d_shader.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 1eae0bbe..5a60b374 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -787,8 +787,7 @@ typedef int (*PFN_vkd3d_shader_open_include)(const char *filename, bool local, * vkd3d_shader_preprocess_info. * * \param code Contents of the included file, which were allocated by the - * \ref PFN_vkd3d_shader_open_include callback. The source code was allocated by - * the user and thus need not be freed by vkd3d_shader_free_shader_code(). + * \ref pfn_open_include callback. The user must free them. * * \param context The user-defined pointer passed to struct * vkd3d_shader_preprocess_info. -- 2.35.1

2 1

← Newer
1
...
8
9
10
11
12
13
14
...
93
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-devel February 2022