July 2023 - Wine-commits - list.winehq.org

Davide Beatrici : mmdevapi: Implement AudioClient_Create.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: b26bad578a9cebaff067ef60dbef3c5be8c9da4a URL: https://gitlab.winehq.org/wine/wine/-/commit/b26bad578a9cebaff067ef60dbef3c… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue Jul 25 00:53:51 2023 +0200 mmdevapi: Implement AudioClient_Create. --- dlls/mmdevapi/audiosessionmanager.c | 7 ++- dlls/mmdevapi/client.c | 57 +++++++++++++++++++- dlls/mmdevapi/devenum.c | 4 +- dlls/mmdevapi/main.c | 2 - dlls/mmdevapi/mmdevapi_private.h | 14 +++-- dlls/mmdevapi/mmdevdrv.h | 9 ---- dlls/mmdevapi/session.c | 21 +++++++- dlls/winealsa.drv/Makefile.in | 5 +- dlls/winealsa.drv/mmdevdrv.c | 73 +------------------------ dlls/winealsa.drv/winealsa.drv.spec | 1 - dlls/winecoreaudio.drv/Makefile.in | 5 +- dlls/winecoreaudio.drv/mmdevdrv.c | 73 +------------------------ dlls/winecoreaudio.drv/winecoreaudio.drv.spec | 1 - dlls/wineoss.drv/Makefile.in | 5 +- dlls/wineoss.drv/mmdevdrv.c | 76 +-------------------------- dlls/wineoss.drv/wineoss.drv.spec | 1 - dlls/winepulse.drv/Makefile.in | 5 +- dlls/winepulse.drv/mmdevdrv.c | 73 +------------------------ dlls/winepulse.drv/winepulse.drv.spec | 1 - 19 files changed, 98 insertions(+), 335 deletions(-)

1 0

Davide Beatrici : winealsa: Remove GetAudioSessionWrapper.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: 41e4506996038ee04fcc7caba59a17fe8cb48326 URL: https://gitlab.winehq.org/wine/wine/-/commit/41e4506996038ee04fcc7caba59a17… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat Jul 22 05:35:43 2023 +0200 winealsa: Remove GetAudioSessionWrapper. --- dlls/winealsa.drv/mmdevdrv.c | 36 ------------------------------------ dlls/winealsa.drv/winealsa.drv.spec | 1 - 2 files changed, 37 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 4b42e64db72..50e53dcda41 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -51,33 +51,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(alsa); -#define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) - -static CRITICAL_SECTION g_sessions_lock; -static CRITICAL_SECTION_DEBUG g_sessions_lock_debug = -{ - 0, 0, &g_sessions_lock, - { &g_sessions_lock_debug.ProcessLocksList, &g_sessions_lock_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": g_sessions_lock") } -}; -static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, 0 }; - static WCHAR drv_key_devicesW[256]; static const WCHAR guidW[] = {'g','u','i','d',0}; -extern struct audio_session_wrapper *session_wrapper_create( - struct audio_client *client) DECLSPEC_HIDDEN; - -void DECLSPEC_HIDDEN sessions_lock(void) -{ - EnterCriticalSection(&g_sessions_lock); -} - -void DECLSPEC_HIDDEN sessions_unlock(void) -{ - LeaveCriticalSection(&g_sessions_lock); -} - BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { switch (reason) @@ -101,7 +77,6 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) } case DLL_PROCESS_DETACH: if (reserved) break; - DeleteCriticalSection(&g_sessions_lock); break; } return TRUE; @@ -312,17 +287,6 @@ BOOL WINAPI get_device_name_from_guid(GUID *guid, char **name, EDataFlow *flow) return FALSE; } -/* if channels == 0, then this will return or create a session with - * matching dataflow and GUID. otherwise, channels must also match */ -extern HRESULT get_audio_session(const GUID *sessionguid, - IMMDevice *device, UINT channels, AudioSession **out); - -HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device, - AudioSessionWrapper **out) -{ - return E_NOTIMPL; -} - HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARIANT *out) { struct get_prop_value_params params; diff --git a/dlls/winealsa.drv/winealsa.drv.spec b/dlls/winealsa.drv/winealsa.drv.spec index a27c34b648f..ae6cfdd84ca 100644 --- a/dlls/winealsa.drv/winealsa.drv.spec +++ b/dlls/winealsa.drv/winealsa.drv.spec @@ -6,5 +6,4 @@ # MMDevAPI driver functions @ stdcall -private get_device_name_from_guid(ptr ptr ptr) get_device_name_from_guid @ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs -@ stdcall -private GetAudioSessionWrapper(ptr ptr ptr) AUDDRV_GetAudioSessionWrapper @ stdcall -private GetPropValue(ptr ptr ptr) AUDDRV_GetPropValue

1 0

Davide Beatrici : winecoreaudio: Remove GetAudioSessionWrapper.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: e1eb454904060ffbb15bd533d7753aff825de907 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1eb454904060ffbb15bd533d7753a… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat Jul 22 05:36:11 2023 +0200 winecoreaudio: Remove GetAudioSessionWrapper. --- dlls/winecoreaudio.drv/mmdevdrv.c | 36 --------------------------- dlls/winecoreaudio.drv/winecoreaudio.drv.spec | 1 - 2 files changed, 37 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index c5624506d2f..09668ee9699 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -46,32 +46,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); -#define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) - static WCHAR drv_key_devicesW[256]; -static CRITICAL_SECTION g_sessions_lock; -static CRITICAL_SECTION_DEBUG g_sessions_lock_debug = -{ - 0, 0, &g_sessions_lock, - { &g_sessions_lock_debug.ProcessLocksList, &g_sessions_lock_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": g_sessions_lock") } -}; -static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, 0 }; - -extern struct audio_session_wrapper *session_wrapper_create( - struct audio_client *client) DECLSPEC_HIDDEN; - -void DECLSPEC_HIDDEN sessions_lock(void) -{ - EnterCriticalSection(&g_sessions_lock); -} - -void DECLSPEC_HIDDEN sessions_unlock(void) -{ - LeaveCriticalSection(&g_sessions_lock); -} - BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { switch (reason) @@ -97,7 +73,6 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) } case DLL_PROCESS_DETACH: if (reserved) break; - DeleteCriticalSection(&g_sessions_lock); break; } return TRUE; @@ -305,14 +280,3 @@ BOOL WINAPI get_device_name_from_guid(const GUID *guid, char **name, EDataFlow * return FALSE; } - -/* if channels == 0, then this will return or create a session with - * matching dataflow and GUID. otherwise, channels must also match */ -extern HRESULT get_audio_session(const GUID *sessionguid, - IMMDevice *device, UINT channels, AudioSession **out); - -HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device, - AudioSessionWrapper **out) -{ - return E_NOTIMPL; -} diff --git a/dlls/winecoreaudio.drv/winecoreaudio.drv.spec b/dlls/winecoreaudio.drv/winecoreaudio.drv.spec index 1c9751f9404..16cd7f08b2b 100644 --- a/dlls/winecoreaudio.drv/winecoreaudio.drv.spec +++ b/dlls/winecoreaudio.drv/winecoreaudio.drv.spec @@ -6,4 +6,3 @@ # MMDevAPI driver functions @ stdcall -private get_device_name_from_guid(ptr ptr ptr) get_device_name_from_guid @ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs -@ stdcall -private GetAudioSessionWrapper(ptr ptr ptr) AUDDRV_GetAudioSessionWrapper

1 0

Davide Beatrici : wineoss: Remove GetAudioSessionWrapper.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: b0d1625300520a0b16a7a13d30b8c84781613c63 URL: https://gitlab.winehq.org/wine/wine/-/commit/b0d1625300520a0b16a7a13d30b8c8… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat Jul 22 05:36:24 2023 +0200 wineoss: Remove GetAudioSessionWrapper. --- dlls/wineoss.drv/mmdevdrv.c | 37 ------------------------------------- dlls/wineoss.drv/wineoss.drv.spec | 1 - 2 files changed, 38 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 1c71360a80a..4a45c532dd0 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -48,8 +48,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(oss); -#define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) - typedef struct _OSSDevice { struct list entry; EDataFlow flow; @@ -62,28 +60,6 @@ static struct list g_devices = LIST_INIT(g_devices); static WCHAR drv_key_devicesW[256]; static const WCHAR guidW[] = {'g','u','i','d',0}; -static CRITICAL_SECTION g_sessions_lock; -static CRITICAL_SECTION_DEBUG g_sessions_lock_debug = -{ - 0, 0, &g_sessions_lock, - { &g_sessions_lock_debug.ProcessLocksList, &g_sessions_lock_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": g_sessions_lock") } -}; -static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, 0 }; - -extern struct audio_session_wrapper *session_wrapper_create( - struct audio_client *client) DECLSPEC_HIDDEN; - -void DECLSPEC_HIDDEN sessions_lock(void) -{ - EnterCriticalSection(&g_sessions_lock); -} - -void DECLSPEC_HIDDEN sessions_unlock(void) -{ - LeaveCriticalSection(&g_sessions_lock); -} - BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { switch (reason) @@ -110,8 +86,6 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { OSSDevice *iter, *iter2; - DeleteCriticalSection(&g_sessions_lock); - LIST_FOR_EACH_ENTRY_SAFE(iter, iter2, &g_devices, OSSDevice, entry){ HeapFree(GetProcessHeap(), 0, iter); } @@ -292,14 +266,3 @@ end: return params.result; } - -/* if channels == 0, then this will return or create a session with - * matching dataflow and GUID. otherwise, channels must also match */ -extern HRESULT get_audio_session(const GUID *sessionguid, - IMMDevice *device, UINT channels, AudioSession **out); - -HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device, - AudioSessionWrapper **out) -{ - return E_NOTIMPL; -} diff --git a/dlls/wineoss.drv/wineoss.drv.spec b/dlls/wineoss.drv/wineoss.drv.spec index c61d81e7ee9..e12fb20fd17 100644 --- a/dlls/wineoss.drv/wineoss.drv.spec +++ b/dlls/wineoss.drv/wineoss.drv.spec @@ -7,4 +7,3 @@ # MMDevAPI driver functions @ stdcall -private get_device_name_from_guid(ptr ptr ptr) get_device_name_from_guid @ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs -@ stdcall -private GetAudioSessionWrapper(ptr ptr ptr) AUDDRV_GetAudioSessionWrapper

1 0

Davide Beatrici : winepulse: Remove GetAudioSessionWrapper.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: ad3a0b767f86a1332c0dbbcc19137986d623a081 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad3a0b767f86a1332c0dbbcc191379… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat Jul 22 05:36:38 2023 +0200 winepulse: Remove GetAudioSessionWrapper. --- dlls/winepulse.drv/mmdevdrv.c | 35 ----------------------------------- dlls/winepulse.drv/winepulse.drv.spec | 1 - 2 files changed, 36 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 0180c148f1e..3dbb88d880e 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -54,8 +54,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(pulse); #define MAX_PULSE_NAME_LEN 256 -#define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) - static struct list g_devices_cache = LIST_INIT(g_devices_cache); struct device_cache { @@ -72,25 +70,6 @@ static GUID pulse_capture_guid = static WCHAR drv_key_devicesW[256]; -static CRITICAL_SECTION session_cs; -static CRITICAL_SECTION_DEBUG session_cs_debug = { - 0, 0, &session_cs, - { &session_cs_debug.ProcessLocksList, - &session_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": session_cs") } -}; -static CRITICAL_SECTION session_cs = { &session_cs_debug, -1, 0, 0, 0, 0 }; - -void DECLSPEC_HIDDEN sessions_lock(void) -{ - EnterCriticalSection(&session_cs); -} - -void DECLSPEC_HIDDEN sessions_unlock(void) -{ - LeaveCriticalSection(&session_cs); -} - BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { if (reason == DLL_PROCESS_ATTACH) { @@ -117,9 +96,6 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) return TRUE; } -extern struct audio_session_wrapper *session_wrapper_create( - struct audio_client *client) DECLSPEC_HIDDEN; - static void pulse_call(enum unix_funcs code, void *params) { NTSTATUS status; @@ -336,17 +312,6 @@ BOOL WINAPI get_device_name_from_guid(GUID *guid, char **name, EDataFlow *flow) return FALSE; } -/* if channels == 0, then this will return or create a session with - * matching dataflow and GUID. otherwise, channels must also match */ -extern HRESULT get_audio_session(const GUID *sessionguid, - IMMDevice *device, UINT channels, AudioSession **out); - -HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device, - AudioSessionWrapper **out) -{ - return E_NOTIMPL; -} - HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARIANT *out) { struct get_prop_value_params params; diff --git a/dlls/winepulse.drv/winepulse.drv.spec b/dlls/winepulse.drv/winepulse.drv.spec index 79746fe4749..fe5b62e053b 100644 --- a/dlls/winepulse.drv/winepulse.drv.spec +++ b/dlls/winepulse.drv/winepulse.drv.spec @@ -1,7 +1,6 @@ # MMDevAPI driver functions @ stdcall -private get_device_name_from_guid(ptr ptr ptr) get_device_name_from_guid @ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs -@ stdcall -private GetAudioSessionWrapper(ptr ptr ptr) AUDDRV_GetAudioSessionWrapper @ stdcall -private GetPropValue(ptr ptr ptr) AUDDRV_GetPropValue # WinMM driver functions

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass an hlsl_block pointer to add_method_call().
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: vkd3d Branch: master Commit: c861a937e8b2722fd6d5090abf812218563a91c3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c861a937e8b2722fd6d5090abf812… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 14 20:28:17 2022 -0600 vkd3d-shader/hlsl: Pass an hlsl_block pointer to add_method_call(). --- libs/vkd3d-shader/hlsl.y | 66 ++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 33 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass an hlsl_block pointer to add_array_access().
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: vkd3d Branch: master Commit: 21d5ee4df254b8953d469611a1f2a9f183b4a343 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/21d5ee4df254b8953d469611a1f2a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 14 20:30:28 2022 -0600 vkd3d-shader/hlsl: Pass an hlsl_block pointer to add_array_access(). --- libs/vkd3d-shader/hlsl.y | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4ae81816..03767ff2 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -722,7 +722,7 @@ static struct hlsl_ir_node *add_binary_arithmetic_expr(struct hlsl_ctx *ctx, str enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2, const struct vkd3d_shader_location *loc); -static bool add_array_access(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *array, +static bool add_array_access(struct hlsl_ctx *ctx, struct hlsl_block *block, struct hlsl_ir_node *array, struct hlsl_ir_node *index, const struct vkd3d_shader_location *loc) { const struct hlsl_type *expr_type = array->data_type, *index_type = index->data_type; @@ -745,13 +745,13 @@ static bool add_array_access(struct hlsl_ctx *ctx, struct list *instrs, struct h return false; } - if (!(index = add_implicit_conversion(ctx, instrs, index, + if (!(index = add_implicit_conversion(ctx, block_to_list(block), index, hlsl_get_vector_type(ctx, HLSL_TYPE_UINT, dim_count), &index->loc))) return false; if (!(return_index = hlsl_new_index(ctx, array, index, loc))) return false; - list_add_tail(instrs, &return_index->entry); + hlsl_block_add_instr(block, return_index); return true; } @@ -764,7 +764,7 @@ static bool add_array_access(struct hlsl_ctx *ctx, struct list *instrs, struct h if (!(cast = hlsl_new_cast(ctx, index, hlsl_get_scalar_type(ctx, HLSL_TYPE_UINT), &index->loc))) return false; - list_add_tail(instrs, &cast->entry); + hlsl_block_add_instr(block, cast); index = cast; if (expr_type->class != HLSL_CLASS_ARRAY && expr_type->class != HLSL_CLASS_VECTOR && expr_type->class != HLSL_CLASS_MATRIX) @@ -778,7 +778,7 @@ static bool add_array_access(struct hlsl_ctx *ctx, struct list *instrs, struct h if (!(return_index = hlsl_new_index(ctx, array, index, loc))) return false; - list_add_tail(instrs, &return_index->entry); + hlsl_block_add_instr(block, return_index); return true; } @@ -6165,7 +6165,7 @@ postfix_expr: hlsl_block_add_block($3, $1); destroy_block($1); - if (!add_array_access(ctx, block_to_list($3), array, index, &@2)) + if (!add_array_access(ctx, $3, array, index, &@2)) { destroy_block($3); YYABORT;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass an hlsl_block pointer to add_implicit_conversion().
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: vkd3d Branch: master Commit: fe70ee2158fe7cb7dbf58ab4807b238c12dbb902 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fe70ee2158fe7cb7dbf58ab4807b2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 14 20:34:25 2022 -0600 vkd3d-shader/hlsl: Pass an hlsl_block pointer to add_implicit_conversion(). --- libs/vkd3d-shader/hlsl.y | 96 ++++++++++++++++++++++++------------------------ 1 file changed, 48 insertions(+), 48 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass an hlsl_block pointer to add_cast().
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: vkd3d Branch: master Commit: 9d94506313e648082ece837ae525001372b63d9e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9d94506313e648082ece837ae5250… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 14 20:40:53 2022 -0600 vkd3d-shader/hlsl: Pass an hlsl_block pointer to add_cast(). --- libs/vkd3d-shader/hlsl.y | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2e5be57e..12f567e3 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -294,7 +294,7 @@ static bool implicit_compatible_data_types(struct hlsl_ctx *ctx, struct hlsl_typ return hlsl_types_are_componentwise_equal(ctx, src, dst); } -static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct list *instrs, +static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct hlsl_block *block, struct hlsl_ir_node *node, struct hlsl_type *dst_type, const struct vkd3d_shader_location *loc) { struct hlsl_type *src_type = node->data_type; @@ -331,7 +331,7 @@ static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct list *instrs, { struct hlsl_ir_node *component_load; struct hlsl_type *dst_comp_type; - struct hlsl_block block; + struct hlsl_block store_block; unsigned int src_idx; if (broadcast) @@ -351,21 +351,21 @@ static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct list *instrs, dst_comp_type = hlsl_type_get_component_type(ctx, dst_type, dst_idx); - if (!(component_load = hlsl_add_load_component(ctx, instrs, node, src_idx, loc))) + if (!(component_load = hlsl_add_load_component(ctx, block_to_list(block), node, src_idx, loc))) return NULL; if (!(cast = hlsl_new_cast(ctx, component_load, dst_comp_type, loc))) return NULL; - list_add_tail(instrs, &cast->entry); + hlsl_block_add_instr(block, cast); - if (!hlsl_new_store_component(ctx, &block, &var_deref, dst_idx, cast)) + if (!hlsl_new_store_component(ctx, &store_block, &var_deref, dst_idx, cast)) return NULL; - list_move_tail(instrs, &block.instrs); + hlsl_block_add_block(block, &store_block); } if (!(load = hlsl_new_var_load(ctx, var, loc))) return NULL; - list_add_tail(instrs, &load->node.entry); + hlsl_block_add_instr(block, &load->node); return &load->node; } @@ -373,7 +373,7 @@ static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct list *instrs, { if (!(cast = hlsl_new_cast(ctx, node, dst_type, loc))) return NULL; - list_add_tail(instrs, &cast->entry); + hlsl_block_add_instr(block, cast); return cast; } } @@ -404,7 +404,7 @@ static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct hlsl_warning(ctx, loc, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION, "Implicit truncation of %s type.", src_type->class == HLSL_CLASS_VECTOR ? "vector" : "matrix"); - return add_cast(ctx, &block->instrs, node, dst_type, loc); + return add_cast(ctx, block, node, dst_type, loc); } static DWORD add_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, DWORD mod, @@ -2252,7 +2252,7 @@ static struct hlsl_block *initialize_vars(struct hlsl_ctx *ctx, struct list *var } hlsl_block_add_instr(&ctx->static_initializers, zero); - if (!(cast = add_cast(ctx, &ctx->static_initializers.instrs, zero, var->data_type, &var->loc))) + if (!(cast = add_cast(ctx, &ctx->static_initializers, zero, var->data_type, &var->loc))) { free_parse_variable_def(v); continue; @@ -3692,7 +3692,7 @@ static struct hlsl_block *add_call(struct hlsl_ctx *ctx, const char *name, { struct hlsl_ir_node *cast; - if (!(cast = add_cast(ctx, block_to_list(args->instrs), arg, param->data_type, &arg->loc))) + if (!(cast = add_cast(ctx, args->instrs, arg, param->data_type, &arg->loc))) goto fail; args->args[i] = cast; arg = cast; @@ -6304,7 +6304,7 @@ unary_expr: YYABORT; } - if (!add_cast(ctx, block_to_list($6), node_from_block($6), dst_type, &@3)) + if (!add_cast(ctx, $6, node_from_block($6), dst_type, &@3)) { destroy_block($6); YYABORT;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass an hlsl_block pointer to add_expr().
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: vkd3d Branch: master Commit: 819c5f194396d59c7bcab12f306c418c80ea927b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/819c5f194396d59c7bcab12f306c4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 14 20:43:13 2022 -0600 vkd3d-shader/hlsl: Pass an hlsl_block pointer to add_expr(). --- libs/vkd3d-shader/hlsl.y | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 12f567e3..08bb1319 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1309,7 +1309,7 @@ static bool expr_common_shape(struct hlsl_ctx *ctx, struct hlsl_type *t1, struct return true; } -static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct list *instrs, +static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct hlsl_block *block, enum hlsl_ir_expr_op op, struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS], struct hlsl_type *type, const struct vkd3d_shader_location *loc) { @@ -1333,38 +1333,38 @@ static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct list *instrs, for (i = 0; i < type->dimy * type->dimx; ++i) { struct hlsl_ir_node *value, *cell_operands[HLSL_MAX_OPERANDS] = { NULL }; - struct hlsl_block block; + struct hlsl_block store_block; unsigned int j; for (j = 0; j < HLSL_MAX_OPERANDS; j++) { if (operands[j]) { - if (!(load = hlsl_add_load_component(ctx, instrs, operands[j], i, loc))) + if (!(load = hlsl_add_load_component(ctx, block_to_list(block), operands[j], i, loc))) return NULL; cell_operands[j] = load; } } - if (!(value = add_expr(ctx, instrs, op, cell_operands, scalar_type, loc))) + if (!(value = add_expr(ctx, block, op, cell_operands, scalar_type, loc))) return NULL; - if (!hlsl_new_store_component(ctx, &block, &var_deref, i, value)) + if (!hlsl_new_store_component(ctx, &store_block, &var_deref, i, value)) return NULL; - list_move_tail(instrs, &block.instrs); + hlsl_block_add_block(block, &store_block); } if (!(var_load = hlsl_new_var_load(ctx, var, loc))) return NULL; - list_add_tail(instrs, &var_load->node.entry); + hlsl_block_add_instr(block, &var_load->node); return &var_load->node; } if (!(expr = hlsl_new_expr(ctx, op, operands, type, loc))) return NULL; - list_add_tail(instrs, &expr->entry); + hlsl_block_add_instr(block, expr); return expr; } @@ -1395,7 +1395,7 @@ static struct hlsl_ir_node *add_unary_arithmetic_expr(struct hlsl_ctx *ctx, stru { struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {arg}; - return add_expr(ctx, block_to_list(block), op, args, arg->data_type, loc); + return add_expr(ctx, block, op, args, arg->data_type, loc); } static struct hlsl_ir_node *add_unary_bitwise_expr(struct hlsl_ctx *ctx, struct hlsl_block *block, @@ -1418,7 +1418,7 @@ static struct hlsl_ir_node *add_unary_logical_expr(struct hlsl_ctx *ctx, struct if (!(args[0] = add_implicit_conversion(ctx, block, arg, bool_type, loc))) return NULL; - return add_expr(ctx, block_to_list(block), op, args, bool_type, loc); + return add_expr(ctx, block, op, args, bool_type, loc); } static struct hlsl_type *get_common_numeric_type(struct hlsl_ctx *ctx, const struct hlsl_ir_node *arg1, @@ -1449,7 +1449,7 @@ static struct hlsl_ir_node *add_binary_arithmetic_expr(struct hlsl_ctx *ctx, str if (!(args[1] = add_implicit_conversion(ctx, block, arg2, common_type, loc))) return NULL; - return add_expr(ctx, block_to_list(block), op, args, common_type, loc); + return add_expr(ctx, block, op, args, common_type, loc); } static struct hlsl_ir_node *add_binary_bitwise_expr(struct hlsl_ctx *ctx, struct hlsl_block *block, @@ -1484,7 +1484,7 @@ static struct hlsl_ir_node *add_binary_comparison_expr(struct hlsl_ctx *ctx, str if (!(args[1] = add_implicit_conversion(ctx, block, arg2, common_type, loc))) return NULL; - return add_expr(ctx, block_to_list(block), op, args, return_type, loc); + return add_expr(ctx, block, op, args, return_type, loc); } static struct hlsl_ir_node *add_binary_logical_expr(struct hlsl_ctx *ctx, struct hlsl_block *block, @@ -1507,7 +1507,7 @@ static struct hlsl_ir_node *add_binary_logical_expr(struct hlsl_ctx *ctx, struct if (!(args[1] = add_implicit_conversion(ctx, block, arg2, common_type, loc))) return NULL; - return add_expr(ctx, block_to_list(block), op, args, common_type, loc); + return add_expr(ctx, block, op, args, common_type, loc); } static struct hlsl_ir_node *add_binary_shift_expr(struct hlsl_ctx *ctx, struct hlsl_block *block, @@ -1538,7 +1538,7 @@ static struct hlsl_ir_node *add_binary_shift_expr(struct hlsl_ctx *ctx, struct h if (!(args[1] = add_implicit_conversion(ctx, block, arg2, integer_type, loc))) return NULL; - return add_expr(ctx, block_to_list(block), op, args, return_type, loc); + return add_expr(ctx, block, op, args, return_type, loc); } static struct hlsl_ir_node *add_binary_dot_expr(struct hlsl_ctx *ctx, struct hlsl_block *instrs, @@ -1591,7 +1591,7 @@ static struct hlsl_ir_node *add_binary_dot_expr(struct hlsl_ctx *ctx, struct hls if (!(args[1] = add_implicit_conversion(ctx, instrs, arg2, common_type, loc))) return NULL; - return add_expr(ctx, block_to_list(instrs), op, args, ret_type, loc); + return add_expr(ctx, instrs, op, args, ret_type, loc); } static struct hlsl_block *add_binary_expr_merge(struct hlsl_ctx *ctx, struct hlsl_block *block1, @@ -2555,7 +2555,7 @@ static bool intrinsic_asfloat(struct hlsl_ctx *ctx, data_type = convert_numeric_type(ctx, data_type, HLSL_TYPE_FLOAT); operands[0] = params->args[0]; - return add_expr(ctx, block_to_list(params->instrs), HLSL_OP1_REINTERPRET, operands, data_type, loc); + return add_expr(ctx, params->instrs, HLSL_OP1_REINTERPRET, operands, data_type, loc); } static bool intrinsic_asuint(struct hlsl_ctx *ctx, @@ -2591,7 +2591,7 @@ static bool intrinsic_asuint(struct hlsl_ctx *ctx, data_type = convert_numeric_type(ctx, data_type, HLSL_TYPE_UINT); operands[0] = params->args[0]; - return add_expr(ctx, block_to_list(params->instrs), HLSL_OP1_REINTERPRET, operands, data_type, loc); + return add_expr(ctx, params->instrs, HLSL_OP1_REINTERPRET, operands, data_type, loc); } static bool intrinsic_clamp(struct hlsl_ctx *ctx,

1 0