August 2021 - Wine-commits - list.winehq.org

Jacek Caban : gdi32: Use NtGdiDoPalette for GetDIBColorTable and SetDIBColorTable.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: wine Branch: master Commit: c230071d255032701fbc7d41e6255a8f0c6a1ced URL: https://source.winehq.org/git/wine.git/?a=commit;h=c230071d255032701fbc7d41… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 16 10:28:12 2021 +0200 gdi32: Use NtGdiDoPalette for GetDIBColorTable and SetDIBColorTable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dib.c | 10 ++-------- dlls/gdi32/ntgdi_private.h | 4 ++++ dlls/gdi32/objects.c | 16 ++++++++++++++++ dlls/gdi32/palette.c | 4 ++++ 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 738151aa14d..7da248079b2 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -910,10 +910,7 @@ INT WINAPI NtGdiSetDIBitsToDeviceInternal( HDC hdc, INT xDest, INT yDest, DWORD return ret; } -/*********************************************************************** - * SetDIBColorTable (GDI32.@) - */ -UINT WINAPI SetDIBColorTable( HDC hdc, UINT startpos, UINT entries, const RGBQUAD *colors ) +UINT set_dib_dc_color_table( HDC hdc, UINT startpos, UINT entries, const RGBQUAD *colors ) { DC * dc; UINT i, result = 0; @@ -949,10 +946,7 @@ UINT WINAPI SetDIBColorTable( HDC hdc, UINT startpos, UINT entries, const RGBQUA } -/*********************************************************************** - * GetDIBColorTable (GDI32.@) - */ -UINT WINAPI GetDIBColorTable( HDC hdc, UINT startpos, UINT entries, RGBQUAD *colors ) +UINT get_dib_dc_color_table( HDC hdc, UINT startpos, UINT entries, RGBQUAD *colors ) { DC * dc; BITMAPOBJ *bitmap; diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index d9b016c213f..6b3efea3ddb 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -241,6 +241,10 @@ extern DWORD get_image_from_bitmap( BITMAPOBJ *bmp, BITMAPINFO *info, extern DWORD put_image_into_bitmap( BITMAPOBJ *bmp, HRGN clip, BITMAPINFO *info, const struct gdi_image_bits *bits, struct bitblt_coords *src, struct bitblt_coords *dst ) DECLSPEC_HIDDEN; +extern UINT get_dib_dc_color_table( HDC hdc, UINT startpos, UINT entries, + RGBQUAD *colors ) DECLSPEC_HIDDEN; +extern UINT set_dib_dc_color_table( HDC hdc, UINT startpos, UINT entries, + const RGBQUAD *colors ) DECLSPEC_HIDDEN; extern void dibdrv_set_window_surface( DC *dc, struct window_surface *surface ) DECLSPEC_HIDDEN; extern NTSTATUS init_opengl_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 38a26afe774..028b9fd06ad 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -594,3 +594,19 @@ UINT WINAPI GetSystemPaletteEntries( HDC hdc, UINT start, UINT count, PALETTEENT return 0; } + +/*********************************************************************** + * GetDIBColorTable (GDI32.@) + */ +UINT WINAPI GetDIBColorTable( HDC hdc, UINT start, UINT count, RGBQUAD *colors ) +{ + return NtGdiDoPalette( hdc, start, count, colors, NtGdiGetDIBColorTable, TRUE ); +} + +/*********************************************************************** + * SetDIBColorTable (GDI32.@) + */ +UINT WINAPI SetDIBColorTable( HDC hdc, UINT start, UINT count, const RGBQUAD *colors ) +{ + return NtGdiDoPalette( hdc, start, count, (void *)colors, NtGdiSetDIBColorTable, FALSE ); +} diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index 36335083c48..3d2e27c1fc6 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -635,6 +635,10 @@ LONG WINAPI NtGdiDoPalette( HGDIOBJ handle, WORD start, WORD count, void *entrie return get_palette_entries( handle, start, count, entries ); case NtGdiGetSystemPaletteEntries: return get_system_palette_entries( handle, start, count, entries ); + case NtGdiSetDIBColorTable: + return set_dib_dc_color_table( handle, start, count, entries ); + case NtGdiGetDIBColorTable: + return get_dib_dc_color_table( handle, start, count, entries ); default: WARN( "invalid func %u\n", func ); return 0;

1 0

Jacek Caban : gdi32: Use NtGdiGetAndSetDCDword for SetBkColor.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: wine Branch: master Commit: a5cb435e77d1f0d25bbed1f2aed59d892dd9d4d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5cb435e77d1f0d25bbed1f2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 16 10:28:29 2021 +0200 gdi32: Use NtGdiGetAndSetDCDword for SetBkColor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 41 ++++++++++++++---------------------- dlls/gdi32/enhmfdrv/dc.c | 7 ++---- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 14 ++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - include/ntgdi.h | 2 ++ 10 files changed, 40 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a5cb435e77d1f0d25bbe…

1 0

Jacek Caban : gdi32: Use NtGdiGetAndSetDCDword for SetTextColor.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: wine Branch: master Commit: fb11008bcac2a8b890e8025336ac0ebfcfb96c92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb11008bcac2a8b890e80253… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 16 10:28:42 2021 +0200 gdi32: Use NtGdiGetAndSetDCDword for SetTextColor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 39 ++++++++++++++---------------------- dlls/gdi32/enhmfdrv/dc.c | 7 ++----- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 14 +++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - include/ntgdi.h | 1 + 10 files changed, 38 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fb11008bcac2a8b890e8…

1 0

Francois Gouget : advapi32/tests: RegSetValueExA() should succeed when given a NULL data pointer.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: wine Branch: master Commit: ba020f42bad61c82ce089744b18454f1da1edb7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba020f42bad61c82ce089744… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 16 17:46:28 2021 +0200 advapi32/tests: RegSetValueExA() should succeed when given a NULL data pointer. This used to fail on Windows 95 but we don't want to allow such behavior anymore. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index bccc5706131..fb3d5a34f51 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -491,9 +491,9 @@ static void test_enum_value(void) else ok( !res, "RegSetValueExA returned %d\n", res ); res = RegSetValueExA( test_key, "Test", 0, REG_EXPAND_SZ, NULL, 0 ); - ok( ERROR_SUCCESS == res || ERROR_INVALID_PARAMETER == res, "RegSetValueExA returned %d\n", res ); + ok( ERROR_SUCCESS == res, "RegSetValueExA returned %d\n", res ); res = RegSetValueExA( test_key, "Test", 0, REG_BINARY, NULL, 0 ); - ok( ERROR_SUCCESS == res || ERROR_INVALID_PARAMETER == res, "RegSetValueExA returned %d\n", res ); + ok( ERROR_SUCCESS == res, "RegSetValueExA returned %d\n", res ); /* test reading the value and data without setting them */ val_count = 20;

1 0

Francois Gouget : advapi32/tests: Fix an uninitialized variable check in test_performance_keys().
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: wine Branch: master Commit: 9572c20812b4004e6166fca6aea47e07a56966c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9572c20812b4004e6166fca6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 16 18:10:50 2021 +0200 advapi32/tests: Fix an uninitialized variable check in test_performance_keys(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index fb3d5a34f51..5ed220095bb 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3867,6 +3867,7 @@ static void test_performance_keys(void) ret = RegSetValueA(keys[i], "Global", REG_SZ, "dummy", 5); ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); + key_count = 0x900ddeed; ret = RegQueryInfoKeyA(keys[i], NULL, NULL, NULL, &key_count, NULL, NULL, &value_count, NULL, NULL, NULL, NULL); todo_wine ok(!ret, "got %u\n", ret);

1 0

Zebediah Figura : ws2_32/tests: Fix a test failure in test_GetAddrInfoExW().
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: wine Branch: master Commit: 17871709e582708b435fdecc786d31f5f350fbba URL: https://source.winehq.org/git/wine.git/?a=commit;h=17871709e582708b435fdecc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 16 11:20:17 2021 -0500 ws2_32/tests: Fix a test failure in test_GetAddrInfoExW(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/protocol.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 1f039e509da..bb09dc98f1c 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -1910,7 +1910,9 @@ static void test_GetAddrInfoExW(void) ResetEvent(event); ret = pGetAddrInfoExW(localhost, NULL, NS_DNS, NULL, NULL, &result, NULL, &overlapped, NULL, NULL); ok(ret == ERROR_IO_PENDING, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); - ok(!result, "result != NULL\n"); + /* result pointer is cleared by GetAddrInfoExW(), but may be set to the + * actual addrinfo before we can verify that */ + ok(result != (void *)0xdeadbeef, "result was not changed\n"); ok(WaitForSingleObject(event, 1000) == WAIT_OBJECT_0, "wait failed\n"); ret = pGetAddrInfoExOverlappedResult(&overlapped); ok(!ret, "overlapped result is %d\n", ret);

1 0

Francois Gouget : msv1_0: Fix the call to ntlm_cleanup().
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: wine Branch: master Commit: 655fd2b267ac6ed79bb8b043b9643f454f18378d URL: https://source.winehq.org/git/wine.git/?a=commit;h=655fd2b267ac6ed79bb8b043… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 16 09:59:11 2021 +0200 msv1_0: Fix the call to ntlm_cleanup(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msv1_0/unixlib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msv1_0/unixlib.c b/dlls/msv1_0/unixlib.c index cada3febedf..789dfbbe8cb 100644 --- a/dlls/msv1_0/unixlib.c +++ b/dlls/msv1_0/unixlib.c @@ -199,6 +199,7 @@ static NTSTATUS ntlm_check_version( void *args ) char *argv[3], buf[80]; NTSTATUS status = STATUS_DLL_NOT_FOUND; struct fork_params params = { &ctx, argv }; + struct cleanup_params cleanup_params = { &ctx }; int len; argv[0] = (char *)"ntlm_auth"; @@ -231,7 +232,7 @@ static NTSTATUS ntlm_check_version( void *args ) "Make sure that ntlm_auth >= %d.%d.%d is in your path. " "Usually, you can find it in the winbind package of your distribution.\n", NTLM_AUTH_MAJOR_VERSION, NTLM_AUTH_MINOR_VERSION, NTLM_AUTH_MICRO_VERSION ); - ntlm_cleanup( &ctx ); + ntlm_cleanup( &cleanup_params ); return status; }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Use a designated initializer in debug_expr_op().
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: vkd3d Branch: master Commit: b65789e74ad255e06b950f67718b67bac9233dba URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b65789e74ad255e06b950f6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 12 19:36:12 2021 -0500 vkd3d-shader/hlsl: Use a designated initializer in debug_expr_op(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 103 +++++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 57 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index e407057..9f50d2f 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1033,64 +1033,53 @@ static void dump_ir_constant(struct vkd3d_string_buffer *buffer, const struct hl static const char *debug_expr_op(const struct hlsl_ir_expr *expr) { - static const char * const op_names[] = + static const char *const op_names[] = { - "~", - "!", - "-", - "abs", - "sign", - "rcp", - "rsq", - "sqrt", - "nrm", - "exp2", - "log2", - - "cast", - - "fract", - - "sin", - "cos", - "sin_reduced", - "cos_reduced", - - "dsx", - "dsy", - - "sat", - - "+", - "*", - "/", - - "%", - - "<", - ">", - "<=", - ">=", - "==", - "!=", - - "&&", - "||", - - "<<", - ">>", - "&", - "|", - "^", - - "dot", - "crs", - "min", - "max", - - "pow", - - "lerp", + [HLSL_IR_UNOP_ABS] = "abs", + [HLSL_IR_UNOP_BIT_NOT] = "~", + [HLSL_IR_UNOP_CAST] = "cast", + [HLSL_IR_UNOP_COS] = "cos", + [HLSL_IR_UNOP_COS_REDUCED] = "cos_reduced", + [HLSL_IR_UNOP_DSX] = "dsx", + [HLSL_IR_UNOP_DSY] = "dsy", + [HLSL_IR_UNOP_EXP2] = "exp2", + [HLSL_IR_UNOP_FRACT] = "fract", + [HLSL_IR_UNOP_LOG2] = "log2", + [HLSL_IR_UNOP_LOGIC_NOT] = "!", + [HLSL_IR_UNOP_NEG] = "-", + [HLSL_IR_UNOP_NRM] = "nrm", + [HLSL_IR_UNOP_RCP] = "rcp", + [HLSL_IR_UNOP_RSQ] = "rsq", + [HLSL_IR_UNOP_SAT] = "sat", + [HLSL_IR_UNOP_SIGN] = "sign", + [HLSL_IR_UNOP_SIN] = "sin", + [HLSL_IR_UNOP_SIN_REDUCED] = "sin_reduced", + [HLSL_IR_UNOP_SQRT] = "sqrt", + + [HLSL_IR_BINOP_ADD] = "+", + [HLSL_IR_BINOP_BIT_AND] = "&", + [HLSL_IR_BINOP_BIT_OR] = "|", + [HLSL_IR_BINOP_BIT_XOR] = "^", + [HLSL_IR_BINOP_CRS] = "crs", + [HLSL_IR_BINOP_DIV] = "/", + [HLSL_IR_BINOP_DOT] = "dot", + [HLSL_IR_BINOP_EQUAL] = "==", + [HLSL_IR_BINOP_GEQUAL] = ">=", + [HLSL_IR_BINOP_GREATER] = ">", + [HLSL_IR_BINOP_LEQUAL] = "<=", + [HLSL_IR_BINOP_LESS] = "<", + [HLSL_IR_BINOP_LOGIC_AND] = "&&", + [HLSL_IR_BINOP_LOGIC_OR] = "||", + [HLSL_IR_BINOP_LSHIFT] = "<<", + [HLSL_IR_BINOP_MAX] = "max", + [HLSL_IR_BINOP_MIN] = "min", + [HLSL_IR_BINOP_MOD] = "%", + [HLSL_IR_BINOP_MUL] = "*", + [HLSL_IR_BINOP_NEQUAL] = "!=", + [HLSL_IR_BINOP_POW] = "pow", + [HLSL_IR_BINOP_RSHIFT] = ">>", + + [HLSL_IR_TEROP_LERP] = "lerp", }; return op_names[expr->op];

1 0

Zebediah Figura : vkd3d-shader/hlsl: Rename hlsl_ir_expr_op members.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: vkd3d Branch: master Commit: 7960f9e37382a06c7d1e00b99c38916b85b53a9e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7960f9e37382a06c7d1e00b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 12 19:36:13 2021 -0500 vkd3d-shader/hlsl: Rename hlsl_ir_expr_op members. For the sake of simplicity and clarity, especially in the interest of allowing us to have expressions with larger numbers of terms. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 92 +++++++++++++++++------------------ libs/vkd3d-shader/hlsl.h | 101 +++++++++++++++++---------------------- libs/vkd3d-shader/hlsl.y | 55 +++++++++++---------- libs/vkd3d-shader/hlsl_codegen.c | 20 ++++---- libs/vkd3d-shader/hlsl_sm1.c | 20 ++++---- 5 files changed, 138 insertions(+), 150 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=7960f9e37382a06c7d1…

1 0

Zebediah Figura : vkd3d-shader/hlsl: Split array copies.
by Alexandre Julliard 16 Aug '21

16 Aug '21

Module: vkd3d Branch: master Commit: 3cc6b565cede6d4063bc7380f4c77da3bc8e7b48 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3cc6b565cede6d4063bc738… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 12 19:36:14 2021 -0500 vkd3d-shader/hlsl: Split array copies. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 119 +++++++++++++++++++++++++++------------ 1 file changed, 83 insertions(+), 36 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 5f23f34..db340a7 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -264,12 +264,54 @@ static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *inst return false; } -static bool split_struct_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +/* Helper for split_array_copies() and split_struct_copies(). Inserts new + * instructions right before "store". */ +static bool split_copy(struct hlsl_ctx *ctx, struct hlsl_ir_store *store, + const struct hlsl_ir_load *load, const unsigned int offset, struct hlsl_type *type) +{ + struct hlsl_ir_node *offset_instr, *add; + struct hlsl_ir_store *split_store; + struct hlsl_ir_load *split_load; + struct hlsl_ir_constant *c; + + if (!(c = hlsl_new_uint_constant(ctx, offset, store->node.loc))) + return false; + list_add_before(&store->node.entry, &c->node.entry); + + offset_instr = &c->node; + if (load->src.offset.node) + { + if (!(add = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, load->src.offset.node, &c->node))) + return false; + list_add_before(&store->node.entry, &add->entry); + offset_instr = add; + } + if (!(split_load = hlsl_new_load(ctx, load->src.var, offset_instr, type, store->node.loc))) + return false; + list_add_before(&store->node.entry, &split_load->node.entry); + + offset_instr = &c->node; + if (store->lhs.offset.node) + { + if (!(add = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, store->lhs.offset.node, &c->node))) + return false; + list_add_before(&store->node.entry, &add->entry); + offset_instr = add; + } + + if (!(split_store = hlsl_new_store(ctx, store->lhs.var, offset_instr, &split_load->node, 0, store->node.loc))) + return false; + list_add_before(&store->node.entry, &split_store->node.entry); + + return true; +} + +static bool split_array_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { - const struct hlsl_struct_field *field; - const struct hlsl_ir_load *rhs_load; const struct hlsl_ir_node *rhs; + struct hlsl_type *element_type; const struct hlsl_type *type; + unsigned int element_size, i; struct hlsl_ir_store *store; if (instr->type != HLSL_IR_STORE) @@ -278,46 +320,45 @@ static bool split_struct_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr store = hlsl_ir_store(instr); rhs = store->rhs.node; type = rhs->data_type; - if (type->type != HLSL_CLASS_STRUCT) + if (type->type != HLSL_CLASS_ARRAY) return false; + element_type = type->e.array.type; + element_size = element_type->reg_size; - rhs_load = hlsl_ir_load(rhs); - - LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) + for (i = 0; i < type->e.array.elements_count; ++i) { - struct hlsl_ir_store *field_store; - struct hlsl_ir_node *offset, *add; - struct hlsl_ir_load *field_load; - struct hlsl_ir_constant *c; - - if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, instr->loc))) + if (!split_copy(ctx, store, hlsl_ir_load(rhs), i * element_size, element_type)) return false; - list_add_before(&instr->entry, &c->node.entry); + } - offset = &c->node; - if (rhs_load->src.offset.node) - { - if (!(add = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, rhs_load->src.offset.node, &c->node))) - return false; - list_add_before(&instr->entry, &add->entry); - offset = add; - } - if (!(field_load = hlsl_new_load(ctx, rhs_load->src.var, offset, field->type, instr->loc))) - return false; - list_add_before(&instr->entry, &field_load->node.entry); + /* Remove the store instruction, so that we can split structs which contain + * other structs. Although assignments produce a value, we don't allow + * HLSL_IR_STORE to be used as a source. */ + list_remove(&store->node.entry); + hlsl_free_instr(&store->node); + return true; +} - offset = &c->node; - if (store->lhs.offset.node) - { - if (!(add = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, store->lhs.offset.node, &c->node))) - return false; - list_add_before(&instr->entry, &add->entry); - offset = add; - } +static bool split_struct_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + const struct hlsl_struct_field *field; + const struct hlsl_ir_node *rhs; + const struct hlsl_type *type; + struct hlsl_ir_store *store; - if (!(field_store = hlsl_new_store(ctx, store->lhs.var, offset, &field_load->node, 0, instr->loc))) + if (instr->type != HLSL_IR_STORE) + return false; + + store = hlsl_ir_store(instr); + rhs = store->rhs.node; + type = rhs->data_type; + if (type->type != HLSL_CLASS_STRUCT) + return false; + + LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) + { + if (!split_copy(ctx, store, hlsl_ir_load(rhs), field->reg_offset, field->type)) return false; - list_add_before(&instr->entry, &field_store->node.entry); } /* Remove the store instruction, so that we can split structs which contain @@ -1151,6 +1192,7 @@ struct hlsl_reg hlsl_reg_from_deref(const struct hlsl_deref *deref, const struct int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out) { struct hlsl_ir_var *var; + bool progress; list_move_head(entry_func->body, &ctx->static_initializers); @@ -1197,7 +1239,12 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun } while (transform_ir(ctx, fold_redundant_casts, entry_func->body, NULL)); - while (transform_ir(ctx, split_struct_copies, entry_func->body, NULL)); + do + { + progress = transform_ir(ctx, split_array_copies, entry_func->body, NULL); + progress |= transform_ir(ctx, split_struct_copies, entry_func->body, NULL); + } + while (progress); while (transform_ir(ctx, fold_constants, entry_func->body, NULL)); if (ctx->profile->major_version < 4)

1 0