September 2020 - Wine-Commits

Zebediah Figura : wined3d: Move the depth function to wined3d_depth_stencil_state.
by Alexandre Julliard Sept. 29, 2020

Sept. 29, 2020

Module: wine Branch: master Commit: 2014d975cc72e8c09c49e4cbc1f14d8bdbc8796f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2014d975cc72e8c09c49e4cb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 28 21:56:22 2020 -0500 wined3d: Move the depth function to wined3d_depth_stencil_state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 11 ----------- dlls/d3d11/state.c | 1 + dlls/wined3d/adapter_vk.c | 3 +-- dlls/wined3d/context_vk.c | 2 +- dlls/wined3d/device.c | 2 ++ dlls/wined3d/state.c | 23 ++++++++++------------- include/wine/wined3d.h | 1 + 7 files changed, 16 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2014d975cc72e8c09c49…

1 0

Paul Gofman : wined3d: Use partial bind counts instead of partial bind flags.
by Alexandre Julliard Sept. 29, 2020

Sept. 29, 2020

Module: wine Branch: master Commit: 97636bc9b6d35faf4f64410d21bb861624aa6d71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97636bc9b6d35faf4f64410d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 29 14:24:55 2020 +0300 wined3d: Use partial bind counts instead of partial bind flags. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 4 +- dlls/wined3d/wined3d_private.h | 99 +++++++++++++++++------------------------- 2 files changed, 41 insertions(+), 62 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 08c6e27922..ee2659ce23 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -347,8 +347,8 @@ static void context_preload_texture(struct wined3d_context *context, if (!(texture = state->textures[idx])) return; - if (texture->resource.rtv_bind_count_device || (state->fb.depth_stencil - && state->fb.depth_stencil->resource == &texture->resource)) + if ((texture->resource.rtv_full_bind_count_device + texture->resource.rtv_partial_bind_count_device) + || (state->fb.depth_stencil && state->fb.depth_stencil->resource == &texture->resource)) context->uses_fbo_attached_resources = 1; wined3d_texture_load(texture, context, is_srgb_enabled(state->sampler_states[idx])); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e2c8ba3719..abc6e0e57b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3951,15 +3951,10 @@ struct wined3d_resource_ops HRESULT (*resource_sub_resource_unmap)(struct wined3d_resource *resource, unsigned int sub_resource_idx); }; -#define WINED3D_SUB_RESOURCES_BIND_SRV 1 -#define WINED3D_SUB_RESOURCES_BIND_RTV 2 - struct wined3d_resource { LONG ref; LONG bind_count; - uint32_t srv_bind_count_device; - uint32_t rtv_bind_count_device; LONG map_count; LONG access_count; struct wined3d_device *device; @@ -3993,7 +3988,10 @@ struct wined3d_resource uint32_t rtv; } *sub_resource_bind_counts_device; - uint32_t sub_resource_bind_flags; + uint32_t srv_full_bind_count_device; + uint32_t rtv_full_bind_count_device; + uint32_t srv_partial_bind_count_device; + uint32_t rtv_partial_bind_count_device; }; static inline ULONG wined3d_resource_incref(struct wined3d_resource *resource) @@ -6039,16 +6037,19 @@ static inline bool wined3d_rtv_all_subresources(const struct wined3d_rendertarge return texture->level_count == 1 && rtv->layer_count == wined3d_bind_layer_count(texture); } -static inline void wined3d_srv_bind_count_inc(struct wined3d_shader_resource_view *srv) +static inline void wined3d_srv_bind_count_add(struct wined3d_shader_resource_view *srv, int value) { struct wined3d_resource *resource = srv->resource; struct wined3d_texture *texture; unsigned int level, layer; - ++resource->srv_bind_count_device; - if (wined3d_srv_all_subresources(srv)) + { + resource->srv_full_bind_count_device += value; return; + } + + resource->srv_partial_bind_count_device += value; texture = texture_from_resource(resource); @@ -6059,45 +6060,33 @@ static inline void wined3d_srv_bind_count_inc(struct wined3d_shader_resource_vie for (layer = 0; layer < srv->desc.u.texture.layer_count; ++layer) for (level = 0; level < srv->desc.u.texture.level_count; ++level) - ++resource->sub_resource_bind_counts_device[(layer + srv->desc.u.texture.layer_idx) - * texture->level_count + srv->desc.u.texture.level_idx + level].srv; + resource->sub_resource_bind_counts_device[(layer + srv->desc.u.texture.layer_idx) + * texture->level_count + srv->desc.u.texture.level_idx + level].srv += value; +} - resource->sub_resource_bind_flags |= WINED3D_SUB_RESOURCES_BIND_SRV; +static inline void wined3d_srv_bind_count_inc(struct wined3d_shader_resource_view *srv) +{ + wined3d_srv_bind_count_add(srv, 1); } static inline void wined3d_srv_bind_count_dec(struct wined3d_shader_resource_view *srv) { - struct wined3d_resource *resource = srv->resource; - unsigned int level, layer, count; - struct wined3d_texture *texture; - - --resource->srv_bind_count_device; - - if (wined3d_srv_all_subresources(srv)) - return; - - texture = texture_from_resource(resource); - - count = 0; - for (layer = 0; layer < srv->desc.u.texture.layer_count; ++layer) - for (level = 0; level < srv->desc.u.texture.level_count; ++level) - count += --resource->sub_resource_bind_counts_device[(layer + srv->desc.u.texture.layer_idx) - * texture->level_count + srv->desc.u.texture.level_idx + level].srv; - - if (!count) - resource->sub_resource_bind_flags &= ~WINED3D_SUB_RESOURCES_BIND_SRV; + wined3d_srv_bind_count_add(srv, -1); } -static inline void wined3d_rtv_bind_count_inc(struct wined3d_rendertarget_view *rtv) +static inline void wined3d_rtv_bind_count_add(struct wined3d_rendertarget_view *rtv, int value) { struct wined3d_resource *resource = rtv->resource; struct wined3d_texture *texture; unsigned int layer; - ++resource->rtv_bind_count_device; - if (wined3d_rtv_all_subresources(rtv)) + { + resource->rtv_full_bind_count_device += value; return; + } + + resource->rtv_partial_bind_count_device += value; texture = texture_from_resource(resource); @@ -6107,31 +6096,17 @@ static inline void wined3d_rtv_bind_count_inc(struct wined3d_rendertarget_view * return; for (layer = 0; layer < rtv->layer_count; ++layer) - ++resource->sub_resource_bind_counts_device[rtv->sub_resource_idx + layer * texture->level_count].rtv; + resource->sub_resource_bind_counts_device[rtv->sub_resource_idx + layer * texture->level_count].rtv += value; +} - resource->sub_resource_bind_flags |= WINED3D_SUB_RESOURCES_BIND_RTV; +static inline void wined3d_rtv_bind_count_inc(struct wined3d_rendertarget_view *rtv) +{ + wined3d_rtv_bind_count_add(rtv, 1); } static inline void wined3d_rtv_bind_count_dec(struct wined3d_rendertarget_view *rtv) { - struct wined3d_resource *resource = rtv->resource; - struct wined3d_texture *texture; - unsigned int layer, count; - - --resource->rtv_bind_count_device; - - if (wined3d_rtv_all_subresources(rtv)) - return; - - texture = texture_from_resource(rtv->resource); - - count = 0; - for (layer = 0; layer < rtv->layer_count; ++layer) - count += --resource->sub_resource_bind_counts_device[rtv->sub_resource_idx - + layer * texture->level_count].rtv; - - if (!count) - resource->sub_resource_bind_flags &= ~WINED3D_SUB_RESOURCES_BIND_RTV; + wined3d_rtv_bind_count_add(rtv, -1); } static inline bool wined3d_is_srv_rtv_bound(const struct wined3d_shader_resource_view *srv) @@ -6140,9 +6115,11 @@ static inline bool wined3d_is_srv_rtv_bound(const struct wined3d_shader_resource struct wined3d_texture *texture; unsigned int level, layer; - if (!resource->rtv_bind_count_device || !(resource->sub_resource_bind_flags & WINED3D_SUB_RESOURCES_BIND_RTV) - || wined3d_srv_all_subresources(srv)) - return resource->rtv_bind_count_device; + if (!(resource->rtv_full_bind_count_device + resource->rtv_partial_bind_count_device)) + return FALSE; + + if (resource->rtv_full_bind_count_device || wined3d_srv_all_subresources(srv)) + return TRUE; texture = texture_from_resource(resource); @@ -6161,9 +6138,11 @@ static inline bool wined3d_is_rtv_srv_bound(const struct wined3d_rendertarget_vi struct wined3d_texture *texture; unsigned int layer; - if (!resource->srv_bind_count_device || !(resource->sub_resource_bind_flags & WINED3D_SUB_RESOURCES_BIND_SRV) - || wined3d_rtv_all_subresources(rtv)) - return resource->srv_bind_count_device; + if (!(resource->srv_full_bind_count_device + resource->srv_partial_bind_count_device)) + return FALSE; + + if (resource->srv_full_bind_count_device || wined3d_rtv_all_subresources(rtv)) + return TRUE; texture = texture_from_resource(resource);

1 0

Nikolay Sivov : server: Inherit standard handles together with explicit handle list.
by Alexandre Julliard Sept. 29, 2020

Sept. 29, 2020

Module: wine Branch: master Commit: fde5967f725624c5ee4995dcbe22f262979c5c9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fde5967f725624c5ee4995dc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 29 12:12:14 2020 +0300 server: Inherit standard handles together with explicit handle list. Restores standard handles behavior pre-c58a10c16395c30e7793cde1f748febe0432a6ad, always inheriting them when inherit mode is enabled. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49895 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/handle.c | 36 ++++++++++++++++++++++++------------ server/handle.h | 3 ++- server/process.c | 14 ++++++++++---- server/process.h | 2 +- server/request.c | 2 +- 5 files changed, 38 insertions(+), 19 deletions(-) diff --git a/server/handle.c b/server/handle.c index d4df33f473..15382256f1 100644 --- a/server/handle.c +++ b/server/handle.c @@ -354,10 +354,26 @@ static void shrink_handle_table( struct handle_table *table ) table->entries = new_entries; } +static void inherit_handle( struct process *parent, const obj_handle_t handle, struct handle_table *table ) +{ + struct handle_entry *dst, *src; + int index; + + dst = table->entries; + + src = get_handle( parent, handle ); + if (!src || !(src->access & RESERVED_INHERIT)) return; + grab_object_for_handle( src->ptr ); + index = handle_to_index( handle ); + dst[index] = *src; + table->last = max( table->last, index ); +} + /* copy the handle table of the parent process */ /* return 1 if OK, 0 on error */ struct handle_table *copy_handle_table( struct process *process, struct process *parent, - const obj_handle_t *handles, unsigned int handle_count ) + const obj_handle_t *handles, unsigned int handle_count, + const obj_handle_t *std_handles ) { struct handle_table *parent_table = parent->handles; struct handle_table *table; @@ -371,20 +387,16 @@ struct handle_table *copy_handle_table( struct process *process, struct process if (handles) { - struct handle_entry *dst, *src; - int index; - - dst = table->entries; - memset( dst, 0, parent_table->count * sizeof(*dst) ); + memset( table->entries, 0, parent_table->count * sizeof(*table->entries) ); for (i = 0; i < handle_count; i++) { - src = get_handle( parent, handles[i] ); - if (!src || !(src->access & RESERVED_INHERIT)) continue; - grab_object_for_handle( src->ptr ); - index = handle_to_index( handles[i] ); - dst[index] = *src; - table->last = max( table->last, index ); + inherit_handle( parent, handles[i], table ); + } + + for (i = 0; i < 3; i++) + { + inherit_handle( parent, std_handles[i], table ); } } else diff --git a/server/handle.h b/server/handle.h index bb541de13b..ac3104dc00 100644 --- a/server/handle.h +++ b/server/handle.h @@ -51,7 +51,8 @@ extern obj_handle_t find_inherited_handle( struct process *process, const struct extern void close_process_handles( struct process *process ); extern struct handle_table *alloc_handle_table( struct process *process, int count ); extern struct handle_table *copy_handle_table( struct process *process, struct process *parent, - const obj_handle_t *handles, unsigned int handle_count ); + const obj_handle_t *handles, unsigned int handle_count, + const obj_handle_t *std_handles ); extern unsigned int get_handle_table_count( struct process *process); #endif /* __WINE_SERVER_HANDLE_H */ diff --git a/server/process.c b/server/process.c index 26958308ca..1786493a81 100644 --- a/server/process.c +++ b/server/process.c @@ -502,7 +502,7 @@ static void start_sigkill_timer( struct process *process ) /* create a new process */ /* if the function fails the fd is closed */ -struct process *create_process( int fd, struct process *parent, int inherit_all, +struct process *create_process( int fd, struct process *parent, int inherit_all, const startup_info_t *info, const struct security_descriptor *sd, const obj_handle_t *handles, unsigned int handle_count, struct token *token ) { @@ -576,8 +576,14 @@ struct process *create_process( int fd, struct process *parent, int inherit_all, } else { + obj_handle_t std_handles[3]; + + std_handles[0] = info->hstdin; + std_handles[1] = info->hstdout; + std_handles[2] = info->hstderr; + process->parent_id = parent->id; - process->handles = inherit_all ? copy_handle_table( process, parent, handles, handle_count ) + process->handles = inherit_all ? copy_handle_table( process, parent, handles, handle_count, std_handles ) : alloc_handle_table( process, 0 ); /* Note: for security reasons, starting a new process does not attempt * to use the current impersonation token for the new process */ @@ -1227,7 +1233,7 @@ DECL_HANDLER(new_process) goto done; } - if (!(process = create_process( socket_fd, parent, req->inherit_all, sd, + if (!(process = create_process( socket_fd, parent, req->inherit_all, info->data, sd, handles, req->handles_size / sizeof(*handles), token ))) goto done; @@ -1325,7 +1331,7 @@ DECL_HANDLER(exec_process) close( socket_fd ); return; } - if (!(process = create_process( socket_fd, NULL, 0, NULL, NULL, 0, NULL ))) return; + if (!(process = create_process( socket_fd, NULL, 0, NULL, NULL, NULL, 0, NULL ))) return; create_thread( -1, process, NULL ); release_object( process ); } diff --git a/server/process.h b/server/process.h index bc81d563b4..56092e5b1a 100644 --- a/server/process.h +++ b/server/process.h @@ -108,7 +108,7 @@ struct process extern unsigned int alloc_ptid( void *ptr ); extern void free_ptid( unsigned int id ); extern void *get_ptid_entry( unsigned int id ); -extern struct process *create_process( int fd, struct process *parent, int inherit_all, +extern struct process *create_process( int fd, struct process *parent, int inherit_all, const startup_info_t *info, const struct security_descriptor *sd, const obj_handle_t *handles, unsigned int handle_count, struct token *token ); extern data_size_t init_process( struct thread *thread ); diff --git a/server/request.c b/server/request.c index 40e9478e09..97bf1a746d 100644 --- a/server/request.c +++ b/server/request.c @@ -583,7 +583,7 @@ static void master_socket_poll_event( struct fd *fd, int event ) int client = accept( get_unix_fd( master_socket->fd ), (struct sockaddr *) &dummy, &len ); if (client == -1) return; fcntl( client, F_SETFL, O_NONBLOCK ); - if ((process = create_process( client, NULL, 0, NULL, NULL, 0, NULL ))) + if ((process = create_process( client, NULL, 0, NULL, NULL, NULL, 0, NULL ))) { create_thread( -1, process, NULL ); release_object( process );

1 0

Alexandre Julliard : bcrypt: Build with msvcrt.
by Alexandre Julliard Sept. 29, 2020

Sept. 29, 2020

Module: wine Branch: master Commit: c4383013aab04ecaf2aaf969ec6158d28c0c7f02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4383013aab04ecaf2aaf969… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 29 15:46:32 2020 +0200 bcrypt: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/Makefile.in | 2 ++ dlls/bcrypt/bcrypt_main.c | 66 ++++++++++++++++++++++------------------------- 2 files changed, 33 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c4383013aab04ecaf2aa…

1 0

Zebediah Figura : wined3d: Move the stencil fail operation to wined3d_depth_stencil_state.
by Alexandre Julliard Sept. 29, 2020

Sept. 29, 2020

Module: wine Branch: master Commit: 9c744d5cb916b8d5d676e16fd99aba796b09cd34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c744d5cb916b8d5d676e16f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 28 21:56:20 2020 -0500 wined3d: Move the stencil fail operation to wined3d_depth_stencil_state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 -- dlls/d3d11/state.c | 2 ++ dlls/wined3d/adapter_vk.c | 2 -- dlls/wined3d/context_vk.c | 5 ++--- dlls/wined3d/device.c | 4 ++++ dlls/wined3d/directx.c | 2 -- dlls/wined3d/state.c | 9 ++++----- include/wine/wined3d.h | 1 + 8 files changed, 13 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9c744d5cb916b8d5d676…

1 0

Zebediah Figura : wined3d: Move the stencil function to wined3d_depth_stencil_state.
by Alexandre Julliard Sept. 29, 2020

Sept. 29, 2020

Module: wine Branch: master Commit: ba4c2ac03a19c1fccecbba692c99fe6eab69fa7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba4c2ac03a19c1fccecbba69… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 28 21:56:18 2020 -0500 wined3d: Move the stencil function to wined3d_depth_stencil_state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 -- dlls/d3d11/state.c | 2 ++ dlls/wined3d/adapter_vk.c | 2 -- dlls/wined3d/context_vk.c | 14 +++++++------- dlls/wined3d/device.c | 13 +++++++++++++ dlls/wined3d/directx.c | 2 -- dlls/wined3d/state.c | 9 ++++----- include/wine/wined3d.h | 7 +++++++ 8 files changed, 33 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ba4c2ac03a19c1fccecb…

1 0

Zebediah Figura : wined3d: Move the stencil depth fail operation to wined3d_depth_stencil_state.
by Alexandre Julliard Sept. 29, 2020

Sept. 29, 2020

Module: wine Branch: master Commit: 2b170bbd8b32e981adab9d5a6c2b73a88fce8a74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b170bbd8b32e981adab9d5a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 28 21:56:21 2020 -0500 wined3d: Move the stencil depth fail operation to wined3d_depth_stencil_state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 19 ------------------- dlls/d3d11/state.c | 2 ++ dlls/wined3d/adapter_vk.c | 3 --- dlls/wined3d/context_vk.c | 14 ++------------ dlls/wined3d/device.c | 4 ++++ dlls/wined3d/directx.c | 3 --- dlls/wined3d/state.c | 21 +++++++-------------- include/wine/wined3d.h | 1 + 8 files changed, 16 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2b170bbd8b32e981adab…

1 0

Alexandre Julliard : bcrypt: Split the key structure into generic and backend-specific parts.
by Alexandre Julliard Sept. 29, 2020

Sept. 29, 2020

Module: wine Branch: master Commit: 209b968efc2336a72f5223f0c73ff46f11a2f1ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=209b968efc2336a72f5223f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 29 15:27:32 2020 +0200 bcrypt: Split the key structure into generic and backend-specific parts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 73 ++----------------------------------------- dlls/bcrypt/gnutls.c | 48 +++++++++++++++++----------- dlls/bcrypt/macos.c | 40 +++++++++++++++--------- 3 files changed, 58 insertions(+), 103 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=209b968efc2336a72f52…

1 0

Zebediah Figura : wined3d: Move the stencil pass operation to wined3d_depth_stencil_state.
by Alexandre Julliard Sept. 29, 2020

Sept. 29, 2020

Module: wine Branch: master Commit: 2479702652a730ec0a35cea3427c658e28a86ba6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2479702652a730ec0a35cea3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 28 21:56:19 2020 -0500 wined3d: Move the stencil pass operation to wined3d_depth_stencil_state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 -- dlls/d3d11/state.c | 2 ++ dlls/wined3d/adapter_vk.c | 2 -- dlls/wined3d/context_vk.c | 5 ++--- dlls/wined3d/device.c | 4 ++++ dlls/wined3d/directx.c | 2 -- dlls/wined3d/state.c | 10 ++++------ include/wine/wined3d.h | 1 + 8 files changed, 13 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2479702652a730ec0a35…

1 0

Paul Gofman : wined3d: Fix 3d texture layer count for bind tracking.
by Alexandre Julliard Sept. 29, 2020

Sept. 29, 2020

Module: wine Branch: master Commit: 674dc3b107943c391a86a83edc170ace5866c95e URL: https://source.winehq.org/git/wine.git/?a=commit;h=674dc3b107943c391a86a83e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 29 14:24:54 2020 +0300 wined3d: Fix 3d texture layer count for bind tracking. Fixes out of bounds access introduced by commit 61e02c5e4f20de6c82342a2ffaa001150bd7c56f and RiME crash on start. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c44c4eac91..e2c8ba3719 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6005,6 +6005,11 @@ static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_vi || (srv_format->green_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_STENCIL)); } +static inline unsigned int wined3d_bind_layer_count(const struct wined3d_texture *texture) +{ + return texture->resource.type == WINED3D_RTYPE_TEXTURE_3D ? texture->resource.depth : texture->layer_count; +} + static inline bool wined3d_srv_all_subresources(const struct wined3d_shader_resource_view *srv) { struct wined3d_texture *texture; @@ -6017,7 +6022,7 @@ static inline bool wined3d_srv_all_subresources(const struct wined3d_shader_reso texture = texture_from_resource(srv->resource); return srv->desc.u.texture.level_count == texture->level_count - && srv->desc.u.texture.layer_count == texture->layer_count; + && srv->desc.u.texture.layer_count == wined3d_bind_layer_count(texture); } static inline bool wined3d_rtv_all_subresources(const struct wined3d_rendertarget_view *rtv) @@ -6031,7 +6036,7 @@ static inline bool wined3d_rtv_all_subresources(const struct wined3d_rendertarge return FALSE; texture = texture_from_resource(rtv->resource); - return texture->level_count == 1 && rtv->layer_count == texture->layer_count; + return texture->level_count == 1 && rtv->layer_count == wined3d_bind_layer_count(texture); } static inline void wined3d_srv_bind_count_inc(struct wined3d_shader_resource_view *srv) @@ -6049,7 +6054,7 @@ static inline void wined3d_srv_bind_count_inc(struct wined3d_shader_resource_vie if (!resource->sub_resource_bind_counts_device && !(resource->sub_resource_bind_counts_device = heap_alloc_zero(texture->level_count - * texture->layer_count * sizeof(*resource->sub_resource_bind_counts_device)))) + * wined3d_bind_layer_count(texture) * sizeof(*resource->sub_resource_bind_counts_device)))) return; for (layer = 0; layer < srv->desc.u.texture.layer_count; ++layer) @@ -6098,7 +6103,7 @@ static inline void wined3d_rtv_bind_count_inc(struct wined3d_rendertarget_view * if (!resource->sub_resource_bind_counts_device && !(resource->sub_resource_bind_counts_device = heap_alloc_zero(texture->level_count - * texture->layer_count * sizeof(*resource->sub_resource_bind_counts_device)))) + * wined3d_bind_layer_count(texture) * sizeof(*resource->sub_resource_bind_counts_device)))) return; for (layer = 0; layer < rtv->layer_count; ++layer)

1 0