May 2019 - Wine-commits - list.winehq.org

Jacek Caban : ntoskrnl.exe: Use ObGetObjectType in kernel_object_from_handle.
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: 73b99d296c5c981e0afe614b72e339b41eb250d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73b99d296c5c981e0afe614b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 1 17:54:05 2019 +0200 ntoskrnl.exe: Use ObGetObjectType in kernel_object_from_handle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 0bb83cb..1a2a6d1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -366,6 +366,15 @@ static void ObReferenceObject( void *obj ) LeaveCriticalSection( &obref_cs ); } +/*********************************************************************** + * ObGetObjectType (NTOSKRNL.EXE.@) + */ +POBJECT_TYPE WINAPI ObGetObjectType( void *object ) +{ + struct object_header *header = (struct object_header *)object - 1; + return header->type; +} + static const POBJECT_TYPE *known_types[] = { &ExEventObjectType, @@ -389,7 +398,6 @@ static CRITICAL_SECTION handle_map_cs = { &handle_map_critsect_debug, -1, 0, 0, NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret ) { - struct object_header *header; void *obj; NTSTATUS status; @@ -409,12 +417,7 @@ NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret return status; } - if (obj) - { - header = (struct object_header *)obj - 1; - if (type && header->type != type) status = STATUS_OBJECT_TYPE_MISMATCH; - } - else + if (!obj) { char buf[256]; OBJECT_TYPE_INFORMATION *type_info = (OBJECT_TYPE_INFORMATION *)buf; @@ -459,6 +462,7 @@ NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret } if (!obj) status = STATUS_NO_MEMORY; } + else if (type && ObGetObjectType( obj ) != type) status = STATUS_OBJECT_TYPE_MISMATCH; LeaveCriticalSection( &handle_map_cs ); if (!status) *ret = obj; @@ -489,15 +493,6 @@ NTSTATUS WINAPI ObReferenceObjectByHandle( HANDLE handle, ACCESS_MASK access, } /*********************************************************************** - * ObGetObjectType (NTOSKRNL.EXE.@) - */ -POBJECT_TYPE WINAPI ObGetObjectType( void *object ) -{ - struct object_header *header = (struct object_header *)object - 1; - return header->type; -} - -/*********************************************************************** * ObOpenObjectByPointer (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI ObOpenObjectByPointer( void *obj, ULONG attr, ACCESS_STATE *access_state,

1 0

Alexandre Julliard : rpcss: Build with msvcrt.
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: 94700e837622c077dc92e4eac3b9022acb32556b URL: https://source.winehq.org/git/wine.git/?a=commit;h=94700e837622c077dc92e4ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 1 10:39:42 2019 +0200 rpcss: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/rpcss/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/rpcss/Makefile.in b/programs/rpcss/Makefile.in index 79895af..6ccb5e9 100644 --- a/programs/rpcss/Makefile.in +++ b/programs/rpcss/Makefile.in @@ -1,7 +1,8 @@ MODULE = rpcss.exe -APPMODE = -mconsole -municode IMPORTS = rpcrt4 advapi32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = \ epmp.c \ irotp.c \

1 0

Alexandre Julliard : rundll32: Build with msvcrt.
by Alexandre Julliard 01 May '19

01 May '19

Module: wine Branch: master Commit: b09e18c40d19afeed1793b0553f109fbb1b0a629 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b09e18c40d19afeed1793b05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 1 10:39:49 2019 +0200 rundll32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/rundll32/Makefile.in | 3 ++- programs/rundll32/rundll32.c | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/rundll32/Makefile.in b/programs/rundll32/Makefile.in index 23671d2..6ab5eda 100644 --- a/programs/rundll32/Makefile.in +++ b/programs/rundll32/Makefile.in @@ -1,6 +1,7 @@ MODULE = rundll32.exe -APPMODE = -mwindows -municode IMPORTS = user32 +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + C_SRCS = \ rundll32.c diff --git a/programs/rundll32/rundll32.c b/programs/rundll32/rundll32.c index ec0ae59..3d4a468 100644 --- a/programs/rundll32/rundll32.c +++ b/programs/rundll32/rundll32.c @@ -37,7 +37,6 @@ #define WIN32_LEAN_AND_MEAN #include "windows.h" #include "wine/winbase16.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(rundll32); @@ -123,7 +122,7 @@ static void *get_entry_point32( HMODULE module, LPCWSTR entry, BOOL *unicode ) /* determine if the entry point is an ordinal */ if (entry[0] == '#') { - INT_PTR ordinal = atoiW( entry + 1 ); + INT_PTR ordinal = wcstol( entry + 1, NULL, 10 ); if (ordinal <= 0) return NULL; @@ -265,7 +264,7 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE hOldInstance, LPWSTR szCmdLine if (!szDllName || *szDllName==0) goto CLEANUP; WINE_TRACE("DllName=%s\n",wine_dbgstr_w(szDllName)); - if ((szEntryPoint = strchrW(szDllName, ',' ))) + if ((szEntryPoint = wcschr(szDllName, ',' ))) *szEntryPoint++=0; else szEntryPoint = get_next_arg(&szCmdLine);

1 0

Józef Kucia : vkd3d: Trace returned features.
by Alexandre Julliard 01 May '19

01 May '19

Module: vkd3d Branch: master Commit: 081239fd907282668d1ca62ea84ba8abd2d823aa URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=081239fd907282668d1ca62… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 30 14:33:44 2019 +0200 vkd3d: Trace returned features. 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/device.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 5364df2..0645579 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2129,6 +2129,22 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * *data = device->feature_options; + TRACE("Double precision shader ops %#x.\n", data->DoublePrecisionFloatShaderOps); + TRACE("Output merger logic op %#x.\n", data->OutputMergerLogicOp); + TRACE("Shader min precision support %#x.\n", data->MinPrecisionSupport); + TRACE("Tiled resources tier %#x.\n", data->TiledResourcesTier); + TRACE("Resource binding tier %#x.\n", data->ResourceBindingTier); + TRACE("PS specified stencil ref %#x.\n", data->PSSpecifiedStencilRefSupported); + TRACE("Typed UAV load and additional formats %#x.\n", data->TypedUAVLoadAdditionalFormats); + TRACE("ROV %#x.\n", data->ROVsSupported); + TRACE("Conservative rasterization tier %#x.\n", data->ConservativeRasterizationTier); + TRACE("Max GPU virtual address bits per resource %u.\n", data->MaxGPUVirtualAddressBitsPerResource); + TRACE("Standard swizzle 64KB %#x.\n", data->StandardSwizzle64KBSupported); + TRACE("Cross-node sharing tier %#x.\n", data->CrossNodeSharingTier); + TRACE("Cross-adapter row-major texture %#x.\n", data->CrossAdapterRowMajorTextureSupported); + TRACE("VP and RT array index from any shader without GS emulation %#x.\n", + data->VPAndRTArrayIndexFromAnyShaderFeedingRasterizerSupportedWithoutGSEmulation); + TRACE("Resource heap tier %#x.\n", data->ResourceHeapTier); return S_OK; } @@ -2148,7 +2164,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return E_INVALIDARG; } - FIXME("Assuming device does not support tile based rendering.\n"); + WARN("Assuming device does not support tile based rendering.\n"); data->TileBasedRenderer = FALSE; data->UMA = TRUE; @@ -2160,7 +2176,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * if (!(device->memory_properties.memoryTypes[i].propertyFlags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) data->CacheCoherentUMA = FALSE; } - TRACE("UMA: %#x CacheCoherentUMA: %#x.\n", data->UMA, data->CacheCoherentUMA); + + TRACE("Tile based renderer %#x, UMA %#x, cache coherent UMA %#x.\n", + data->TileBasedRenderer, data->UMA, data->CacheCoherentUMA); return S_OK; } @@ -2185,6 +2203,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * if (data->MaxSupportedFeatureLevel < fl && fl <= vulkan_info->max_feature_level) data->MaxSupportedFeatureLevel = fl; } + + TRACE("Max supported feature level %#x.\n", data->MaxSupportedFeatureLevel); return S_OK; } @@ -2258,6 +2278,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * vkd3d_restrict_format_support_for_feature_level(data); + TRACE("Format %#x, support1 %#x, support2 %#x.\n", data->Format, data->Support1, data->Support2); return S_OK; } @@ -2287,6 +2308,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * data->MaxGPUVirtualAddressBitsPerResource = options->MaxGPUVirtualAddressBitsPerResource; data->MaxGPUVirtualAddressBitsPerProcess = options->MaxGPUVirtualAddressBitsPerResource; + + TRACE("Max GPU virtual address bits per resource %u, Max GPU virtual address bits per process %u.\n", + data->MaxGPUVirtualAddressBitsPerResource, data->MaxGPUVirtualAddressBitsPerProcess); return S_OK; } @@ -2303,6 +2327,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * TRACE("Request shader model %#x.\n", data->HighestShaderModel); data->HighestShaderModel = D3D_SHADER_MODEL_5_1; + + TRACE("Shader model %#x.\n", data->HighestShaderModel); return S_OK; } @@ -2318,6 +2344,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * FIXME("Root signature version 1_1 not supported yet.\n"); data->HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_0; + + TRACE("Root signature version %#x.\n", data->HighestVersion); return S_OK; }

1 0

Józef Kucia : vkd3d-shader: Remove dead assignment.
by Alexandre Julliard 01 May '19

01 May '19

Module: vkd3d Branch: master Commit: ef71edcb32a43cab21583f9ba74a616ab111c8d9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ef71edcb32a43cab21583f9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 30 14:33:45 2019 +0200 vkd3d-shader: Remove dead assignment. 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-shader/spirv.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d0304e0..ad927b2 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3822,7 +3822,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi write_mask = signature_element->mask & 0xff; - component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); component_count = vkd3d_write_mask_component_count(dst->write_mask); if (builtin) {

1 0

Józef Kucia : vkd3d-shader: Use more appropriate variables for descriptor range count.
by Alexandre Julliard 01 May '19

01 May '19

Module: vkd3d Branch: master Commit: 2faae71f5a9b262039ac6a5f364c0dc47e4b21a3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2faae71f5a9b262039ac6a5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 30 14:33:46 2019 +0200 vkd3d-shader: Use more appropriate variables for descriptor range count. Helps Clang Static Analyzer. 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-shader/dxbc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 7336a7a..520e208 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -3080,7 +3080,7 @@ static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst, } p->u.descriptor_table.descriptor_ranges = ranges; ranges1 = p1->u.descriptor_table.descriptor_ranges; - for (j = 0; j < p1->u.descriptor_table.descriptor_range_count; ++j) + for (j = 0; j < p->u.descriptor_table.descriptor_range_count; ++j) { ranges[j].range_type = ranges1[j].range_type; ranges[j].descriptor_count = ranges1[j].descriptor_count; @@ -3199,7 +3199,7 @@ static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, } p1->u.descriptor_table.descriptor_ranges = ranges1; ranges = p->u.descriptor_table.descriptor_ranges; - for (j = 0; j < p->u.descriptor_table.descriptor_range_count; ++j) + for (j = 0; j < p1->u.descriptor_table.descriptor_range_count; ++j) { ranges1[j].range_type = ranges[j].range_type; ranges1[j].descriptor_count = ranges[j].descriptor_count;

1 0

Józef Kucia : vkd3d-shader: Improve asserts for write mask component count.
by Alexandre Julliard 01 May '19

01 May '19

Module: vkd3d Branch: master Commit: de3423e98e82fb39ea4860bbb42a1e21d1b7fb9c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=de3423e98e82fb39ea4860b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 30 14:33:47 2019 +0200 vkd3d-shader: Improve asserts for write mask component count. Helps Clang Static Analyzer. 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-shader/vkd3d_shader_private.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 73ba93f..54d0705 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -883,13 +883,14 @@ static inline unsigned int vkd3d_write_mask_get_component_idx(DWORD write_mask) static inline unsigned int vkd3d_write_mask_component_count(DWORD write_mask) { - assert(write_mask); - return vkd3d_popcount(write_mask & VKD3DSP_WRITEMASK_ALL); + unsigned int count = vkd3d_popcount(write_mask & VKD3DSP_WRITEMASK_ALL); + assert(1 <= count && count <= VKD3D_VEC4_SIZE); + return count; } static inline unsigned int vkd3d_write_mask_from_component_count(unsigned int component_count) { - assert(component_count <= 4); + assert(component_count <= VKD3D_VEC4_SIZE); return (VKD3DSP_WRITEMASK_0 << component_count) - 1; }

1 0

Józef Kucia : vkd3d-shader: Use locale-insensitive string comparison.
by Alexandre Julliard 01 May '19

01 May '19

Module: vkd3d Branch: master Commit: df7274672975688f6034a8d9a17a9018289a5ea5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=df7274672975688f6034a8d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 30 14:33:48 2019 +0200 vkd3d-shader: Use locale-insensitive string comparison. 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/private/vkd3d_common.h | 23 +++++++++++++++++++++++ libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- tests/vkd3d_shader_api.c | 6 +++++- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 1129f1e..2442092 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -88,6 +88,29 @@ static inline unsigned int vkd3d_log2i(unsigned int x) #endif } +static inline int ascii_isupper(int c) +{ + return 'A' <= c && c <= 'Z'; +} + +static inline int ascii_tolower(int c) +{ + return ascii_isupper(c) ? c - 'A' + 'a' : c; +} + +static inline int ascii_strcasecmp(const char *a, const char *b) +{ + int c_a, c_b; + + do + { + c_a = ascii_tolower(*a++); + c_b = ascii_tolower(*b++); + } while (c_a == c_b && c_a != '\0'); + + return c_a - c_b; +} + #ifndef _WIN32 # if HAVE_SYNC_ADD_AND_FETCH static inline LONG InterlockedIncrement(LONG volatile *x) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ad927b2..dc51644 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3709,7 +3709,7 @@ static void vkd3d_dxbc_compiler_decorate_xfb_output(struct vkd3d_dxbc_compiler * const struct vkd3d_shader_transform_feedback_element *e = &xfb_info->elements[i]; if (e->stream_index == signature_element->stream_index - && !strcasecmp(e->semantic_name, signature_element->semantic_name) + && !ascii_strcasecmp(e->semantic_name, signature_element->semantic_name) && e->semantic_index == signature_element->semantic_index) { xfb_element = e; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 9848202..aa486cc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -401,7 +401,7 @@ struct vkd3d_shader_signature_element *vkd3d_shader_find_signature_element( e = signature->elements; for (i = 0; i < signature->element_count; ++i) { - if (!strcasecmp(e[i].semantic_name, semantic_name) + if (!ascii_strcasecmp(e[i].semantic_name, semantic_name) && e[i].semantic_index == semantic_index && e[i].stream_index == stream_index) return &e[i]; diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 41067c0..f9bec7e 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -19,6 +19,8 @@ #include "vkd3d_test.h" #include <vkd3d_shader.h> +#include <locale.h> + static void test_invalid_shaders(void) { struct vkd3d_shader_code spirv; @@ -112,7 +114,7 @@ static void test_vkd3d_shader_pfns(void) rc = pfn_vkd3d_shader_parse_input_signature(&vs, &signature); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); - element = pfn_vkd3d_shader_find_signature_element(&signature, "POSITION", 0, 0); + element = pfn_vkd3d_shader_find_signature_element(&signature, "position", 0, 0); ok(element, "Could not find shader signature element.\n"); pfn_vkd3d_shader_free_shader_signature(&signature); @@ -128,6 +130,8 @@ static void test_vkd3d_shader_pfns(void) START_TEST(vkd3d_shader_api) { + setlocale(LC_ALL, ""); + run_test(test_invalid_shaders); run_test(test_vkd3d_shader_pfns); }

1 0

Józef Kucia : vkd3d: Enable Vulkan debug extensions independently of debug log level.
by Alexandre Julliard 01 May '19

01 May '19

Module: vkd3d Branch: master Commit: e7b94e0337d2afcbd0a5837277efffbd61245cfb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e7b94e0337d2afcbd0a5837… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 30 14:33:49 2019 +0200 vkd3d: Enable Vulkan debug extensions independently of debug log level. 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/private/vkd3d_debug.h | 10 ++++++++ libs/vkd3d-common/debug.c | 39 +++++++++++++++++++++++++++++ libs/vkd3d/device.c | 58 ++++++++++++++++++++++++++++++------------- libs/vkd3d/vkd3d_private.h | 7 ++++++ 4 files changed, 97 insertions(+), 17 deletions(-) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index 418e2c4..7642dec 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -22,6 +22,7 @@ #include "vkd3d_common.h" #include <stdarg.h> +#include <stdint.h> #ifdef VKD3D_NO_TRACE_MESSAGES #define TRACE(args...) do { } while (0) @@ -90,4 +91,13 @@ static inline const char *debugstr_guid(const GUID *guid) unsigned int vkd3d_env_var_as_uint(const char *name, unsigned int default_value) DECLSPEC_HIDDEN; +struct vkd3d_debug_option +{ + const char *name; + uint64_t flag; +}; + +uint64_t vkd3d_parse_debug_options(const char *string, + const struct vkd3d_debug_option *options, unsigned int option_count) DECLSPEC_HIDDEN; + #endif /* __VKD3D_DEBUG_H */ diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index 6b9662b..9a27c22 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -25,6 +25,7 @@ #include <limits.h> #include <stdio.h> #include <stdlib.h> +#include <stdbool.h> #include <string.h> #define VKD3D_DEBUG_BUFFER_COUNT 64 @@ -316,3 +317,41 @@ unsigned int vkd3d_env_var_as_uint(const char *name, unsigned int default_value) return default_value; } + +static bool is_option_separator(char c) +{ + return c == ',' || c == ';' || c == '\0'; +} + +uint64_t vkd3d_parse_debug_options(const char *string, + const struct vkd3d_debug_option *options, unsigned int option_count) +{ + char prev_char, next_char; + uint64_t flags = 0; + unsigned int i; + const char *p; + + for (i = 0; i < option_count; ++i) + { + const struct vkd3d_debug_option *opt = &options[i]; + + p = string; + while (p) + { + if ((p = strstr(p, opt->name))) + { + prev_char = p > string ? p[-1] : 0; + p += strlen(opt->name); + next_char = *p; + + if (is_option_separator(prev_char) && is_option_separator(next_char)) + { + flags |= opt->flag; + break; + } + } + } + } + + return flags; +} diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 0645579..052d4f6 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -172,25 +172,19 @@ static bool is_extension_disabled(const char *extension_name) } static bool has_extension(const VkExtensionProperties *extensions, - unsigned int count, const char *extension_name, bool is_debug_only) + unsigned int count, const char *extension_name) { unsigned int i; for (i = 0; i < count; ++i) { - if (strcmp(extensions[i].extensionName, extension_name)) - continue; if (is_extension_disabled(extension_name)) { WARN("Extension %s is disabled.\n", debugstr_a(extension_name)); continue; } - if (is_debug_only && vkd3d_dbg_get_level() < VKD3D_DBG_LEVEL_WARN) - { - TRACE("Skipping debug-only extension %s.\n", debugstr_a(extension_name)); - continue; - } - return true; + if (!strcmp(extensions[i].extensionName, extension_name)) + return true; } return false; } @@ -200,14 +194,15 @@ static unsigned int vkd3d_check_extensions(const VkExtensionProperties *extensio const struct vkd3d_optional_extension_info *optional_extensions, unsigned int optional_extension_count, const char * const *user_extensions, unsigned int user_extension_count, const char * const *optional_user_extensions, unsigned int optional_user_extension_count, - bool *user_extension_supported, struct vkd3d_vulkan_info *vulkan_info, const char *extension_type) + bool *user_extension_supported, struct vkd3d_vulkan_info *vulkan_info, const char *extension_type, + bool is_debug_enabled) { unsigned int extension_count = 0; unsigned int i; for (i = 0; i < required_extension_count; ++i) { - if (!has_extension(extensions, count, required_extensions[i], false)) + if (!has_extension(extensions, count, required_extensions[i])) ERR("Required %s extension %s is not supported.\n", extension_type, debugstr_a(required_extensions[i])); ++extension_count; @@ -217,10 +212,16 @@ static unsigned int vkd3d_check_extensions(const VkExtensionProperties *extensio { const char *extension_name = optional_extensions[i].extension_name; ptrdiff_t offset = optional_extensions[i].vulkan_info_offset; - bool is_debug_only = optional_extensions[i].is_debug_only; bool *supported = (void *)((uintptr_t)vulkan_info + offset); - if ((*supported = has_extension(extensions, count, extension_name, is_debug_only))) + if (!is_debug_enabled && optional_extensions[i].is_debug_only) + { + *supported = false; + TRACE("Skipping debug-only extension %s.\n", debugstr_a(extension_name)); + continue; + } + + if ((*supported = has_extension(extensions, count, extension_name))) { TRACE("Found %s extension.\n", debugstr_a(extension_name)); ++extension_count; @@ -229,7 +230,7 @@ static unsigned int vkd3d_check_extensions(const VkExtensionProperties *extensio for (i = 0; i < user_extension_count; ++i) { - if (!has_extension(extensions, count, user_extensions[i], false)) + if (!has_extension(extensions, count, user_extensions[i])) ERR("Required user %s extension %s is not supported.\n", extension_type, debugstr_a(user_extensions[i])); ++extension_count; @@ -238,7 +239,7 @@ static unsigned int vkd3d_check_extensions(const VkExtensionProperties *extensio assert(!optional_user_extension_count || user_extension_supported); for (i = 0; i < optional_user_extension_count; ++i) { - if (has_extension(extensions, count, optional_user_extensions[i], false)) + if (has_extension(extensions, count, optional_user_extensions[i])) { user_extension_supported[i] = true; ++extension_count; @@ -360,7 +361,8 @@ static HRESULT vkd3d_init_instance_caps(struct vkd3d_instance *instance, create_info->instance_extensions, create_info->instance_extension_count, optional_extensions ? optional_extensions->extensions : NULL, optional_extensions ? optional_extensions->extension_count : 0, - *user_extension_supported, vulkan_info, "instance"); + *user_extension_supported, vulkan_info, "instance", + instance->config_flags & VKD3D_CONFIG_FLAG_VULKAN_DEBUG); vkd3d_free(vk_extensions); return S_OK; @@ -433,6 +435,25 @@ static void vkd3d_init_debug_report(struct vkd3d_instance *instance) instance->vk_debug_callback = callback; } +static const struct vkd3d_debug_option vkd3d_config_options[] = +{ + {"vk_debug", VKD3D_CONFIG_FLAG_VULKAN_DEBUG}, /* enable Vulkan debug extensions */ +}; + +static uint64_t vkd3d_init_config_flags(void) +{ + uint64_t config_flags; + const char *config; + + config = getenv("VKD3D_CONFIG"); + config_flags = vkd3d_parse_debug_options(config, vkd3d_config_options, ARRAY_SIZE(vkd3d_config_options)); + + if (config_flags) + TRACE("VKD3D_CONFIG='%s'.\n", config); + + return config_flags; +} + static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, const struct vkd3d_instance_create_info *create_info) { @@ -470,6 +491,8 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, instance->join_thread = create_info->pfn_join_thread; instance->wchar_size = create_info->wchar_size; + instance->config_flags = vkd3d_init_config_flags(); + if (FAILED(hr = vkd3d_init_vk_global_procs(instance, create_info->pfn_vkGetInstanceProcAddr))) { ERR("Failed to initialize Vulkan global procs, hr %#x.\n", hr); @@ -1250,7 +1273,8 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, create_info->device_extensions, create_info->device_extension_count, optional_extensions ? optional_extensions->extensions : NULL, optional_extensions ? optional_extensions->extension_count : 0, - *user_extension_supported, vulkan_info, "device"); + *user_extension_supported, vulkan_info, "device", + device->vkd3d_instance->config_flags & VKD3D_CONFIG_FLAG_VULKAN_DEBUG); depth_clip_features = vk_find_struct(features2->pNext, PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT); if (depth_clip_features) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index be82851..b333182 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -113,6 +113,11 @@ struct vkd3d_vulkan_info D3D_FEATURE_LEVEL max_feature_level; }; +enum vkd3d_config_flags +{ + VKD3D_CONFIG_FLAG_VULKAN_DEBUG = 0x00000001, +}; + struct vkd3d_instance { VkInstance vk_instance; @@ -127,6 +132,8 @@ struct vkd3d_instance struct vkd3d_vk_global_procs vk_global_procs; void *libvulkan; + uint64_t config_flags; + VkDebugReportCallbackEXT vk_debug_callback; LONG refcount;

1 0