January 2022 - Wine-commits

Rémi Bernon : widl: Fix nested parameterized types C / short name output.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 1f2614c60b663faa66a4cda4adeb14fff6efd1cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f2614c60b663faa66a4cda4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 25 10:13:37 2022 +0100 widl: Fix nested parameterized types C / short name output. We append type->name from each parameter when constructing the c_name of parameterized type. When the parameter is itself a parameterized type this field contains C++-like name, with template brackets. Instead this precomputes the names of parameterized types whenever they are used as a parameter. In this case the format is the same as the C name, except that __C is used as a namespace separator, instead of _C, and that there's no namespace or abi prefix included. Shorthands need to be applied too, altough they have to match the __C. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typetree.c | 28 ++++++++++++++++++++-------- tools/widl/widltypes.h | 11 ++++++----- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index f45b6281b01..e1fab1e5525 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -53,6 +53,7 @@ type_t *make_type(enum type_type type) t->signature = NULL; t->qualified_name = NULL; t->impl_name = NULL; + t->param_name = NULL; t->short_name = NULL; memset(&t->details, 0, sizeof(t->details)); t->typestring_offset = 0; @@ -291,29 +292,36 @@ char *format_parameterized_type_name(type_t *type, typeref_list_t *params) } static char const *parameterized_type_shorthands[][2] = { + {"Windows__CFoundation__CCollections__C", "__F"}, {"Windows_CFoundation_CCollections_C", "__F"}, + {"Windows__CFoundation__C", "__F"}, {"Windows_CFoundation_C", "__F"}, }; -static char *format_parameterized_type_c_name(type_t *type, typeref_list_t *params, const char *prefix) +static char *format_parameterized_type_c_name(type_t *type, typeref_list_t *params, const char *prefix, const char *separator) { + const char *tmp, *ns_prefix = "__x_", *abi_prefix = NULL; size_t len = 0, pos = 0; - char *buf = NULL, *tmp; + char *buf = NULL; int i, count = params ? list_count(params) : 0; typeref_t *ref; - pos += append_namespaces(&buf, &len, pos, type->namespace, "__x_", "_C", "", use_abi_namespace ? "ABI" : NULL); + if (!strcmp(separator, "__C")) ns_prefix = "_C"; + else if (use_abi_namespace) abi_prefix = "ABI"; + + pos += append_namespaces(&buf, &len, pos, type->namespace, ns_prefix, separator, "", abi_prefix); pos += strappend(&buf, &len, pos, "%s%s_%d", prefix, type->name, count); if (params) LIST_FOR_EACH_ENTRY(ref, params, typeref_t, entry) { type = type_pointer_get_root_type(ref->type); - pos += append_namespaces(&buf, &len, pos, type->namespace, "_", "__C", type->name, NULL); + if ((tmp = type->param_name)) pos += strappend(&buf, &len, pos, "_%s", tmp); + else pos += append_namespaces(&buf, &len, pos, type->namespace, "_", "__C", type->name, NULL); } for (i = 0; i < ARRAY_SIZE(parameterized_type_shorthands); ++i) { if ((tmp = strstr(buf, parameterized_type_shorthands[i][0])) && - (tmp - buf) == strlen(use_abi_namespace ? "__x_ABI_C" : "__x_C")) + (tmp - buf) == strlen(ns_prefix) + (abi_prefix ? 5 : 0)) { tmp += strlen(parameterized_type_shorthands[i][0]); strcpy(buf, parameterized_type_shorthands[i][1]); @@ -358,7 +366,8 @@ static char *format_parameterized_type_short_name(type_t *type, typeref_list_t * if (params) LIST_FOR_EACH_ENTRY(ref, params, typeref_t, entry) { type = type_pointer_get_root_type(ref->type); - pos += strappend(&buf, &len, pos, "_%s", type->name); + if (type->short_name) pos += strappend(&buf, &len, pos, "_%s", type->short_name); + else pos += strappend(&buf, &len, pos, "_%s", type->name); } return buf; @@ -895,8 +904,10 @@ static void compute_delegate_iface_names(type_t *delegate, type_t *type, typeref type_t *iface = delegate->details.delegate.iface; iface->namespace = delegate->namespace; iface->name = strmake("I%s", delegate->name); - if (type) iface->c_name = format_parameterized_type_c_name(type, params, "I"); + if (type) iface->c_name = format_parameterized_type_c_name(type, params, "I", "_C"); else iface->c_name = format_namespace(delegate->namespace, "__x_", "_C", iface->name, use_abi_namespace ? "ABI" : NULL); + if (type) iface->param_name = format_parameterized_type_c_name(type, params, "I", "__C"); + else iface->param_name = format_namespace(delegate->namespace, "_", "__C", iface->name, NULL); iface->qualified_name = format_namespace(delegate->namespace, "", "::", iface->name, use_abi_namespace ? "ABI" : NULL); } @@ -1218,8 +1229,9 @@ type_t *type_parameterized_type_specialize_declare(type_t *type, typeref_list_t new_type->namespace = type->namespace; new_type->name = format_parameterized_type_name(type, params); reg_type(new_type, new_type->name, new_type->namespace, 0); - new_type->c_name = format_parameterized_type_c_name(type, params, ""); + new_type->c_name = format_parameterized_type_c_name(type, params, "", "_C"); new_type->short_name = format_parameterized_type_short_name(type, params, ""); + new_type->param_name = format_parameterized_type_c_name(type, params, "", "__C"); if (new_type->type_type == TYPE_DELEGATE) { diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index e345730731a..0d88e713433 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -483,7 +483,7 @@ enum type_type }; struct _type_t { - const char *name; + const char *name; /* C++ name with parameters in brackets */ struct namespace *namespace; enum type_type type_type; attr_list_t *attrs; @@ -504,11 +504,12 @@ struct _type_t { struct parameterized_details parameterized; struct delegate_details delegate; } details; - const char *c_name; + const char *c_name; /* mangled C name, with namespaces and parameters */ const char *signature; - const char *qualified_name; - const char *impl_name; - const char *short_name; + const char *qualified_name; /* C++ fully qualified name */ + const char *impl_name; /* C++ parameterized types impl base class name */ + const char *param_name; /* used to build c_name of a parameterized type, when used as a parameter */ + const char *short_name; /* widl specific short name */ unsigned int typestring_offset; unsigned int ptrdesc; /* used for complex structs */ int typelib_idx;

1 0

Rémi Bernon : widl: Use "string" for HSTRING in signatures for generated UUID.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 1af44e26709c6c410773a171508b85322991ebcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=1af44e26709c6c410773a171… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 25 10:13:38 2022 +0100 widl: Use "string" for HSTRING in signatures for generated UUID. Fixes the UUID of IVectorView<HSTRING*> to match MIDL for instance. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typetree.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index e1fab1e5525..5e1a73da3d2 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -197,6 +197,7 @@ static size_t append_type_signature(char **buf, size_t *len, size_t pos, type_t return n; case TYPE_ALIAS: if (!strcmp(type->name, "boolean")) n += strappend(buf, len, pos + n, "b1"); + else if (!strcmp(type->name, "HSTRING")) n += strappend(buf, len, pos + n, "string"); else n += append_type_signature(buf, len, pos + n, type->details.alias.aliasee.type); return n; case TYPE_STRUCT:

1 0

Rémi Bernon : widl: Fix sign handling in parameterized types signatures.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 21fa9fa36a17b7b805b6ea29c41dd3c5a682f154 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21fa9fa36a17b7b805b6ea29… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 25 10:13:39 2022 +0100 widl: Fix sign handling in parameterized types signatures. Unspecified sign should be mapped to signed integer / char. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typetree.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 5e1a73da3d2..dc4db35e835 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -211,13 +211,13 @@ static size_t append_type_signature(char **buf, size_t *len, size_t pos, type_t { case TYPE_BASIC_INT: case TYPE_BASIC_INT32: - n += strappend(buf, len, pos + n, type_basic_get_sign(type) < 0 ? "i4" : "u4"); + n += strappend(buf, len, pos + n, type_basic_get_sign(type) <= 0 ? "i4" : "u4"); return n; case TYPE_BASIC_INT64: - n += strappend(buf, len, pos + n, type_basic_get_sign(type) < 0 ? "i8" : "u8"); + n += strappend(buf, len, pos + n, type_basic_get_sign(type) <= 0 ? "i8" : "u8"); return n; case TYPE_BASIC_INT8: - assert(type_basic_get_sign(type) >= 0); /* signature string for signed char isn't specified */ + assert(type_basic_get_sign(type) > 0); /* signature string for signed char isn't specified */ n += strappend(buf, len, pos + n, "u1"); return n; case TYPE_BASIC_FLOAT:

1 0

Nikolay Sivov : d3d10/effect: Fix index access in GetDepthStencilState().
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: bf89b610d365cd778809e0a9cf957fc9e8f5df84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf89b610d365cd778809e0a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 21 10:26:27 2022 +0300 d3d10/effect: Fix index access in GetDepthStencilState(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 12 +++++------- dlls/d3d10/tests/effect.c | 10 ++++++++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index fb6c1ed58ad..96fd994fe77 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -8772,17 +8772,15 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_depth_stencil_variable_GetDepthSte TRACE("iface %p, index %u, depth_stencil_state %p.\n", iface, index, depth_stencil_state); - if (v->type->element_count) - v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); - else if (index) - return E_FAIL; - - if (v->type->basetype != D3D10_SVT_DEPTHSTENCIL) + if (!iface->lpVtbl->IsValid(iface)) { - WARN("Variable is not a depth stencil state.\n"); + WARN("Invalid variable.\n"); return E_FAIL; } + if (!(v = d3d10_get_state_variable(v, index, &v->effect->ds_states))) + return E_FAIL; + if ((*depth_stencil_state = v->u.state.object.depth_stencil)) ID3D10DepthStencilState_AddRef(*depth_stencil_state); diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 32a154bf276..5c2e7766767 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -4559,8 +4559,18 @@ static void test_effect_state_groups(void) ds_desc.BackFace.StencilPassOp); ok(ds_desc.BackFace.StencilFunc == D3D10_COMPARISON_GREATER_EQUAL, "Got unexpected BackFaceStencilFunc %#x.\n", ds_desc.BackFace.StencilFunc); + hr = d->lpVtbl->GetDepthStencilState(d, 0, &ds_state); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10DepthStencilState_GetDesc(ds_state, &ds_desc); + ok(ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); + ID3D10DepthStencilState_Release(ds_state); d->lpVtbl->GetBackingStore(d, 1, &ds_desc); ok(!ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); + hr = d->lpVtbl->GetDepthStencilState(d, 1, &ds_state); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10DepthStencilState_GetDesc(ds_state, &ds_desc); + ok(!ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); + ID3D10DepthStencilState_Release(ds_state); v = effect->lpVtbl->GetVariableByName(effect, "rast_state"); r = v->lpVtbl->AsRasterizer(v);

1 0

Nikolay Sivov : d3d10/effect: Fix index access in GetBlendState().
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: f0cb616fd9a4040f81667876e1d0d61336f3b717 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0cb616fd9a4040f81667876… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 25 12:13:33 2022 +0100 d3d10/effect: Fix index access in GetBlendState(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 12 +++++------- dlls/d3d10/tests/effect.c | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 96fd994fe77..e3c261d0270 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -8531,17 +8531,15 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_blend_variable_GetBlendState(ID3D1 TRACE("iface %p, index %u, blend_state %p.\n", iface, index, blend_state); - if (v->type->element_count) - v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); - else if (index) - return E_FAIL; - - if (v->type->basetype != D3D10_SVT_BLEND) + if (!iface->lpVtbl->IsValid(iface)) { - WARN("Variable is not a blend state.\n"); + WARN("Invalid variable.\n"); return E_FAIL; } + if (!(v = d3d10_get_state_variable(v, index, &v->effect->blend_states))) + return E_FAIL; + if ((*blend_state = v->u.state.object.blend)) ID3D10BlendState_AddRef(*blend_state); diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 5c2e7766767..b4ea4402a05 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -4530,8 +4530,22 @@ static void test_effect_state_groups(void) blend_desc.RenderTargetWriteMask[0]); ok(blend_desc.RenderTargetWriteMask[7] == 0x7, "Got unexpected RenderTargetWriteMask[7] %#x.\n", blend_desc.RenderTargetWriteMask[7]); + hr = b->lpVtbl->GetBlendState(b, 0, &blend_state); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10BlendState_GetDesc(blend_state, &blend_desc); + ok(blend_desc.SrcBlend == D3D10_BLEND_ONE, "Got unexpected SrcBlend %#x.\n", blend_desc.SrcBlend); + ID3D10BlendState_Release(blend_state); b->lpVtbl->GetBackingStore(b, 1, &blend_desc); ok(blend_desc.SrcBlend == D3D10_BLEND_SRC_COLOR, "Got unexpected SrcBlend %#x.\n", blend_desc.SrcBlend); + hr = b->lpVtbl->GetBlendState(b, 1, &blend_state); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10BlendState_GetDesc(blend_state, &blend_desc); + /* We can't check the SrcBlend value from the ID3D10BlendState object + * descriptor because BlendEnable[0] is effectively false, which forces + * normalization of all the other descriptor values. We can at least + * confirm that we got blend_state2 by checking BlendEnable[0] itself. */ + ok(!blend_desc.BlendEnable[0], "Got unexpected BlendEnable[0] %#x.\n", blend_desc.BlendEnable[0]); + ID3D10BlendState_Release(blend_state); v = effect->lpVtbl->GetVariableByName(effect, "ds_state"); d = v->lpVtbl->AsDepthStencil(v);

1 0

Paul Gofman : server: Release correct sockets in poll_socket().
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 0839773db211192af0edf08472f78a178a8c671a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0839773db211192af0edf084… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jan 25 14:44:26 2022 +0300 server: Release correct sockets in poll_socket(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 650e67a2e0a..40fb0cac535 100644 --- a/server/sock.c +++ b/server/sock.c @@ -3046,7 +3046,7 @@ static void poll_socket( struct sock *poll_sock, struct async *async, int exclus req->sockets[i].sock = (struct sock *)get_handle_obj( current->process, sockets[i].socket, 0, &sock_ops ); if (!req->sockets[i].sock) { - for (j = 0; j < i; ++j) release_object( req->sockets[i].sock ); + for (j = 0; j < i; ++j) release_object( req->sockets[j].sock ); if (req->timeout) remove_timeout_user( req->timeout ); free( req ); return;

1 0

Jan Sikorski : wined3d: Acquire references to indirect dispatch buffers for command lists by inspecting CS packets.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 3fb9a8ea51587f77ce4b3aba1fa477cae1eb6679 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fb9a8ea51587f77ce4b3aba… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue Jan 25 11:51:35 2022 +0100 wined3d: Acquire references to indirect dispatch buffers for command lists by inspecting CS packets. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 9f7421e865f..80f9a973eaa 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3630,6 +3630,15 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_DISPATCH: + { + struct wined3d_cs_dispatch *op = (struct wined3d_cs_dispatch *)packet->data; + + if (op->parameters.indirect) + wined3d_buffer_decref(op->parameters.u.indirect.buffer); + break; + } + default: break; } @@ -3778,6 +3787,15 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_DISPATCH: + { + struct wined3d_cs_dispatch *op = (struct wined3d_cs_dispatch *)packet->data; + + if (op->parameters.indirect) + wined3d_buffer_incref(op->parameters.u.indirect.buffer); + break; + } + default: break; }

1 0

Jan Sikorski : wined3d: Acquire references to indirect draw buffers for command lists by inspecting CS packets.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 5f417adf18b90c951c90d11f099ba16641ce3d1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f417adf18b90c951c90d11f… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue Jan 25 11:51:36 2022 +0100 wined3d: Acquire references to indirect draw buffers for command lists by inspecting CS packets. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 80f9a973eaa..6fac275ccf1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3639,6 +3639,15 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_DRAW: + { + struct wined3d_cs_draw *op = (struct wined3d_cs_draw *)packet->data; + + if (op->parameters.indirect) + wined3d_buffer_decref(op->parameters.u.indirect.buffer); + break; + } + default: break; } @@ -3796,6 +3805,15 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_DRAW: + { + struct wined3d_cs_draw *op = (struct wined3d_cs_draw *)packet->data; + + if (op->parameters.indirect) + wined3d_buffer_incref(op->parameters.u.indirect.buffer); + break; + } + default: break; }

1 0

Jan Sikorski : wined3d: Acquire references to index buffers for command lists by inspecting CS packets.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 864135344234747e97df84139399e610929a25c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=864135344234747e97df8413… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue Jan 25 11:51:37 2022 +0100 wined3d: Acquire references to index buffers for command lists by inspecting CS packets. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 6fac275ccf1..c46b38854c6 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3648,6 +3648,16 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_SET_INDEX_BUFFER: + { + struct wined3d_cs_set_index_buffer *op; + + op = (struct wined3d_cs_set_index_buffer *)packet->data; + if (op->buffer) + wined3d_buffer_decref(op->buffer); + break; + } + default: break; } @@ -3814,6 +3824,16 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_SET_INDEX_BUFFER: + { + struct wined3d_cs_set_index_buffer *op; + + op = (struct wined3d_cs_set_index_buffer *)packet->data; + if (op->buffer) + wined3d_buffer_incref(op->buffer); + break; + } + default: break; }

1 0

Jan Sikorski : wined3d: Acquire references to stream output buffers for command lists by inspecting CS packets.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: c36351be1e5277b538e4974af7dfb75b723d2659 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c36351be1e5277b538e4974a… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue Jan 25 11:51:38 2022 +0100 wined3d: Acquire references to stream output buffers for command lists by inspecting CS packets. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c46b38854c6..224a52324b8 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3658,6 +3658,19 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_SET_STREAM_OUTPUTS: + { + struct wined3d_cs_set_stream_outputs *op; + + op = (struct wined3d_cs_set_stream_outputs *)packet->data; + for (i = 0; i < ARRAY_SIZE(op->outputs); ++i) + { + if (op->outputs[i].buffer) + wined3d_buffer_decref(op->outputs[i].buffer); + } + break; + } + default: break; } @@ -3834,6 +3847,19 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_SET_STREAM_OUTPUTS: + { + struct wined3d_cs_set_stream_outputs *op; + + op = (struct wined3d_cs_set_stream_outputs *)packet->data; + for (i = 0; i < ARRAY_SIZE(op->outputs); ++i) + { + if (op->outputs[i].buffer) + wined3d_buffer_incref(op->outputs[i].buffer); + } + break; + } + default: break; }

1 0