wine-commits July 2018

wine-commits@winehq.org

2 participants
405 discussions

Michael Müller : ole32: Support reading VT_BOOL, VT_R8 and VT_I8 into propery storage.
by Alexandre Julliard 18 Jul '18

18 Jul '18

Module: wine Branch: master Commit: b7f3e26e897838055644fa897e98dcb35a16b8fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7f3e26e897838055644fa89… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Jul 16 20:18:15 2018 -0600 ole32: Support reading VT_BOOL, VT_R8 and VT_I8 into propery storage. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index a259883..0213f31 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1063,6 +1063,10 @@ static HRESULT PropertyStorage_ReadProperty(PROPVARIANT *prop, const BYTE *data, prop->u.bVal = *data; TRACE("Read byte 0x%x\n", prop->u.bVal); break; + case VT_BOOL: + StorageUtl_ReadWord(data, 0, (WORD*)&prop->u.boolVal); + TRACE("Read bool %d\n", prop->u.boolVal); + break; case VT_I2: StorageUtl_ReadWord(data, 0, (WORD*)&prop->u.iVal); TRACE("Read short %d\n", prop->u.iVal); @@ -1081,6 +1085,18 @@ static HRESULT PropertyStorage_ReadProperty(PROPVARIANT *prop, const BYTE *data, StorageUtl_ReadDWord(data, 0, &prop->u.ulVal); TRACE("Read ulong %d\n", prop->u.ulVal); break; + case VT_I8: + StorageUtl_ReadULargeInteger(data, 0, (ULARGE_INTEGER *)&prop->u.hVal); + TRACE("Read long long %s\n", wine_dbgstr_longlong(prop->u.hVal.QuadPart)); + break; + case VT_UI8: + StorageUtl_ReadULargeInteger(data, 0, &prop->u.uhVal); + TRACE("Read ulong long %s\n", wine_dbgstr_longlong(prop->u.uhVal.QuadPart)); + break; + case VT_R8: + memcpy(&prop->u.dblVal, data, sizeof(double)); + TRACE("Read double %f\n", prop->u.dblVal); + break; case VT_LPSTR: { DWORD count;

1 0

Alexandre Julliard : user32: Make the MonitorFromRect() argument const.
by Alexandre Julliard 18 Jul '18

18 Jul '18

Module: wine Branch: master Commit: a36abda77377aba16b0039e1738f4155aa5e9d07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a36abda77377aba16b0039e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 18 14:11:32 2018 +0200 user32: Make the MonitorFromRect() argument const. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 2 +- include/winuser.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index c92d9af..149b483 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3481,7 +3481,7 @@ static BOOL CALLBACK monitor_enum( HMONITOR monitor, HDC hdc, LPRECT rect, LPARA /*********************************************************************** * MonitorFromRect (USER32.@) */ -HMONITOR WINAPI MonitorFromRect( LPRECT rect, DWORD flags ) +HMONITOR WINAPI MonitorFromRect( const RECT *rect, DWORD flags ) { struct monitor_enum_info info; diff --git a/include/winuser.h b/include/winuser.h index a653ef4..8489d05 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3981,7 +3981,7 @@ WINUSERAPI BOOL WINAPI ModifyMenuA(HMENU,UINT,UINT,UINT_PTR,LPCSTR); WINUSERAPI BOOL WINAPI ModifyMenuW(HMENU,UINT,UINT,UINT_PTR,LPCWSTR); #define ModifyMenu WINELIB_NAME_AW(ModifyMenu) WINUSERAPI HMONITOR WINAPI MonitorFromPoint(POINT,DWORD); -WINUSERAPI HMONITOR WINAPI MonitorFromRect(LPRECT,DWORD); +WINUSERAPI HMONITOR WINAPI MonitorFromRect(const RECT*,DWORD); WINUSERAPI HMONITOR WINAPI MonitorFromWindow(HWND,DWORD); WINUSERAPI BOOL WINAPI MoveWindow(HWND,INT,INT,INT,INT,BOOL); WINUSERAPI DWORD WINAPI MsgWaitForMultipleObjects(DWORD,const HANDLE*,BOOL,DWORD,DWORD);

1 0

Alexandre Julliard : user32: Fetch client and window rectangles in a single call.
by Alexandre Julliard 18 Jul '18

18 Jul '18

Module: wine Branch: master Commit: 3735f36dc94ca68a9344520ac28b2f7d548b0b82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3735f36dc94ca68a9344520a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 18 10:09:55 2018 +0200 user32: Fetch client and window rectangles in a single call. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 665e1c0..66e69f4 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -652,12 +652,12 @@ static HRGN send_ncpaint( HWND hwnd, HWND *child, UINT *flags ) if (whole_rgn) { - RECT client, update; + RECT client, window, update; INT type; /* check if update rgn overlaps with nonclient area */ type = GetRgnBox( whole_rgn, &update ); - WIN_GetRectangles( hwnd, COORDS_SCREEN, 0, &client ); + WIN_GetRectangles( hwnd, COORDS_SCREEN, &window, &client ); if ((*flags & UPDATE_NONCLIENT) || update.left < client.left || update.top < client.top || @@ -667,15 +667,10 @@ static HRGN send_ncpaint( HWND hwnd, HWND *child, UINT *flags ) CombineRgn( client_rgn, client_rgn, whole_rgn, RGN_AND ); /* check if update rgn contains complete nonclient area */ - if (type == SIMPLEREGION) + if (type == SIMPLEREGION && EqualRect( &window, &update )) { - RECT window; - GetWindowRect( hwnd, &window ); - if (EqualRect( &window, &update )) - { - DeleteObject( whole_rgn ); - whole_rgn = (HRGN)1; - } + DeleteObject( whole_rgn ); + whole_rgn = (HRGN)1; } } else

1 0

Michael Stefaniuc : dswave: Reimplement ParseDescriptor() for DirectSoundWave.
by Alexandre Julliard 18 Jul '18

18 Jul '18

Module: wine Branch: master Commit: 27dc1d05d79ccb51330225bae2351c39f83ff174 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27dc1d05d79ccb51330225ba… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jul 17 23:55:33 2018 +0200 dswave: Reimplement ParseDescriptor() for DirectSoundWave. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dswave/dswave.c | 167 +++++++-------------------------------------- dlls/dswave/tests/dswave.c | 28 +++++--- 2 files changed, 42 insertions(+), 153 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=27dc1d05d79ccb513302…

1 0

Józef Kucia : d3d10core/tests: Add more tests for multisample resolve.
by Alexandre Julliard 18 Jul '18

18 Jul '18

Module: wine Branch: master Commit: 158fa85b8f13d90ac05e675643eb79119671a2e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=158fa85b8f13d90ac05e6756… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 17 11:02:38 2018 +0200 d3d10core/tests: Add more tests for multisample resolve. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 8fba7a3..f3c3d86 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -16899,6 +16899,47 @@ static void test_multisample_resolve(void) DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, &color, 0xffbf7f40, TRUE}, + + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM, + &color, 0xffbf7f40, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &color, 0xffe1bc89, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &color, 0xffe1bc89, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM, + &color, 0xffbf7f40, TRUE}, }; if (!init_test_context(&test_context))

1 0

Jeremy Newman : update generate_passwd to be stronger
by Jeremy Newman 18 Jul '18

18 Jul '18

Module: appdb Branch: master Commit: ca2c14ebead2840510103198f53216a5e3616208 URL: https://source.winehq.org/git/appdb.git/?a=commit;h=ca2c14ebead284051010319… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Jul 18 13:12:38 2018 -0500 update generate_passwd to be stronger mt_rand in PHP is not considered to be cryptographically stong use openssl_random_pseudo_bytes instead --- include/user.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/user.php b/include/user.php index 5a4b428..6626b0e 100644 --- a/include/user.php +++ b/include/user.php @@ -417,16 +417,16 @@ class User { /** * Creates a new random password. */ - public static function generate_passwd($pass_len = 10) + public static function generate_passwd($pass_len = 20) { - $nps = ""; - mt_srand ((double) microtime() * 1000000); - while (strlen($nps)<$pass_len) - { - $c = chr(mt_rand (0,255)); - if (preg_match("/[a-zA-Z0-9]/", $c)) $nps = $nps.$c; + $alphanum = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; + $alphanum_length = strlen($alphanum); + $random = openssl_random_pseudo_bytes($pass_len); + $passwd = ''; + for ($i = 0; $i < $pass_len; ++$i) { + $passwd .= $alphanum[ord($random[$i]) % $alphanum_length]; } - return ($nps); + return $passwd; } /**

1 0

Francois Gouget : testbot/Janitor: Only compute the latest file ages when needed.
by Alexandre Julliard 18 Jul '18

18 Jul '18

Module: tools Branch: master Commit: 381d88c6b01512b40dc04400d9fc475adc955732 URL: https://source.winehq.org/git/tools.git/?a=commit;h=381d88c6b01512b40dc0440… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 18 17:32:25 2018 +0200 testbot/Janitor: Only compute the latest file ages when needed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index a9cdd52..18bbc3d 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -310,9 +310,6 @@ if (opendir(my $dh, "$DataDir/latest")) foreach my $Entry (@Entries) { next if ($Entry eq "." or $Entry eq ".."); - $Entry =~ m%^([^/]+)$%; - my $FileName = "$DataDir/latest/$1"; - my $Age = int((-M $FileName) + 0.5); if ($Entry =~ /^(.*)_[a-z0-9]+\.(?:err|log)$/) { @@ -329,6 +326,9 @@ if (opendir(my $dh, "$DataDir/latest")) Trace "Found a suspicious latest file: $Entry\n"; if ($JobPurgeDays != 0) { + $Entry =~ m%^([^/]+)$%; # untaint + my $FileName = "$DataDir/latest/$1"; + my $Age = int((-M $FileName) + 0.5); if ($Age >= $JobPurgeDays + 7) { DeletePath($FileName);

1 0

Francois Gouget : testbot/WineSendLog: Remove a couple of redundant lines.
by Alexandre Julliard 18 Jul '18

18 Jul '18

Module: tools Branch: master Commit: eb2dfc6b26d4895a35315fbc500aea46a9a3479b URL: https://source.winehq.org/git/tools.git/?a=commit;h=eb2dfc6b26d4895a35315fb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 18 17:32:09 2018 +0200 testbot/WineSendLog: Remove a couple of redundant lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 51830ad..f1cb74e 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -475,8 +475,6 @@ EOF # Filter out failures that happened in the full test suite: # the test suite is run against code which is already in Wine # so any failure it reported is not caused by this patch. - my $LogFiles = GetLogFileNames($TaskDir); - my $LogName = $LogFiles->[0] || "log"; $MessagesFromLog = CompareLogs("$LatestName.log", "$TaskDir/$LogName", $BaseName, $StepTask->CmdLineArg); }

1 0

Józef Kucia : include: Add missing D3D_PRIMITIVE_TOPOLOGY enum values.
by Alexandre Julliard 18 Jul '18

18 Jul '18

Module: vkd3d Branch: master Commit: 8d9d910374d36f31272a34a9c568eb27a6c33f66 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8d9d910374d36f31272a34a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 18 12:05:47 2018 +0200 include: Add missing D3D_PRIMITIVE_TOPOLOGY enum values. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3dcommon.idl | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/include/vkd3d_d3dcommon.idl b/include/vkd3d_d3dcommon.idl index a874b6c..8bfa567 100644 --- a/include/vkd3d_d3dcommon.idl +++ b/include/vkd3d_d3dcommon.idl @@ -28,6 +28,42 @@ typedef enum D3D_PRIMITIVE_TOPOLOGY D3D_PRIMITIVE_TOPOLOGY_LINESTRIP = 3, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST = 4, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP = 5, + D3D_PRIMITIVE_TOPOLOGY_LINELIST_ADJ = 10, + D3D_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ = 11, + D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ = 12, + D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ = 13, + D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST = 33, + D3D_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST, } D3D_PRIMITIVE_TOPOLOGY; typedef enum D3D_FEATURE_LEVEL

1 0

Józef Kucia : libs/vkd3d: Validate PrimitiveTopologyType for PSO with tessellation shaders.
by Alexandre Julliard 18 Jul '18

18 Jul '18

Module: vkd3d Branch: master Commit: b7d2278f5706737cfed34a3557827ace6be8e62c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b7d2278f5706737cfed34a3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 18 12:05:46 2018 +0200 libs/vkd3d: Validate PrimitiveTopologyType for PSO with tessellation shaders. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 861f5bb..973caee 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1969,22 +1969,43 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s if (shader_info.uav_counter_mask) FIXME("UAV counters not implemented for graphics pipelines.\n"); - if (shader_stages[i].stage == VK_SHADER_STAGE_FRAGMENT_BIT) - compile_args = &ps_compile_args; - else - compile_args = NULL; + compile_args = NULL; + switch (shader_stages[i].stage) + { + case VK_SHADER_STAGE_VERTEX_BIT: + if ((ret = vkd3d_shader_parse_input_signature(&dxbc, &input_signature)) < 0) + { + hr = hresult_from_vkd3d_result(ret); + goto fail; + } + break; + + case VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT: + case VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT: + if (desc->PrimitiveTopologyType != D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH) + { + WARN("D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH must be used with tessellation shaders.\n"); + hr = E_INVALIDARG; + goto fail; + } + break; + + case VK_SHADER_STAGE_GEOMETRY_BIT: + break; + + case VK_SHADER_STAGE_FRAGMENT_BIT: + compile_args = &ps_compile_args; + break; + + default: + hr = E_INVALIDARG; + goto fail; + } if (FAILED(hr = create_shader_stage(device, &graphics->stages[graphics->stage_count], shader_stages[i].stage, b, &shader_interface, compile_args))) goto fail; - if (shader_stages[i].stage == VK_SHADER_STAGE_VERTEX_BIT - && (ret = vkd3d_shader_parse_input_signature(&dxbc, &input_signature)) < 0) - { - hr = hresult_from_vkd3d_result(ret); - goto fail; - } - ++graphics->stage_count; }

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
41
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2018