winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
March 2021
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
1163 discussions
Start a n
N
ew thread
Alexandre Julliard : inseng: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard
02 Mar '21
02 Mar '21
Module: wine Branch: master Commit: 57e79a632e6b8d59bb629816b2ae13f818dba924 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=57e79a632e6b8d59bb629816…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:54:32 2021 +0100 inseng: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inseng/Makefile.in | 2 +- dlls/inseng/inseng_main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/inseng/Makefile.in b/dlls/inseng/Makefile.in index 797a0d2b46f..d3f29328f67 100644 --- a/dlls/inseng/Makefile.in +++ b/dlls/inseng/Makefile.in @@ -1,7 +1,7 @@ MODULE = inseng.dll IMPORTS = uuid ole32 advapi32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = inseng_main.c diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c index 631a9364e39..c9a5988478c 100644 --- a/dlls/inseng/inseng_main.c +++ b/dlls/inseng/inseng_main.c @@ -362,8 +362,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { switch(fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL);
1
0
0
0
Alexandre Julliard : infosoft: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard
02 Mar '21
02 Mar '21
Module: wine Branch: master Commit: e00035f982db5d0fe35162dc0538acbf1c210490 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=e00035f982db5d0fe35162dc…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:54:25 2021 +0100 infosoft: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/infosoft/Makefile.in | 2 +- dlls/infosoft/infosoft_main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/infosoft/Makefile.in b/dlls/infosoft/Makefile.in index 813e65d8376..485b0b69341 100644 --- a/dlls/infosoft/Makefile.in +++ b/dlls/infosoft/Makefile.in @@ -1,7 +1,7 @@ MODULE = infosoft.dll IMPORTS = uuid advapi32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ infosoft_main.c \ diff --git a/dlls/infosoft/infosoft_main.c b/dlls/infosoft/infosoft_main.c index 1d93b4923bd..d12f6520cce 100644 --- a/dlls/infosoft/infosoft_main.c +++ b/dlls/infosoft/infosoft_main.c @@ -43,8 +43,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { switch(fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL);
1
0
0
0
Alexandre Julliard : dx8vb: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard
02 Mar '21
02 Mar '21
Module: wine Branch: master Commit: 095b40f40c1b4c14541764099eac17eb34305228 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=095b40f40c1b4c1454176409…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:54:18 2021 +0100 dx8vb: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dx8vb/Makefile.in | 2 +- dlls/dx8vb/main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/dx8vb/Makefile.in b/dlls/dx8vb/Makefile.in index 727265c6983..184d2a3c367 100644 --- a/dlls/dx8vb/Makefile.in +++ b/dlls/dx8vb/Makefile.in @@ -1,7 +1,7 @@ MODULE = dx8vb.dll IMPORTS = uuid ole32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/dx8vb/main.c b/dlls/dx8vb/main.c index 7dbe47d25af..4784c84e203 100644 --- a/dlls/dx8vb/main.c +++ b/dlls/dx8vb/main.c @@ -44,8 +44,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(instance); instance_dx8vb = instance;
1
0
0
0
Alexandre Julliard : dsdmo: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard
02 Mar '21
02 Mar '21
Module: wine Branch: master Commit: fe60d1cfdee27b415994404220526037dfef7e32 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=fe60d1cfdee27b4159944042…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:54:13 2021 +0100 dsdmo: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsdmo/Makefile.in | 2 +- dlls/dsdmo/main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/dsdmo/Makefile.in b/dlls/dsdmo/Makefile.in index d86dbbd804a..d6702984785 100644 --- a/dlls/dsdmo/Makefile.in +++ b/dlls/dsdmo/Makefile.in @@ -1,7 +1,7 @@ MODULE = dsdmo.dll IMPORTS = dmoguids strmiids uuid -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index 57214b32752..c6fc30dc2c4 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -803,8 +803,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { switch(reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: dsdmo_instance = instance; DisableThreadLibraryCalls(dsdmo_instance);
1
0
0
0
Alexandre Julliard : dpvoice: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard
02 Mar '21
02 Mar '21
Module: wine Branch: master Commit: 15da5be4664bcfbed8d7fb07d6e5d653ed62b684 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=15da5be4664bcfbed8d7fb07…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:54:07 2021 +0100 dpvoice: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpvoice/Makefile.in | 2 +- dlls/dpvoice/main.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/dpvoice/Makefile.in b/dlls/dpvoice/Makefile.in index 38e934dda16..872080fa310 100644 --- a/dlls/dpvoice/Makefile.in +++ b/dlls/dpvoice/Makefile.in @@ -1,7 +1,7 @@ MODULE = dpvoice.dll IMPORTS = dxguid uuid -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ client.c \ diff --git a/dlls/dpvoice/main.c b/dlls/dpvoice/main.c index 73441a80e05..66d67586276 100644 --- a/dlls/dpvoice/main.c +++ b/dlls/dpvoice/main.c @@ -109,13 +109,10 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - DPVOICE_hInstance = hinstDLL; - switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: + DPVOICE_hInstance = hinstDLL; DisableThreadLibraryCalls(hinstDLL); break; default:
1
0
0
0
Alexandre Julliard : directmanipulation: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard
02 Mar '21
02 Mar '21
Module: wine Branch: master Commit: 79aa19c10d5054ad3c94c8ec691890991515b57c URL:
https://source.winehq.org/git/wine.git/?a=commit;h=79aa19c10d5054ad3c94c8ec…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:54:01 2021 +0100 directmanipulation: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/directmanipulation/Makefile.in | 2 +- dlls/directmanipulation/directmanipulation.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/directmanipulation/Makefile.in b/dlls/directmanipulation/Makefile.in index d67a21eb779..258d3c67177 100644 --- a/dlls/directmanipulation/Makefile.in +++ b/dlls/directmanipulation/Makefile.in @@ -1,7 +1,7 @@ MODULE = directmanipulation.dll IMPORTS = uuid -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native IDL_SRCS = directmanip.idl diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c index 5bb3461d443..5db998ee9c8 100644 --- a/dlls/directmanipulation/directmanipulation.c +++ b/dlls/directmanipulation/directmanipulation.c @@ -38,8 +38,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: dm_instance = instance; DisableThreadLibraryCalls(instance);
1
0
0
0
Alexandre Julliard : comsvcs: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard
02 Mar '21
02 Mar '21
Module: wine Branch: master Commit: 0ed2adf60f87e9c698759a915b16aeceef945acc URL:
https://source.winehq.org/git/wine.git/?a=commit;h=0ed2adf60f87e9c698759a91…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:53:55 2021 +0100 comsvcs: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/Makefile.in | 2 +- dlls/comsvcs/main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/comsvcs/Makefile.in b/dlls/comsvcs/Makefile.in index 7845400cb2e..54d4e6a9ded 100644 --- a/dlls/comsvcs/Makefile.in +++ b/dlls/comsvcs/Makefile.in @@ -2,7 +2,7 @@ MODULE = comsvcs.dll IMPORTLIB = comsvcs IMPORTS = ole32 uuid -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 74704077ecb..3023783bdf5 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -360,8 +360,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID lpv) { switch(reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: COMSVCS_hInstance = hinst; DisableThreadLibraryCalls(hinst);
1
0
0
0
Alexandre Julliard : adsldp: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard
02 Mar '21
02 Mar '21
Module: wine Branch: master Commit: 55ae768fdcdb9286adde36198d519c04ebab1273 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=55ae768fdcdb9286adde3619…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:53:33 2021 +0100 adsldp: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/Makefile.in | 2 +- dlls/adsldp/adsldp.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/adsldp/Makefile.in b/dlls/adsldp/Makefile.in index a99917a16ad..9420a8a92c9 100644 --- a/dlls/adsldp/Makefile.in +++ b/dlls/adsldp/Makefile.in @@ -2,7 +2,7 @@ MODULE = adsldp.dll IMPORTS = ole32 oleaut32 secur32 activeds uuid DELAYIMPORTS = netapi32 wldap32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ adsldp.c \ diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 13bd73c1296..63f800b5061 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -2135,9 +2135,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: adsldp_hinst = hinst; DisableThreadLibraryCalls(hinst);
1
0
0
0
Zebediah Figura : vkd3d-shader: Factor out hlsl_new_loop().
by Alexandre Julliard
02 Mar '21
02 Mar '21
Module: vkd3d Branch: master Commit: 0f4d62b09d424f9233ec58c6e2fd078611fcaa30 URL:
https://source.winehq.org/git/vkd3d.git/?a=commit;h=0f4d62b09d424f9233ec58c…
Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Feb 27 18:03:14 2021 -0600 vkd3d-shader: Factor out hlsl_new_loop(). 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 | 11 +++++++++++ libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 4 +--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 1b388d5..4e73060 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -510,6 +510,17 @@ struct hlsl_ir_jump *hlsl_new_jump(enum hlsl_ir_jump_type type, struct vkd3d_sha return jump; } +struct hlsl_ir_loop *hlsl_new_loop(struct vkd3d_shader_location loc) +{ + struct hlsl_ir_loop *loop; + + if (!(loop = vkd3d_calloc(1, sizeof(*loop)))) + return NULL; + init_node(&loop->node, HLSL_IR_LOOP, NULL, loc); + list_init(&loop->body); + return loop; +} + bool hlsl_type_is_void(const struct hlsl_type *type) { return type->type == HLSL_CLASS_OBJECT && type->base_type == HLSL_TYPE_VOID; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index c3b5d56..36e7dd0 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -530,6 +530,7 @@ struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hl struct list *parameters, const char *semantic, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_if *hlsl_new_if(struct hlsl_ir_node *condition, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_jump *hlsl_new_jump(enum hlsl_ir_jump_type type, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; +struct hlsl_ir_loop *hlsl_new_loop(struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_assignment *hlsl_new_simple_assignment(struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs) DECLSPEC_HIDDEN; struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, struct list *fields) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 45b9742..1341de1 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -403,11 +403,9 @@ static struct list *create_loop(enum loop_type type, struct list *init, struct l if (init) list_move_head(list, init); - if (!(loop = vkd3d_calloc(1, sizeof(*loop)))) + if (!(loop = hlsl_new_loop(loc))) goto oom; - init_node(&loop->node, HLSL_IR_LOOP, NULL, loc); list_add_tail(list, &loop->node.entry); - list_init(&loop->body); if (!append_conditional_break(cond)) goto oom;
1
0
0
0
Zebediah Figura : vkd3d-shader: Factor out hlsl_new_jump().
by Alexandre Julliard
02 Mar '21
02 Mar '21
Module: vkd3d Branch: master Commit: ccd67dcf37ba6415240541c39a9a2bc2576f5529 URL:
https://source.winehq.org/git/vkd3d.git/?a=commit;h=ccd67dcf37ba6415240541c…
Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Feb 27 18:03:13 2021 -0600 vkd3d-shader: Factor out hlsl_new_jump(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 11 +++++++++++ libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 8 ++------ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 1d76777..1b388d5 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -499,6 +499,17 @@ struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned return swizzle; } +struct hlsl_ir_jump *hlsl_new_jump(enum hlsl_ir_jump_type type, struct vkd3d_shader_location loc) +{ + struct hlsl_ir_jump *jump; + + if (!(jump = vkd3d_malloc(sizeof(*jump)))) + return NULL; + init_node(&jump->node, HLSL_IR_JUMP, NULL, loc); + jump->type = type; + return jump; +} + bool hlsl_type_is_void(const struct hlsl_type *type) { return type->type == HLSL_CLASS_OBJECT && type->base_type == HLSL_TYPE_VOID; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 8107b26..c3b5d56 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -529,6 +529,7 @@ struct hlsl_ir_expr *hlsl_new_cast(struct hlsl_ir_node *node, struct hlsl_type * struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hlsl_type *return_type, struct list *parameters, const char *semantic, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_if *hlsl_new_if(struct hlsl_ir_node *condition, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; +struct hlsl_ir_jump *hlsl_new_jump(enum hlsl_ir_jump_type type, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_assignment *hlsl_new_simple_assignment(struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs) DECLSPEC_HIDDEN; struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, struct list *fields) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 5ad50b0..45b9742 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -377,10 +377,8 @@ static bool append_conditional_break(struct list *cond_list) return false; list_add_tail(cond_list, &iff->node.entry); - if (!(jump = vkd3d_malloc(sizeof(*jump)))) + if (!(jump = hlsl_new_jump(HLSL_IR_JUMP_BREAK, condition->loc))) return false; - init_node(&jump->node, HLSL_IR_JUMP, NULL, condition->loc); - jump->type = HLSL_IR_JUMP_BREAK; list_add_head(&iff->then_instrs, &jump->node.entry); return true; } @@ -563,10 +561,8 @@ static struct hlsl_ir_jump *add_return(struct hlsl_ctx *ctx, struct list *instrs return NULL; } - if (!(jump = vkd3d_malloc(sizeof(*jump)))) + if (!(jump = hlsl_new_jump(HLSL_IR_JUMP_RETURN, loc))) return NULL; - init_node(&jump->node, HLSL_IR_JUMP, NULL, loc); - jump->type = HLSL_IR_JUMP_RETURN; list_add_tail(instrs, &jump->node.entry); return jump;
1
0
0
0
← Newer
1
...
107
108
109
110
111
112
113
...
117
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
Results per page:
10
25
50
100
200