October 2021 - Wine-Commits

Nikolay Sivov : d3d10/effect: Extend sampler backing store with a texture field.
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: wine Branch: master Commit: 42a6c1f7055bb1203622c8fa23e3294112989b8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=42a6c1f7055bb1203622c8fa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 4 14:48:48 2021 +0300 d3d10/effect: Extend sampler backing store with a texture field. 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/d3d10_private.h | 8 +++++++- dlls/d3d10/effect.c | 24 ++++++++++++------------ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 31e38713c5f..1ebbbd11ea3 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -124,6 +124,12 @@ struct d3d10_effect_shader_variable unsigned int isinline : 1; }; +struct d3d10_effect_sampler_desc +{ + D3D10_SAMPLER_DESC desc; + struct d3d10_effect_variable *texture; +}; + struct d3d10_effect_state_object_variable { union @@ -131,7 +137,7 @@ struct d3d10_effect_state_object_variable D3D10_RASTERIZER_DESC rasterizer; D3D10_DEPTH_STENCIL_DESC depth_stencil; D3D10_BLEND_DESC blend; - D3D10_SAMPLER_DESC sampler; + struct d3d10_effect_sampler_desc sampler; } desc; union { diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 252e75f73bb..a62269f5b92 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -209,16 +209,16 @@ static const struct d3d10_effect_state_property_info property_info[] = {0x2a, "BlendState.DestBlendAlpha", D3D10_SVT_INT, 1, 1, D3D10_C_BLEND, FIELD_OFFSET(D3D10_BLEND_DESC, DestBlendAlpha) }, {0x2b, "BlendState.BlendOpAlpha", D3D10_SVT_INT, 1, 1, D3D10_C_BLEND, FIELD_OFFSET(D3D10_BLEND_DESC, BlendOpAlpha) }, {0x2c, "BlendState.RenderTargetWriteMask", D3D10_SVT_UINT8, 1, 8, D3D10_C_BLEND, FIELD_OFFSET(D3D10_BLEND_DESC, RenderTargetWriteMask) }, - {0x2d, "SamplerState.Filter", D3D10_SVT_INT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(D3D10_SAMPLER_DESC, Filter) }, - {0x2e, "SamplerState.AddressU", D3D10_SVT_INT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(D3D10_SAMPLER_DESC, AddressU) }, - {0x2f, "SamplerState.AddressV", D3D10_SVT_INT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(D3D10_SAMPLER_DESC, AddressV) }, - {0x30, "SamplerState.AddressW", D3D10_SVT_INT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(D3D10_SAMPLER_DESC, AddressW) }, - {0x31, "SamplerState.MipMapLODBias", D3D10_SVT_FLOAT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(D3D10_SAMPLER_DESC, MipLODBias) }, - {0x32, "SamplerState.MaxAnisotropy", D3D10_SVT_UINT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(D3D10_SAMPLER_DESC, MaxAnisotropy) }, - {0x33, "SamplerState.ComparisonFunc", D3D10_SVT_INT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(D3D10_SAMPLER_DESC, ComparisonFunc) }, - {0x34, "SamplerState.BorderColor", D3D10_SVT_FLOAT, 4, 1, D3D10_C_SAMPLER, FIELD_OFFSET(D3D10_SAMPLER_DESC, BorderColor) }, - {0x35, "SamplerState.MinLOD", D3D10_SVT_FLOAT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(D3D10_SAMPLER_DESC, MinLOD) }, - {0x36, "SamplerState.MaxLOD", D3D10_SVT_FLOAT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(D3D10_SAMPLER_DESC, MaxLOD) }, + {0x2d, "SamplerState.Filter", D3D10_SVT_INT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(struct d3d10_effect_sampler_desc, desc.Filter) }, + {0x2e, "SamplerState.AddressU", D3D10_SVT_INT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(struct d3d10_effect_sampler_desc, desc.AddressU) }, + {0x2f, "SamplerState.AddressV", D3D10_SVT_INT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(struct d3d10_effect_sampler_desc, desc.AddressV) }, + {0x30, "SamplerState.AddressW", D3D10_SVT_INT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(struct d3d10_effect_sampler_desc, desc.AddressW) }, + {0x31, "SamplerState.MipLODBias", D3D10_SVT_FLOAT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(struct d3d10_effect_sampler_desc, desc.MipLODBias) }, + {0x32, "SamplerState.MaxAnisotropy", D3D10_SVT_UINT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(struct d3d10_effect_sampler_desc, desc.MaxAnisotropy) }, + {0x33, "SamplerState.ComparisonFunc", D3D10_SVT_INT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(struct d3d10_effect_sampler_desc, desc.ComparisonFunc) }, + {0x34, "SamplerState.BorderColor", D3D10_SVT_FLOAT, 4, 1, D3D10_C_SAMPLER, FIELD_OFFSET(struct d3d10_effect_sampler_desc, desc.BorderColor) }, + {0x35, "SamplerState.MinLOD", D3D10_SVT_FLOAT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(struct d3d10_effect_sampler_desc, desc.MinLOD) }, + {0x36, "SamplerState.MaxLOD", D3D10_SVT_FLOAT, 1, 1, D3D10_C_SAMPLER, FIELD_OFFSET(struct d3d10_effect_sampler_desc, desc.MaxLOD) }, }; static const D3D10_RASTERIZER_DESC default_rasterizer_desc = @@ -2159,7 +2159,7 @@ static HRESULT create_state_object(struct d3d10_effect_variable *v) case D3D10_SVT_SAMPLER: if (FAILED(hr = ID3D10Device_CreateSamplerState(device, - &v->u.state.desc.sampler, &v->u.state.object.sampler))) + &v->u.state.desc.sampler.desc, &v->u.state.object.sampler))) return hr; break; @@ -8302,7 +8302,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetBackingStore(I return E_FAIL; } - *desc = v->u.state.desc.sampler; + *desc = v->u.state.desc.sampler.desc; return S_OK; }

1 0

Nikolay Sivov : d3d10/effect: Access pool effect structure directly.
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: wine Branch: master Commit: 9b88064a18f7a03ee8e4cfd17ff3ec290f22d6c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b88064a18f7a03ee8e4cfd1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 4 14:48:47 2021 +0300 d3d10/effect: Access pool effect structure directly. 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/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 264 +++++++++++++++++++++------------------------ 2 files changed, 122 insertions(+), 144 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9b88064a18f7a03ee8e4…

1 0

Nikolay Sivov : d3d10/effect: Rename known and used field in type descriptor.
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: wine Branch: master Commit: a1d44ca2ad6ac67cecb94651fdb3b58897278114 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1d44ca2ad6ac67cecb94651… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 4 14:48:46 2021 +0300 d3d10/effect: Rename known and used field in type descriptor. 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 | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index de236ca2513..38bde6ef83c 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -968,9 +968,8 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object, D static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, struct d3d10_effect_type *t) { - DWORD typeinfo, type_flags; + DWORD typeinfo, type_flags, type_kind; const char *ptr; - DWORD unknown0; unsigned int i; if (offset >= data_size || !require_space(offset, 6, sizeof(DWORD), data_size)) @@ -990,8 +989,8 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, } TRACE("Type name: %s.\n", debugstr_a(t->name)); - read_dword(&ptr, &unknown0); - TRACE("Unknown 0: %u.\n", unknown0); + read_dword(&ptr, &type_kind); + TRACE("Kind: %u.\n", type_kind); read_dword(&ptr, &t->element_count); TRACE("Element count: %u.\n", t->element_count); @@ -1005,9 +1004,11 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, read_dword(&ptr, &t->size_packed); TRACE("Packed size %#x.\n", t->size_packed); - switch (unknown0) + switch (type_kind) { case 1: + TRACE("Type is numeric.\n"); + if (!require_space(ptr - data, 1, sizeof(typeinfo), data_size)) { WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); @@ -1122,7 +1123,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, break; default: - FIXME("Unhandled case %#x.\n", unknown0); + FIXME("Unhandled type kind %#x.\n", type_kind); return E_FAIL; }

1 0

Rémi Bernon : winebus.sys: Add a PID effect update output report.
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: wine Branch: master Commit: 12d91995fd054ce9de0879cb8d03597da452c8ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=12d91995fd054ce9de0879cb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 5 08:43:22 2021 +0200 winebus.sys: Add a PID effect update output report. Advertising support of the periodic effect types only for now. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 20 +++++- dlls/winebus.sys/bus_udev.c | 19 ++++- dlls/winebus.sys/hid.c | 151 +++++++++++++++++++++++++++++++++++++++- dlls/winebus.sys/unix_private.h | 21 +++++- dlls/winebus.sys/unixlib.c | 14 ++++ 5 files changed, 220 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=12d91995fd054ce9de08…

1 0

Zebediah Figura : winegstreamer: Convert the Unix library to the __wine_unix_call interface.
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: wine Branch: master Commit: 4ba31162c37ea237763e650f6242535d86ffb170 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ba31162c37ea237763e650f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Oct 4 19:20:51 2021 -0500 winegstreamer: Convert the Unix library to the __wine_unix_call interface. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/gst_private.h | 32 +++++- dlls/winegstreamer/main.c | 197 +++++++++++++++++++++++++++++++++- dlls/winegstreamer/media_source.c | 44 ++++---- dlls/winegstreamer/quartz_parser.c | 72 ++++++------- dlls/winegstreamer/unixlib.h | 139 +++++++++++++++++++----- dlls/winegstreamer/wg_parser.c | 210 +++++++++++++++++++++++-------------- 7 files changed, 528 insertions(+), 167 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4ba31162c37ea237763e…

1 0

Huw Davies : nsiproxy: Pass the listen request off to a separate thread.
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: wine Branch: master Commit: be0765ac2633202a7d267aebf0a7b62ca7f21507 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be0765ac2633202a7d267aeb… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 5 07:37:49 2021 +0100 nsiproxy: Pass the listen request off to a separate thread. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/device.c | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index cd0bc0e4db2..0cd168946cb 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -178,6 +178,16 @@ static NTSTATUS nsiproxy_get_parameter( IRP *irp ) return status; } +static inline HANDLE irp_get_icmp_handle( IRP *irp ) +{ + return irp->Tail.Overlay.DriverContext[0]; +} + +static inline HANDLE irp_set_icmp_handle( IRP *irp, HANDLE handle ) +{ + return InterlockedExchangePointer( irp->Tail.Overlay.DriverContext, handle ); +} + static void WINAPI icmp_echo_cancel( DEVICE_OBJECT *device, IRP *irp ) { TRACE( "device %p, irp %p.\n", device, irp ); @@ -293,6 +303,26 @@ static int add_device( DRIVER_OBJECT *driver ) return 1; } +static DWORD WINAPI listen_thread_proc( void *arg ) +{ + IRP *irp = arg; + + TRACE( "\n" ); + + /* FIXME */ + + EnterCriticalSection( &nsiproxy_cs ); + + nsiproxy_call( icmp_close, irp_set_icmp_handle( irp, NULL ) ); + + irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + + LeaveCriticalSection( &nsiproxy_cs ); + + return 0; +} + static void handle_queued_send_echo( IRP *irp ) { struct nsiproxy_icmp_echo *in = (struct nsiproxy_icmp_echo *)irp->AssociatedIrp.SystemBuffer; @@ -323,10 +353,8 @@ static void handle_queued_send_echo( IRP *irp ) } else { - /* FIXME */ - nsiproxy_call( icmp_close, params.handle ); - irp->IoStatus.Status = STATUS_NOT_SUPPORTED; - IoCompleteRequest( irp, IO_NO_INCREMENT ); + irp_set_icmp_handle( irp, params.handle ); + RtlQueueWorkItem( listen_thread_proc, irp, WT_EXECUTELONGFUNCTION ); } }

1 0

Nikolay Sivov : d3d10/effect: Remove fixme from D3D10CreateEffectFromMemory().
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: wine Branch: master Commit: 4ded5f4293dc0a8115ad6da8a81a82ca347c962c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ded5f4293dc0a8115ad6da8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 4 14:48:44 2021 +0300 d3d10/effect: Remove fixme from D3D10CreateEffectFromMemory(). It's definitely not complete, but it's not a stub. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 5a5f9f37e6d..c135c76811d 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -8631,7 +8631,7 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl ID3D10Effect *pool = NULL; HRESULT hr; - FIXME("data %p, data_size %lu, flags %#x, device %p, effect_pool %p, effect %p stub!\n", + TRACE("data %p, data_size %lu, flags %#x, device %p, effect_pool %p, effect %p.\n", data, data_size, flags, device, effect_pool, effect); if (!(flags & D3D10_EFFECT_COMPILE_CHILD_EFFECT) != !effect_pool)

1 0

Henri Verbeet : vkd3d-shader/sm4: Store the message context pointer in the vkd3d_shader_parser structure.
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: vkd3d Branch: master Commit: aca39afd7305f47e43a4af3c7f027a24d5c47463 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=aca39afd7305f47e43a4af3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 1 17:51:14 2021 +0200 vkd3d-shader/sm4: Store the message context pointer in the vkd3d_shader_parser structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 26 +++++++++++++------------- libs/vkd3d-shader/vkd3d_shader_main.c | 7 +++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 5 +++++ 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index b93d618..cc5b1b8 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -97,7 +97,6 @@ struct vkd3d_shader_sm4_parser struct list src; struct vkd3d_shader_immediate_constant_buffer icb; - struct vkd3d_shader_message_context *message_context; struct vkd3d_shader_parser p; }; @@ -176,13 +175,13 @@ static bool shader_is_sm_5_1(const struct vkd3d_shader_sm4_parser *sm4) return version->major >= 5 && version->minor >= 1; } -static void VKD3D_PRINTF_FUNC(3, 4) shader_sm4_error(struct vkd3d_shader_sm4_parser *priv, +static void VKD3D_PRINTF_FUNC(3, 4) shader_sm4_error(struct vkd3d_shader_sm4_parser *sm4, enum vkd3d_shader_error error, const char *format, ...) { va_list args; va_start(args, format); - vkd3d_shader_verror(priv->message_context, NULL, error, format, args); + vkd3d_shader_verror(sm4->p.message_context, NULL, error, format, args); va_end(args); } @@ -974,6 +973,7 @@ static enum vkd3d_data_type map_data_type(char t) static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t *byte_code, size_t byte_code_size, const struct vkd3d_shader_signature *output_signature, struct vkd3d_shader_message_context *message_context) { + struct vkd3d_shader_version version; uint32_t version_token, token_count; unsigned int i; @@ -1000,34 +1000,36 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t switch (version_token >> 16) { case VKD3D_SM4_PS: - sm4->p.shader_version.type = VKD3D_SHADER_TYPE_PIXEL; + version.type = VKD3D_SHADER_TYPE_PIXEL; break; case VKD3D_SM4_VS: - sm4->p.shader_version.type = VKD3D_SHADER_TYPE_VERTEX; + version.type = VKD3D_SHADER_TYPE_VERTEX; break; case VKD3D_SM4_GS: - sm4->p.shader_version.type = VKD3D_SHADER_TYPE_GEOMETRY; + version.type = VKD3D_SHADER_TYPE_GEOMETRY; break; case VKD3D_SM5_HS: - sm4->p.shader_version.type = VKD3D_SHADER_TYPE_HULL; + version.type = VKD3D_SHADER_TYPE_HULL; break; case VKD3D_SM5_DS: - sm4->p.shader_version.type = VKD3D_SHADER_TYPE_DOMAIN; + version.type = VKD3D_SHADER_TYPE_DOMAIN; break; case VKD3D_SM5_CS: - sm4->p.shader_version.type = VKD3D_SHADER_TYPE_COMPUTE; + version.type = VKD3D_SHADER_TYPE_COMPUTE; break; default: FIXME("Unrecognised shader type %#x.\n", version_token >> 16); } - sm4->p.shader_version.major = VKD3D_SM4_VERSION_MAJOR(version_token); - sm4->p.shader_version.minor = VKD3D_SM4_VERSION_MINOR(version_token); + version.major = VKD3D_SM4_VERSION_MAJOR(version_token); + version.minor = VKD3D_SM4_VERSION_MINOR(version_token); + + vkd3d_shader_parser_init(&sm4->p, message_context, &version); sm4->p.ptr = sm4->start; memset(sm4->output_map, 0xff, sizeof(sm4->output_map)); @@ -1047,8 +1049,6 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t list_init(&sm4->src_free); list_init(&sm4->src); - sm4->message_context = message_context; - return true; } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 8185e12..9f8dd76 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -362,6 +362,13 @@ void vkd3d_shader_dump_shader(enum vkd3d_shader_source_type source_type, shader_get_source_type_suffix(source_type), shader->code, shader->size); } +void vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, + struct vkd3d_shader_message_context *message_context, const struct vkd3d_shader_version *version) +{ + parser->message_context = message_context; + parser->shader_version = *version; +} + static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) { shader_sm4_free(parser); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 4364ba9..db87c16 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -889,11 +889,16 @@ static inline bool vkd3d_shader_register_is_output(const struct vkd3d_shader_reg struct vkd3d_shader_parser { + struct vkd3d_shader_message_context *message_context; + struct vkd3d_shader_desc shader_desc; struct vkd3d_shader_version shader_version; const uint32_t *ptr; }; +void vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, + struct vkd3d_shader_message_context *message_context, const struct vkd3d_shader_version *version); + void vkd3d_shader_trace(struct vkd3d_shader_parser *parser); const char *shader_get_type_prefix(enum vkd3d_shader_type type);

1 0

Henri Verbeet : vkd3d-shader/sm4: Rename the vkd3d_sm4_data structure to vkd3d_shader_sm4_parser.
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: vkd3d Branch: master Commit: 3023d6ba46c051a21ce4306044c044a6d6c5ca1a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3023d6ba46c051a21ce4306… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 1 17:51:12 2021 +0200 vkd3d-shader/sm4: Rename the vkd3d_sm4_data structure to vkd3d_shader_sm4_parser. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 226 ++++++++++++++++++++--------------------------- 1 file changed, 96 insertions(+), 130 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=3023d6ba46c051a21ce…

1 0

Henri Verbeet : vkd3d-shader/sm4: Get rid of the redundant "shader_version" field in the vkd3d_shader_sm4_parser structure.
by Alexandre Julliard Oct. 5, 2021

Oct. 5, 2021

Module: vkd3d Branch: master Commit: 6be802ac1f3b7825bc3318c81e16f69d3c9cb064 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6be802ac1f3b7825bc3318c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 1 17:51:13 2021 +0200 vkd3d-shader/sm4: Get rid of the redundant "shader_version" field in the vkd3d_shader_sm4_parser structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 40 +++++++++++++------------------- libs/vkd3d-shader/trace.c | 3 ++- libs/vkd3d-shader/vkd3d_shader_private.h | 1 - 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 0c2647e..b93d618 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -87,7 +87,6 @@ struct vkd3d_shader_src_param_entry struct vkd3d_shader_sm4_parser { - struct vkd3d_shader_version shader_version; const DWORD *start, *end; unsigned int output_map[MAX_REG_OUTPUT]; @@ -170,9 +169,10 @@ static struct vkd3d_shader_sm4_parser *vkd3d_shader_sm4_parser(struct vkd3d_shad return CONTAINING_RECORD(parser, struct vkd3d_shader_sm4_parser, p); } -static bool shader_is_sm_5_1(const struct vkd3d_shader_sm4_parser *priv) +static bool shader_is_sm_5_1(const struct vkd3d_shader_sm4_parser *sm4) { - const struct vkd3d_shader_version *version = &priv->shader_version; + const struct vkd3d_shader_version *version = &sm4->p.shader_version; + return version->major >= 5 && version->minor >= 1; } @@ -920,23 +920,23 @@ static const struct vkd3d_sm4_opcode_info *get_opcode_info(enum vkd3d_sm4_opcode return NULL; } -static void map_register(const struct vkd3d_shader_sm4_parser *priv, struct vkd3d_shader_register *reg) +static void map_register(const struct vkd3d_shader_sm4_parser *sm4, struct vkd3d_shader_register *reg) { - switch (priv->shader_version.type) + switch (sm4->p.shader_version.type) { case VKD3D_SHADER_TYPE_PIXEL: if (reg->type == VKD3DSPR_OUTPUT) { unsigned int reg_idx = reg->idx[0].offset; - if (reg_idx >= ARRAY_SIZE(priv->output_map)) + if (reg_idx >= ARRAY_SIZE(sm4->output_map)) { ERR("Invalid output index %u.\n", reg_idx); break; } reg->type = VKD3DSPR_COLOROUT; - reg->idx[0].offset = priv->output_map[reg_idx]; + reg->idx[0].offset = sm4->output_map[reg_idx]; } break; @@ -1000,34 +1000,35 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t switch (version_token >> 16) { case VKD3D_SM4_PS: - sm4->shader_version.type = VKD3D_SHADER_TYPE_PIXEL; + sm4->p.shader_version.type = VKD3D_SHADER_TYPE_PIXEL; break; case VKD3D_SM4_VS: - sm4->shader_version.type = VKD3D_SHADER_TYPE_VERTEX; + sm4->p.shader_version.type = VKD3D_SHADER_TYPE_VERTEX; break; case VKD3D_SM4_GS: - sm4->shader_version.type = VKD3D_SHADER_TYPE_GEOMETRY; + sm4->p.shader_version.type = VKD3D_SHADER_TYPE_GEOMETRY; break; case VKD3D_SM5_HS: - sm4->shader_version.type = VKD3D_SHADER_TYPE_HULL; + sm4->p.shader_version.type = VKD3D_SHADER_TYPE_HULL; break; case VKD3D_SM5_DS: - sm4->shader_version.type = VKD3D_SHADER_TYPE_DOMAIN; + sm4->p.shader_version.type = VKD3D_SHADER_TYPE_DOMAIN; break; case VKD3D_SM5_CS: - sm4->shader_version.type = VKD3D_SHADER_TYPE_COMPUTE; + sm4->p.shader_version.type = VKD3D_SHADER_TYPE_COMPUTE; break; default: FIXME("Unrecognised shader type %#x.\n", version_token >> 16); } - sm4->shader_version.major = VKD3D_SM4_VERSION_MAJOR(version_token); - sm4->shader_version.minor = VKD3D_SM4_VERSION_MINOR(version_token); + sm4->p.shader_version.major = VKD3D_SM4_VERSION_MAJOR(version_token); + sm4->p.shader_version.minor = VKD3D_SM4_VERSION_MINOR(version_token); + sm4->p.ptr = sm4->start; memset(sm4->output_map, 0xff, sizeof(sm4->output_map)); for (i = 0; i < output_signature->element_count; ++i) @@ -1087,14 +1088,6 @@ static struct vkd3d_shader_src_param *get_src_param(struct vkd3d_shader_sm4_pars return &e->param; } -void shader_sm4_read_header(struct vkd3d_shader_parser *parser, struct vkd3d_shader_version *shader_version) -{ - struct vkd3d_shader_sm4_parser *sm4 = vkd3d_shader_sm4_parser(parser); - - parser->ptr = sm4->start; - *shader_version = sm4->shader_version; -} - static bool shader_sm4_read_reg_idx(struct vkd3d_shader_sm4_parser *priv, const uint32_t **ptr, const uint32_t *end, uint32_t addressing, struct vkd3d_shader_register_index *reg_idx) { @@ -1702,7 +1695,6 @@ int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compi return VKD3D_ERROR_INVALID_ARGUMENT; } - shader_sm4_read_header(&sm4->p, &sm4->p.shader_version); *parser = &sm4->p; return VKD3D_OK; diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 45f38d1..2858c7f 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1883,12 +1883,13 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, vkd3d_string_buffer_init(buffer); shader_version = &compiler.shader_version; - shader_sm4_read_header(parser, shader_version); + *shader_version = parser->shader_version; vkd3d_string_buffer_printf(buffer, "%s%s_%u_%u%s\n", compiler.colours.version, shader_get_type_prefix(shader_version->type), shader_version->major, shader_version->minor, compiler.colours.reset); indent = 0; + shader_sm4_reset(parser); while (!shader_sm4_is_end(parser)) { struct vkd3d_shader_instruction ins; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index ed31382..4364ba9 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -901,7 +901,6 @@ const char *shader_get_type_prefix(enum vkd3d_shader_type type); struct vkd3d_shader_message_context; void shader_sm4_free(struct vkd3d_shader_parser *parser); -void shader_sm4_read_header(struct vkd3d_shader_parser *parser, struct vkd3d_shader_version *shader_version); void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, struct vkd3d_shader_instruction *ins); bool shader_sm4_is_end(struct vkd3d_shader_parser *parser); void shader_sm4_reset(struct vkd3d_shader_parser *parser);

1 0