January 2019 - Wine-Devel - list.winehq.org

[PATCH vkd3d 6/9] build: Add option to disable tests.
by Józef Kucia Jan. 31, 2019

Jan. 31, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Makefile.am | 4 +++- configure.ac | 10 ++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index e0b31a6d4c4f..3e9ddeaf555c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -137,12 +137,14 @@ vkd3d_compiler_SOURCES = programs/vkd3d-compiler/main.c vkd3d_compiler_LDADD = libvkd3d-shader.la LDADD = libvkd3d.la libvkd3d-utils.la -check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) AM_DEFAULT_SOURCE_EXT = .c +if BUILD_TESTS +check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la +endif if BUILD_DEMOS DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@ diff --git a/configure.ac b/configure.ac index e539d9825a8f..37e1edd6e941 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,12 @@ AC_ARG_VAR([CROSSCC64], [64-bit Windows cross compiler]) AC_ARG_WITH([xcb], AS_HELP_STRING([--with-xcb], [Build with XCB library (default: test)])) AC_ARG_WITH([spirv-tools], AS_HELP_STRING([--with-spirv-tools], [Build with SPIRV-Tools library (default: disabled)])) -AC_ARG_ENABLE([demos], AS_HELP_STRING([--enable-demos], [Build demo programs (default: disabled)])) +AC_ARG_ENABLE([demos], + AS_HELP_STRING([--enable-demos], [Build demo programs (default: disabled)]),, + [enable_demos=no]) +AC_ARG_ENABLE([tests], + AS_HELP_STRING([--enable-tests], [Build tests (default: enabled)]),, + [enable_tests=yes]) AC_USE_SYSTEM_EXTENSIONS @@ -107,10 +112,10 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_ VKD3D_CHECK_PTHREAD_SETNAME_NP dnl Makefiles -AS_IF([test "x$enable_demos" != "xyes"], [enable_demos=no]) AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"], [AC_MSG_ERROR([libxcb is required for demos.])]) AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"]) +AM_CONDITIONAL([BUILD_TESTS], [test "x$enable_tests" != "xno"]) AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET64], [test "x$CROSSTARGET64" != "xno"]) @@ -129,6 +134,7 @@ AS_ECHO([" Have SPIRV-Tools: ${with_spirv_tools} Building demos: ${enable_demos} + Building tests: ${enable_tests} Building crosstests: ${HAVE_CROSSTEST}"]) AS_IF([test "x$CROSSTARGET32" != "xno"], [AS_ECHO([" Using 32-bit cross compiler: $CROSSCC32"])]) -- 2.19.2

3 2

[PATCH vkd3d 5/9] build: Build DLLs for Windows.
by Józef Kucia Jan. 31, 2019

Jan. 31, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Initial patches for cross-compiling for Windows. --- Makefile.am | 7 ++++--- configure.ac | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 487d2ead982b..e0b31a6d4c4f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 AM_CFLAGS = @VKD3D_CFLAGS@ AM_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/dummy -I$(srcdir)/include/private +AM_LDFLAGS = -no-undefined widl_headers = \ include/vkd3d_d3d12.h \ @@ -79,7 +80,7 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/vkd3d_shader_main.c \ libs/vkd3d-shader/vkd3d_shader_private.h libvkd3d_shader_la_CFLAGS = $(AM_CFLAGS) @SPIRV_TOOLS_CFLAGS@ -libvkd3d_shader_la_LDFLAGS = -version-info 1:0:0 +libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_shader_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map @@ -104,7 +105,7 @@ libvkd3d_la_SOURCES = \ libs/vkd3d/vkd3d_private.h \ libs/vkd3d/vulkan_procs.h \ libs/vkd3d_version.c -libvkd3d_la_LDFLAGS = -version-info 2:0:1 +libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2:0:1 libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @DL_LIBS@ @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d/vkd3d.map @@ -114,7 +115,7 @@ libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils.map \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h -libvkd3d_utils_la_LDFLAGS = -version-info 1:1:0 +libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:1:0 libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la if HAVE_LD_VERSION_SCRIPT libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map diff --git a/configure.ac b/configure.ac index 6e5527952ba1..e539d9825a8f 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ AM_MAINTAINER_MODE([enable]) AM_SILENT_RULES([yes]) LT_PREREQ([2.4.2]) -LT_INIT +LT_INIT([win32-dll]) gl_LD_VERSION_SCRIPT -- 2.19.2

3 2

[PATCH vkd3d 2/9] vkd3d-shader: Move VKD3D_SHADER_DUMP_PATH implementation from libvkd3d.
by Józef Kucia Jan. 31, 2019

Jan. 31, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 35 +++++------- libs/vkd3d-shader/vkd3d_shader_main.c | 44 +++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 + libs/vkd3d/state.c | 68 ------------------------ 4 files changed, 58 insertions(+), 91 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 8769513d2d1d..cb7452bdc2ab 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1238,44 +1238,32 @@ static void shader_dump_interpolation_mode(struct vkd3d_string_buffer *buffer, } } -static void shader_dump_version(struct vkd3d_string_buffer *buffer, - const struct vkd3d_shader_version *shader_version) +const char *shader_get_type_prefix(enum vkd3d_shader_type type) { - const char *prefix; - - switch (shader_version->type) + switch (type) { case VKD3D_SHADER_TYPE_VERTEX: - prefix = "vs"; - break; + return "vs"; case VKD3D_SHADER_TYPE_HULL: - prefix = "hs"; - break; + return "hs"; case VKD3D_SHADER_TYPE_DOMAIN: - prefix = "ds"; - break; + return "ds"; case VKD3D_SHADER_TYPE_GEOMETRY: - prefix = "gs"; - break; + return "gs"; case VKD3D_SHADER_TYPE_PIXEL: - prefix = "ps"; - break; + return "ps"; case VKD3D_SHADER_TYPE_COMPUTE: - prefix = "cs"; - break; + return "cs"; default: - FIXME("Unhandled shader type %#x.\n", shader_version->type); - prefix = "unknown"; - break; + FIXME("Unhandled shader type %#x.\n", type); + return "unknown"; } - - shader_addline(buffer, "%s_%u_%u\n", prefix, shader_version->major, shader_version->minor); } static void shader_dump_instruction_flags(struct vkd3d_string_buffer *buffer, @@ -1606,7 +1594,8 @@ void vkd3d_shader_trace(void *data) } shader_sm4_read_header(data, &ptr, &shader_version); - shader_dump_version(&buffer, &shader_version); + shader_addline(&buffer, "%s_%u_%u\n", + shader_get_type_prefix(shader_version.type), shader_version.major, shader_version.minor); while (!shader_sm4_is_end(data, &ptr)) { diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 73a9236799d0..dfd6b726d1d6 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -18,9 +18,51 @@ #include "vkd3d_shader_private.h" +#include <stdio.h> + STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_counter_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_read_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); +static void vkd3d_shader_dump_blob(const char *path, const char *prefix, const void *data, size_t size) +{ + static int shader_id = 0; + char filename[1024]; + unsigned int id; + FILE *f; + + id = InterlockedIncrement(&shader_id) - 1; + + snprintf(filename, ARRAY_SIZE(filename), "%s/vkd3d-shader-%s-%u.dxbc", path, prefix, id); + if ((f = fopen(filename, "wb"))) + { + if (fwrite(data, 1, size, f) != size) + ERR("Failed to write shader to %s.\n", filename); + if (fclose(f)) + ERR("Failed to close stream %s.\n", filename); + } + else + { + ERR("Failed to open %s for dumping shader.\n", filename); + } +} + +static void vkd3d_shader_dump_shader(enum vkd3d_shader_type type, const struct vkd3d_shader_code *shader) +{ + static bool enabled = true; + const char *path; + + if (!enabled) + return; + + if (!(path = getenv("VKD3D_SHADER_DUMP_PATH"))) + { + enabled = false; + return; + } + + vkd3d_shader_dump_blob(path, shader_get_type_prefix(type), shader->code, shader->size); +} + struct vkd3d_shader_parser { struct vkd3d_shader_desc shader_desc; @@ -114,6 +156,8 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, if ((ret = vkd3d_shader_parser_init(&parser, dxbc)) < 0) return ret; + vkd3d_shader_dump_shader(parser.shader_version.type, dxbc); + if (TRACE_ON()) vkd3d_shader_trace(parser.data); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index e08f1f3caca7..ba5875cacaf4 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -791,6 +791,8 @@ static inline bool vkd3d_shader_register_is_output(const struct vkd3d_shader_reg void vkd3d_shader_trace(void *data) DECLSPEC_HIDDEN; +const char *shader_get_type_prefix(enum vkd3d_shader_type type) DECLSPEC_HIDDEN; + void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, const struct vkd3d_shader_signature *output_signature) DECLSPEC_HIDDEN; void shader_sm4_free(void *data) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 08f2f3cc2a36..90a15f45f4ba 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -19,8 +19,6 @@ #include "vkd3d_private.h" -#include <stdio.h> - /* ID3D12RootSignature */ static inline struct d3d12_root_signature *impl_from_ID3D12RootSignature(ID3D12RootSignature *iface) { @@ -1243,71 +1241,6 @@ struct d3d12_pipeline_state *unsafe_impl_from_ID3D12PipelineState(ID3D12Pipeline return impl_from_ID3D12PipelineState(iface); } -static void dump_shader(const char *path, const char *prefix, const void *data, size_t size) -{ - static int shader_id = 0; - char filename[1024]; - unsigned int id; - FILE *f; - - id = InterlockedIncrement(&shader_id) - 1; - - snprintf(filename, ARRAY_SIZE(filename), "%s/vkd3d-shader-%s-%u.dxbc", path, prefix, id); - if (!(f = fopen(filename, "wb"))) - { - ERR("Failed to open %s for dumping shader.\n", filename); - return; - } - - if (fwrite(data, 1, size, f) != size) - ERR("Failed to write shader to %s.\n", filename); - if (fclose(f)) - ERR("Failed to close stream %s.\n", filename); -} - -static void dump_shader_stage(VkShaderStageFlagBits stage, const void *data, size_t size) -{ - static bool enabled = true; - const char *prefix; - const char *path; - - if (!enabled) - return; - - if (!(path = getenv("VKD3D_SHADER_DUMP_PATH"))) - { - enabled = false; - return; - } - - switch (stage) - { - case VK_SHADER_STAGE_VERTEX_BIT: - prefix = "vs"; - break; - case VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT: - prefix = "hs"; - break; - case VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT: - prefix = "ds"; - break; - case VK_SHADER_STAGE_GEOMETRY_BIT: - prefix = "gs"; - break; - case VK_SHADER_STAGE_FRAGMENT_BIT: - prefix = "ps"; - break; - case VK_SHADER_STAGE_COMPUTE_BIT: - prefix = "cs"; - break; - default: - prefix = "unk"; - break; - } - - dump_shader(path, prefix, data, size); -} - static HRESULT create_shader_stage(struct d3d12_device *device, struct VkPipelineShaderStageCreateInfo *stage_desc, enum VkShaderStageFlagBits stage, const D3D12_SHADER_BYTECODE *code, const struct vkd3d_shader_interface_info *shader_interface, @@ -1331,7 +1264,6 @@ static HRESULT create_shader_stage(struct d3d12_device *device, shader_desc.pNext = NULL; shader_desc.flags = 0; - dump_shader_stage(stage, code->pShaderBytecode, code->BytecodeLength); if ((ret = vkd3d_shader_compile_dxbc(&dxbc, &spirv, 0, shader_interface, compile_args)) < 0) { WARN("Failed to compile shader, vkd3d result %d.\n", ret); -- 2.19.2

2 1

[PATCH vkd3d 3/9] vkd3d-common: Add support for naming debug environment variable.
by Józef Kucia Jan. 31, 2019

Jan. 31, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_debug.h | 2 ++ libs/vkd3d-common/debug.c | 4 +++- libs/vkd3d-shader/vkd3d_shader_main.c | 2 ++ libs/vkd3d-utils/vkd3d_utils_main.c | 2 ++ libs/vkd3d/vkd3d_main.c | 2 ++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index e5e938dbb3f3..8b4c77db291d 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -57,6 +57,8 @@ const char *debugstr_w(const WCHAR *wstr, size_t wchar_size) DECLSPEC_HIDDEN; #define TRACE_ON() (vkd3d_dbg_get_level() == VKD3D_DBG_LEVEL_TRACE) +#define VKD3D_DEBUG_ENV_NAME(name) const char *vkd3d_dbg_env_name = name + static inline const char *debugstr_guid(const GUID *guid) { if (!guid) diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index b8380457058d..ee23ab0f49a8 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -28,6 +28,8 @@ #define VKD3D_DEBUG_BUFFER_COUNT 64 #define VKD3D_DEBUG_BUFFER_SIZE 512 +extern const char *vkd3d_dbg_env_name DECLSPEC_HIDDEN; + static const char *debug_level_names[] = { /* VKD3D_DBG_LEVEL_NONE */ "none", @@ -46,7 +48,7 @@ enum vkd3d_dbg_level vkd3d_dbg_get_level(void) if (level != ~0u) return level; - if (!(vkd3d_debug = getenv("VKD3D_DEBUG"))) + if (!(vkd3d_debug = getenv(vkd3d_dbg_env_name))) vkd3d_debug = ""; for (i = 0; i < ARRAY_SIZE(debug_level_names); ++i) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index dfd6b726d1d6..071880808755 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -20,6 +20,8 @@ #include <stdio.h> +VKD3D_DEBUG_ENV_NAME("VKD3D_DEBUG"); + STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_counter_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_read_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index fa6e5f8f1616..03f9f52261ad 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -18,6 +18,8 @@ #include "vkd3d_utils_private.h" +VKD3D_DEBUG_ENV_NAME("VKD3D_DEBUG"); + HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) { FIXME("iid %s, debug %p stub!\n", debugstr_guid(iid), debug); diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 63dabda06395..ba55056d11f7 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -19,6 +19,8 @@ #define INITGUID #include "vkd3d_private.h" +VKD3D_DEBUG_ENV_NAME("VKD3D_DEBUG"); + HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, REFIID iid, void **device) { -- 2.19.2

2 1

[PATCH vkd3d 1/9] tests: Add tests for image memory allocation info with various miplevels.
by Józef Kucia Jan. 31, 2019

Jan. 31, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 21214738c6fa..1b6b91763269 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -22850,16 +22850,20 @@ static void test_resource_allocation_info(void) unsigned int width; unsigned int height; unsigned int array_size; + unsigned int miplevels; DXGI_FORMAT format; } texture_tests[] = { - { 4, 4, 1, DXGI_FORMAT_R8_UINT}, - { 8, 8, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, - {16, 16, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, - {16, 16, 6, DXGI_FORMAT_R8G8B8A8_UNORM}, + { 4, 4, 1, 1, DXGI_FORMAT_R8_UINT}, + { 8, 8, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, + {16, 16, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, + {16, 16, 6, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, - {1024, 1024, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, + {1024, 1024, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, + {1024, 1024, 1, 2, DXGI_FORMAT_R8G8B8A8_UNORM}, + {1024, 1024, 1, 3, DXGI_FORMAT_R8G8B8A8_UNORM}, + {1024, 1024, 1, 0, DXGI_FORMAT_R8G8B8A8_UNORM}, }; if (!(device = create_device())) @@ -22902,7 +22906,6 @@ static void test_resource_allocation_info(void) } desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; - desc.MipLevels = 1; desc.SampleDesc.Count = 1; desc.SampleDesc.Quality = 0; desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; @@ -22913,6 +22916,7 @@ static void test_resource_allocation_info(void) desc.Width = texture_tests[i].width; desc.Height = texture_tests[i].height; desc.DepthOrArraySize = texture_tests[i].array_size; + desc.MipLevels = texture_tests[i].miplevels; desc.Format = texture_tests[i].format; desc.Alignment = 0; -- 2.19.2

2 1

[PATCH vkd3d v2 5/5] vkd3d: Implement d3d12_fence_SetName().
by Zhiyi Zhang Jan. 31, 2019

Jan. 31, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- libs/vkd3d/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 47c8854..9af1ec9 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -435,9 +435,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetName(ID3D12Fence *iface, const W { struct d3d12_fence *fence = impl_from_ID3D12Fence(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, fence->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, fence->device->wchar_size)); - return E_NOTIMPL; + return name ? S_OK : E_INVALIDARG; } static HRESULT STDMETHODCALLTYPE d3d12_fence_GetDevice(ID3D12Fence *iface, -- 2.20.1

2 1

[PATCH vkd3d v2 4/5] vkd3d: Implement d3d12_command_signature_SetName().
by Zhiyi Zhang Jan. 31, 2019

Jan. 31, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- libs/vkd3d/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index fa5f8fb..47c8854 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4975,9 +4975,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_signature_SetName(ID3D12CommandSi { struct d3d12_command_signature *signature = impl_from_ID3D12CommandSignature(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, signature->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, signature->device->wchar_size)); - return E_NOTIMPL; + return name ? S_OK : E_INVALIDARG; } static HRESULT STDMETHODCALLTYPE d3d12_command_signature_GetDevice(ID3D12CommandSignature *iface, -- 2.20.1

2 1

[PATCH vkd3d v2 3/5] vkd3d: Implement d3d12_root_signature_SetName().
by Zhiyi Zhang Jan. 31, 2019

Jan. 31, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- libs/vkd3d/state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index c419997..75feacc 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -150,9 +150,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_root_signature_SetName(ID3D12RootSignatur { struct d3d12_root_signature *root_signature = impl_from_ID3D12RootSignature(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, root_signature->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, root_signature->device->wchar_size)); - return E_NOTIMPL; + return name ? S_OK : E_INVALIDARG; } static HRESULT STDMETHODCALLTYPE d3d12_root_signature_GetDevice(ID3D12RootSignature *iface, -- 2.20.1

2 1

[PATCH vkd3d v2 2/5] vkd3d: Implement d3d12_pipeline_state_SetName().
by Zhiyi Zhang Jan. 31, 2019

Jan. 31, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- libs/vkd3d/state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 08f2f3c..c419997 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1195,9 +1195,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_SetName(ID3D12PipelineStat { struct d3d12_pipeline_state *state = impl_from_ID3D12PipelineState(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, state->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, state->device->wchar_size)); - return E_NOTIMPL; + return name ? S_OK : E_INVALIDARG; } static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_GetDevice(ID3D12PipelineState *iface, -- 2.20.1

2 1

[PATCH vkd3d v2 1/5] vkd3d: Implement d3d12_descriptor_heap_SetName().
by Zhiyi Zhang Jan. 31, 2019

Jan. 31, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Supersede 157123~157127,157532~157541 libs/vkd3d/resource.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index ced232d..34f558d 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2514,9 +2514,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_descriptor_heap_SetName(ID3D12DescriptorH { struct d3d12_descriptor_heap *heap = impl_from_ID3D12DescriptorHeap(iface); - FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, heap->device->wchar_size)); + TRACE("iface %p, name %s.\n", iface, debugstr_w(name, heap->device->wchar_size)); - return E_NOTIMPL; + return name ? S_OK : E_INVALIDARG; } static HRESULT STDMETHODCALLTYPE d3d12_descriptor_heap_GetDevice(ID3D12DescriptorHeap *iface, -- 2.20.1

2 1