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

Dmitry Kislyuk : vbscript: Support conversion to string in InStr.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: 626a38b570188e5c12c86ab628c9b1e576f25e62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=626a38b570188e5c12c86ab6… Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Tue Aug 4 12:14:52 2020 -0500 vbscript: Support conversion to string in InStr. Signed-off-by: Dmitry Kislyuk <dimaki(a)rocketmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 34 ++++++++++++++++++++++------------ dlls/vbscript/tests/api.vbs | 6 ++++++ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index e41c2ff7b3..abb4b7933b 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1624,7 +1624,7 @@ static HRESULT Global_InStr(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, { VARIANT *startv, *str1v, *str2v; BSTR str1, str2; - int ret, start = 0, mode = 0; + int ret = -1, start = 0, mode = 0; HRESULT hres; TRACE("args_cnt=%u\n", args_cnt); @@ -1673,23 +1673,33 @@ static HRESULT Global_InStr(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, return return_null(res); if(V_VT(str1v) != VT_BSTR) { - FIXME("Unsupported str1 type %s\n", debugstr_variant(str1v)); - return E_NOTIMPL; + hres = to_string(str1v, &str1); + if(FAILED(hres)) + return hres; } - str1 = V_BSTR(str1v); + else + str1 = V_BSTR(str1v); if(V_VT(str2v) != VT_BSTR) { - FIXME("Unsupported str2 type %s\n", debugstr_variant(str2v)); - return E_NOTIMPL; + hres = to_string(str2v, &str2); + if(FAILED(hres)){ + if(V_VT(str1v) != VT_BSTR) + SysFreeString(str1); + return hres; + } } - str2 = V_BSTR(str2v); - - if(start >= SysStringLen(str1)) - return return_int(res, 0); + else + str2 = V_BSTR(str2v); - ret = FindStringOrdinal(FIND_FROMSTART, str1 + start, SysStringLen(str1)-start, - str2, SysStringLen(str2), mode); + if(start < SysStringLen(str1)) { + ret = FindStringOrdinal(FIND_FROMSTART, str1 + start, SysStringLen(str1)-start, + str2, SysStringLen(str2), mode); + } + if(V_VT(str1v) != VT_BSTR) + SysFreeString(str1); + if(V_VT(str2v) != VT_BSTR) + SysFreeString(str2); return return_int(res, ++ret ? ret+start : 0); } diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 3f50195bdc..0c37c3c843 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -429,6 +429,12 @@ Call ok(x = 8, "InStr returned " & x) x = InStr(1, "abc" & Chr(0) & "ABC", Chr(0) & "a", 1) Call ok(x = 4, "InStr returned " & x) +x = InStr(1, 23456, 45, 0) +Call ok(x = 3, "InStr returned " & x) + +x = InStr(1, "23456", 34, 1) +Call ok(x = 2, "InStr returned " & x) + x = InStrRev("bcabcd", "bc") Call ok(x = 4, "InStrRev returned " & x)

1 0

Brendan Shanks : ntdll: Use unique handle numbers in generated SMBIOS tables.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: 0720c6cfd0b8c863fd22053c2ca750fd982d49d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0720c6cfd0b8c863fd22053c… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Aug 4 12:02:47 2020 -0700 ntdll: Use unique handle numbers in generated SMBIOS tables. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 3756bd7cee..de33d52ed2 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1257,6 +1257,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON size_t chassis_vendor_len, chassis_version_len, chassis_serial_len, chassis_asset_tag_len; char *buffer = (char*)sfti->TableBuffer; BYTE string_count; + BYTE handle_count = 0; struct smbios_prologue *prologue; struct smbios_bios *bios; struct smbios_system *system; @@ -1321,7 +1322,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON bios = (struct smbios_bios*)buffer; bios->hdr.type = 0; bios->hdr.length = sizeof(struct smbios_bios); - bios->hdr.handle = 0; + bios->hdr.handle = handle_count++; bios->vendor = bios_vendor_len ? ++string_count : 0; bios->version = bios_version_len ? ++string_count : 0; bios->start = 0; @@ -1346,7 +1347,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON system = (struct smbios_system*)buffer; system->hdr.type = 1; system->hdr.length = sizeof(struct smbios_system); - system->hdr.handle = 0; + system->hdr.handle = handle_count++; system->vendor = system_vendor_len ? ++string_count : 0; system->product = system_product_len ? ++string_count : 0; system->version = system_version_len ? ++string_count : 0; @@ -1370,7 +1371,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON board = (struct smbios_board*)buffer; board->hdr.type = 2; board->hdr.length = sizeof(struct smbios_board); - board->hdr.handle = 0; + board->hdr.handle = handle_count++; board->vendor = board_vendor_len ? ++string_count : 0; board->product = board_product_len ? ++string_count : 0; board->version = board_version_len ? ++string_count : 0; @@ -1388,7 +1389,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON chassis = (struct smbios_chassis*)buffer; chassis->hdr.type = 3; chassis->hdr.length = sizeof(struct smbios_chassis); - chassis->hdr.handle = 0; + chassis->hdr.handle = handle_count++; chassis->vendor = chassis_vendor_len ? ++string_count : 0; chassis->type = atoi(chassis_type); chassis->version = chassis_version_len ? ++string_count : 0;

1 0

Alistair Leslie-Hughes : xactengine3_7: Return valid HRESULT from IXACT3Engine Initialize.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: 47a5de3438a30dbcc5a729e3442103015b99be34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47a5de3438a30dbcc5a729e3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 4 11:30:33 2020 +1000 xactengine3_7: Return valid HRESULT from IXACT3Engine Initialize. FAudio doesn't always return a valid HRESULT, ensure a valid code is passed back to the application. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine3_7/xact_dll.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 3a14db7460..69570e8cef 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -157,6 +157,7 @@ static HRESULT WINAPI IXACT3EngineImpl_Initialize(IXACT3Engine *iface, { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); FACTRuntimeParameters params; + UINT ret; TRACE("(%p)->(%p)\n", This, pParams); @@ -195,7 +196,11 @@ static HRESULT WINAPI IXACT3EngineImpl_Initialize(IXACT3Engine *iface, params.fileIOCallbacks.readFileCallback = wrap_readfile; params.fileIOCallbacks.getOverlappedResultCallback = wrap_getoverlappedresult; - return FACTAudioEngine_Initialize(This->fact_engine, &params); + ret = FACTAudioEngine_Initialize(This->fact_engine, &params); + if (ret != 0) + WARN("FACTAudioEngine_Initialize returned %d\n", ret); + + return !ret ? S_OK : E_FAIL; } static HRESULT WINAPI IXACT3EngineImpl_ShutDown(IXACT3Engine *iface)

1 0

Piotr Caban : ucrtbase: Support overriding return value in _matherr.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: 2833a10ba1deb8e9c8b80991d04aad9676d17ad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2833a10ba1deb8e9c8b80991… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 4 15:16:49 2020 +0200 ucrtbase: Support overriding return value in _matherr. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 130 ++++++++++++++++++++++++--------------------- dlls/ucrtbase/tests/misc.c | 7 +++ 2 files changed, 76 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2833a10ba1deb8e9c8b8…

1 0

Piotr Caban : msvcrt: Import sqrtf from musl.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: bfc23bbd5fd169c73da57305c1453ab02368c0a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfc23bbd5fd169c73da57305… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 4 15:17:04 2020 +0200 msvcrt: Import sqrtf from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 77 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index f3cf633f25..bbb5a9194e 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -16,7 +16,19 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + * + * For functions copied from musl (http://www.musl-libc.org/) + * ==================================================== + * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. + * + * Developed at SunPro, a Sun Microsystems, Inc. business. + * Permission to use, copy, modify, and distribute this + * software is freely granted, provided that this notice + * is preserved. + * ==================================================== */ + #include "config.h" #include "wine/port.h" @@ -351,12 +363,74 @@ float CDECL MSVCRT_sinhf( float x ) /********************************************************************* * MSVCRT_sqrtf (MSVCRT.@) + * + * Copied from musl: src/math/sqrtf.c */ float CDECL MSVCRT_sqrtf( float x ) { - float ret = sqrtf(x); - if (x < 0.0) return math_error(_DOMAIN, "sqrtf", x, 0, ret); - return ret; + static const float tiny = 1.0e-30; + + float z; + int sign = 0x80000000; + int ix,s,q,m,t,i; + unsigned int r; + + ix = *(int*)&x; + + /* take care of Inf and NaN */ + if ((ix & 0x7f800000) == 0x7f800000 && (ix == 0x7f800000 || ix & 0x7fffff)) + return x; + + /* take care of zero */ + if (ix <= 0) { + if ((ix & ~sign) == 0) + return x; /* sqrt(+-0) = +-0 */ + return math_error(_DOMAIN, "sqrtf", x, 0, (x - x) / (x - x)); /* sqrt(-ve) = sNaN */ + } + /* normalize x */ + m = ix >> 23; + if (m == 0) { /* subnormal x */ + for (i = 0; (ix & 0x00800000) == 0; i++) + ix <<= 1; + m -= i - 1; + } + m -= 127; /* unbias exponent */ + ix = (ix & 0x007fffff) | 0x00800000; + if (m & 1) /* odd m, double x to make it even */ + ix += ix; + m >>= 1; /* m = [m/2] */ + + /* generate sqrt(x) bit by bit */ + ix += ix; + q = s = 0; /* q = sqrt(x) */ + r = 0x01000000; /* r = moving bit from right to left */ + + while (r != 0) { + t = s + r; + if (t <= ix) { + s = t + r; + ix -= t; + q += r; + } + ix += ix; + r >>= 1; + } + + /* use floating add to find out rounding direction */ + if (ix != 0) { + z = 1.0f - tiny; /* raise inexact flag */ + if (z >= 1.0f) { + z = 1.0f + tiny; + if (z > 1.0f) + q += 2; + else + q += q & 1; + } + } + ix = (q >> 1) + 0x3f000000; + r = ix + ((unsigned int)m << 23); + z = *(float*)&r; + return z; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Import sqrt from musl.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: wine Branch: master Commit: a6ae2b5c1101d37f06c4118a6e4045dca7dfdc65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6ae2b5c1101d37f06c4118a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 4 15:17:33 2020 +0200 msvcrt: Import sqrt from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 108 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index bbb5a9194e..59b6a98487 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -645,12 +645,117 @@ double CDECL MSVCRT_sinh( double x ) /********************************************************************* * MSVCRT_sqrt (MSVCRT.@) + * + * Copied from musl: src/math/sqrt.c */ double CDECL MSVCRT_sqrt( double x ) { - double ret = sqrt(x); - if (x < 0.0) return math_error(_DOMAIN, "sqrt", x, 0, ret); - return ret; + static const double tiny = 1.0e-300; + + double z; + int sign = 0x80000000; + int ix0,s0,q,m,t,i; + unsigned int r,t1,s1,ix1,q1; + ULONGLONG ix; + + ix = *(ULONGLONG*)&x; + ix0 = ix >> 32; + ix1 = ix; + + /* take care of Inf and NaN */ + if (isnan(x) || (isinf(x) && x > 0)) + return x; + + /* take care of zero */ + if (ix0 <= 0) { + if (((ix0 & ~sign) | ix1) == 0) + return x; /* sqrt(+-0) = +-0 */ + if (ix0 < 0) + return math_error(_DOMAIN, "sqrt", x, 0, (x - x) / (x - x)); + } + /* normalize x */ + m = ix0 >> 20; + if (m == 0) { /* subnormal x */ + while (ix0 == 0) { + m -= 21; + ix0 |= (ix1 >> 11); + ix1 <<= 21; + } + for (i=0; (ix0 & 0x00100000) == 0; i++) + ix0 <<= 1; + m -= i - 1; + ix0 |= ix1 >> (32 - i); + ix1 <<= i; + } + m -= 1023; /* unbias exponent */ + ix0 = (ix0 & 0x000fffff) | 0x00100000; + if (m & 1) { /* odd m, double x to make it even */ + ix0 += ix0 + ((ix1 & sign) >> 31); + ix1 += ix1; + } + m >>= 1; /* m = [m/2] */ + + /* generate sqrt(x) bit by bit */ + ix0 += ix0 + ((ix1 & sign) >> 31); + ix1 += ix1; + q = q1 = s0 = s1 = 0; /* [q,q1] = sqrt(x) */ + r = 0x00200000; /* r = moving bit from right to left */ + + while (r != 0) { + t = s0 + r; + if (t <= ix0) { + s0 = t + r; + ix0 -= t; + q += r; + } + ix0 += ix0 + ((ix1 & sign) >> 31); + ix1 += ix1; + r >>= 1; + } + + r = sign; + while (r != 0) { + t1 = s1 + r; + t = s0; + if (t < ix0 || (t == ix0 && t1 <= ix1)) { + s1 = t1 + r; + if ((t1&sign) == sign && (s1 & sign) == 0) + s0++; + ix0 -= t; + if (ix1 < t1) + ix0--; + ix1 -= t1; + q1 += r; + } + ix0 += ix0 + ((ix1 & sign) >> 31); + ix1 += ix1; + r >>= 1; + } + + /* use floating add to find out rounding direction */ + if ((ix0 | ix1) != 0) { + z = 1.0 - tiny; /* raise inexact flag */ + if (z >= 1.0) { + z = 1.0 + tiny; + if (q1 == (unsigned int)0xffffffff) { + q1 = 0; + q++; + } else if (z > 1.0) { + if (q1 == (unsigned int)0xfffffffe) + q++; + q1 += 2; + } else + q1 += q1 & 1; + } + } + ix0 = (q >> 1) + 0x3fe00000; + ix1 = q1 >> 1; + if (q & 1) + ix1 |= sign; + ix = ix0 + ((unsigned int)m << 20); + ix <<= 32; + ix |= ix1; + return *(double*)&ix; } /*********************************************************************

1 0

Henri Verbeet : vkd3d-shader: Fail shader compilation if any descriptor bindings are missing.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: vkd3d Branch: master Commit: cf3c50b7055f45a379594e56abb3fee6e2adb475 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cf3c50b7055f45a379594e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 4 15:01:29 2020 +0430 vkd3d-shader: Fail shader compilation if any descriptor bindings are missing. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 30 ++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_main.c | 51 ++++++++++++++++++-------------- libs/vkd3d-shader/vkd3d_shader_private.h | 7 ++++- 3 files changed, 64 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=cf3c50b7055f45a3795…

1 0

Henri Verbeet : vkd3d-shader: Add a compiler message for unhandled register types in vkd3d_dxbc_compiler_get_descriptor_binding().
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: vkd3d Branch: master Commit: 1496dc054e5c1bb752703790cbcf27adb5c3b5ac URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1496dc054e5c1bb75270379… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 4 15:01:30 2020 +0430 vkd3d-shader: Add a compiler message for unhandled register types in vkd3d_dxbc_compiler_get_descriptor_binding(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 4 ++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6341370..9af672b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2340,7 +2340,11 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor else if (reg->type == VKD3DSPR_SAMPLER) descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER; else + { FIXME("Unhandled register type %#x.\n", reg->type); + vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_INVALID_REGISTER_TYPE, + "Encountered invalid/unhandled register type %#x.", reg->type); + } resource_type_flag = resource_type == VKD3D_SHADER_RESOURCE_BUFFER ? VKD3D_SHADER_BINDING_FLAG_BUFFER : VKD3D_SHADER_BINDING_FLAG_IMAGE; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 16df8a5..21e37da 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -71,6 +71,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF = 1000, VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_BINDING_NOT_FOUND = 2000, + VKD3D_SHADER_ERROR_SPV_INVALID_REGISTER_TYPE = 2001, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY = 3000, VKD3D_SHADER_ERROR_RS_INVALID_VERSION = 3001,

1 0

Henri Verbeet : vkd3d-shader: Allow plain storage buffers to be used for buffer UAVs.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: vkd3d Branch: master Commit: ffe0dca779dd8c4dbc7eb414647f6375301588c4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ffe0dca779dd8c4dbc7eb41… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 4 15:01:31 2020 +0430 vkd3d-shader: Allow plain storage buffers to be used for buffer UAVs. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 13 ++ libs/vkd3d-shader/spirv.c | 387 ++++++++++++++++++++++++++++++++++++---------- 2 files changed, 321 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=ffe0dca779dd8c4dbc7…

1 0

Henri Verbeet : vkd3d-compiler: Add an option to specify the buffer type to use for buffer UAV bindings.
by Alexandre Julliard 04 Aug '20

04 Aug '20

Module: vkd3d Branch: master Commit: b2dcff0ecf0cd0dc4e1b7cfca4db872a2a364ef6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b2dcff0ecf0cd0dc4e1b7cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 4 15:01:32 2020 +0430 vkd3d-compiler: Add an option to specify the buffer type to use for buffer UAV bindings. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index be8a99d..9b50c10 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -27,11 +27,12 @@ #include "vkd3d_common.h" #include "vkd3d_shader.h" -#define MAX_COMPILE_OPTIONS 1 +#define MAX_COMPILE_OPTIONS 2 enum { OPTION_HELP = CHAR_MAX + 1, + OPTION_BUFFER_UAV, OPTION_OUTPUT, OPTION_STRIP_DEBUG, OPTION_VERSION, @@ -101,6 +102,9 @@ static void print_usage(const char *program_name) "[options...] file\n" "Options:\n" " -h, --help Display this information and exit.\n" + " --buffer-uav=<type> Specify the buffer type to use for buffer UAV bindings.\n" + " Valid values are 'buffer-texture' (default) and\n" + " 'storage-buffer'.\n" " -o, --output=<file> Write the output to <file>.\n" " --strip-debug Strip debug information from the output.\n" " -V, --version Display version information and exit.\n" @@ -151,6 +155,23 @@ static void add_compile_option(struct options *options, o->value = value; } +static bool parse_buffer_uav(enum vkd3d_shader_compile_option_buffer_uav *buffer_uav, const char *arg) +{ + if (!strcmp(arg, "buffer-texture")) + { + *buffer_uav = VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV_STORAGE_TEXEL_BUFFER; + return true; + } + + if (!strcmp(arg, "storage-buffer")) + { + *buffer_uav = VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV_STORAGE_BUFFER; + return true; + } + + return false; +} + static enum vkd3d_shader_source_type parse_source_type(const char *source) { if (!strcmp(source, "dxbc-tpf") || !strcmp(source, "none")) @@ -161,11 +182,13 @@ static enum vkd3d_shader_source_type parse_source_type(const char *source) static bool parse_command_line(int argc, char **argv, struct options *options) { + enum vkd3d_shader_compile_option_buffer_uav buffer_uav; int option; static struct option long_options[] = { {"help", no_argument, NULL, OPTION_HELP}, + {"buffer-uav", required_argument, NULL, OPTION_BUFFER_UAV}, {"output", required_argument, NULL, OPTION_OUTPUT}, {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, {"version", no_argument, NULL, OPTION_VERSION}, @@ -182,6 +205,15 @@ static bool parse_command_line(int argc, char **argv, struct options *options) switch (option) { + case OPTION_BUFFER_UAV: + if (!parse_buffer_uav(&buffer_uav, optarg)) + { + fprintf(stderr, "Invalid buffer UAV type '%s' specified.\n", optarg); + return false; + } + add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV, buffer_uav); + break; + case OPTION_OUTPUT: case 'o': options->output_filename = optarg;

1 0