wine-commits January 2019

wine-commits@winehq.org

2 participants
499 discussions

Józef Kucia : vkd3d-shader: Use VKD3D_SHADER_DEBUG instead of VKD3D_DEBUG.
by Alexandre Julliard 31 Jan '19

31 Jan '19

Module: vkd3d Branch: master Commit: 97c3aa0cdca31ce06785b024acf81faef6429ac8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=97c3aa0cdca31ce06785b02… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 31 11:29:29 2019 +0100 vkd3d-shader: Use VKD3D_SHADER_DEBUG instead of VKD3D_DEBUG. 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_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 0718808..2bfdad0 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -20,7 +20,7 @@ #include <stdio.h> -VKD3D_DEBUG_ENV_NAME("VKD3D_DEBUG"); +VKD3D_DEBUG_ENV_NAME("VKD3D_SHADER_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);

1 0

Józef Kucia : vkd3d-common: Add support for naming debug environment variable.
by Alexandre Julliard 31 Jan '19

31 Jan '19

Module: vkd3d Branch: master Commit: 52015b30b3ef8ac240842180284949cb51eadeda URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=52015b30b3ef8ac24084218… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 31 11:29:28 2019 +0100 vkd3d-common: Add support for naming debug environment variable. 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 | 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 e5e938d..8b4c77d 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 b838045..ee23ab0 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 dfd6b72..0718808 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 fa6e5f8..03f9f52 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 63dabda..ba55056 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) {

1 0

Józef Kucia : vkd3d-shader: Move VKD3D_SHADER_DUMP_PATH implementation from libvkd3d.
by Alexandre Julliard 31 Jan '19

31 Jan '19

Module: vkd3d Branch: master Commit: 1ae1f831f62664a6e904bb2e9e0651692e968b33 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1ae1f831f62664a6e904bb2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 31 11:29:27 2019 +0100 vkd3d-shader: Move VKD3D_SHADER_DUMP_PATH implementation from libvkd3d. 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/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 8769513..cb7452b 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 73a9236..dfd6b72 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 e08f1f3..ba5875c 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 75feacc..8aff2f2 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);

1 0

Józef Kucia : tests: Add tests for image memory allocation info with various miplevels.
by Alexandre Julliard 31 Jan '19

31 Jan '19

Module: vkd3d Branch: master Commit: ad29886691d076ed071019716d97ad929fef9860 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ad29886691d076ed0710197… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 31 11:29:26 2019 +0100 tests: Add tests for image memory allocation info with various miplevels. 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> --- tests/d3d12.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 2121473..1b6b917 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;

1 0

Zhiyi Zhang : vkd3d: Implement d3d12_fence_SetName().
by Alexandre Julliard 31 Jan '19

31 Jan '19

Module: vkd3d Branch: master Commit: f181334c542a1bfb392e950fedd7b058a37416f5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f181334c542a1bfb392e950… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jan 31 17:08:06 2019 +0800 vkd3d: Implement d3d12_fence_SetName(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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,

1 0

Zhiyi Zhang : vkd3d: Implement d3d12_command_signature_SetName().
by Alexandre Julliard 31 Jan '19

31 Jan '19

Module: vkd3d Branch: master Commit: 21b71be40ef357314f37bbdb5f7857b530652c13 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=21b71be40ef357314f37bbd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jan 31 17:07:54 2019 +0800 vkd3d: Implement d3d12_command_signature_SetName(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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,

1 0

Zhiyi Zhang : vkd3d: Implement d3d12_root_signature_SetName().
by Alexandre Julliard 31 Jan '19

31 Jan '19

Module: vkd3d Branch: master Commit: 252af95ba04e08a40cfde71030b226992b02d2e4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=252af95ba04e08a40cfde71… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jan 31 17:07:41 2019 +0800 vkd3d: Implement d3d12_root_signature_SetName(). Signed-off-by: Zhiyi Zhang <zzhang(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 | 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,

1 0

Zhiyi Zhang : vkd3d: Implement d3d12_pipeline_state_SetName().
by Alexandre Julliard 31 Jan '19

31 Jan '19

Module: vkd3d Branch: master Commit: 225242c0b1120642a30c5da2cee64656d9a1535f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=225242c0b1120642a30c5da… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jan 31 17:07:28 2019 +0800 vkd3d: Implement d3d12_pipeline_state_SetName(). Signed-off-by: Zhiyi Zhang <zzhang(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 | 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,

1 0

Zhiyi Zhang : vkd3d: Implement d3d12_descriptor_heap_SetName().
by Alexandre Julliard 31 Jan '19

31 Jan '19

Module: vkd3d Branch: master Commit: 3718e471331893f81a2be16b7cd0a20a3f45fd96 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3718e471331893f81a2be16… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jan 31 17:07:10 2019 +0800 vkd3d: Implement d3d12_descriptor_heap_SetName(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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,

1 0

Matteo Bruni : d3d8: Take usage flags into account when assigning map flags.
by Alexandre Julliard 30 Jan '19

30 Jan '19

Module: wine Branch: master Commit: 7003ba44892d39ec0f409c793b97a0c5f4ae72d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7003ba44892d39ec0f409c79… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 30 16:25:59 2019 +0100 d3d8: Take usage flags into account when assigning map flags. 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> --- dlls/d3d8/buffer.c | 18 ++++++++++++------ dlls/d3d8/d3d8_private.h | 5 +++-- dlls/d3d8/device.c | 6 +++--- dlls/d3d8/surface.c | 2 +- dlls/d3d8/volume.c | 2 +- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 0a6767b..5454d57 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -188,6 +188,7 @@ static HRESULT WINAPI d3d8_vertexbuffer_Lock(IDirect3DVertexBuffer8 *iface, UINT BYTE **data, DWORD flags) { struct d3d8_vertexbuffer *buffer = impl_from_IDirect3DVertexBuffer8(iface); + struct wined3d_resource *wined3d_resource; struct wined3d_map_desc wined3d_map_desc; struct wined3d_box wined3d_box = {0}; HRESULT hr; @@ -198,8 +199,9 @@ static HRESULT WINAPI d3d8_vertexbuffer_Lock(IDirect3DVertexBuffer8 *iface, UINT wined3d_box.left = offset; wined3d_box.right = offset + size; wined3d_mutex_lock(); - hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), - 0, &wined3d_map_desc, &wined3d_box, wined3dmapflags_from_d3dmapflags(flags)); + wined3d_resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); + hr = wined3d_resource_map(wined3d_resource, 0, &wined3d_map_desc, &wined3d_box, + wined3dmapflags_from_d3dmapflags(flags, buffer->usage)); wined3d_mutex_unlock(); *data = wined3d_map_desc.data; @@ -235,7 +237,7 @@ static HRESULT WINAPI d3d8_vertexbuffer_GetDesc(IDirect3DVertexBuffer8 *iface, desc->Format = D3DFMT_VERTEXDATA; desc->Type = D3DRTYPE_VERTEXBUFFER; - desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage, wined3d_desc.bind_flags); + desc->Usage = buffer->usage; desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->Size = wined3d_desc.size; desc->FVF = buffer->fvf; @@ -296,6 +298,7 @@ HRESULT vertexbuffer_init(struct d3d8_vertexbuffer *buffer, struct d3d8_device * buffer->IDirect3DVertexBuffer8_iface.lpVtbl = &Direct3DVertexBuffer8_Vtbl; d3d8_resource_init(&buffer->resource); buffer->fvf = fvf; + buffer->usage = usage; desc.byte_width = size; desc.usage = usage & WINED3DUSAGE_MASK; @@ -509,6 +512,7 @@ static HRESULT WINAPI d3d8_indexbuffer_Lock(IDirect3DIndexBuffer8 *iface, UINT o BYTE **data, DWORD flags) { struct d3d8_indexbuffer *buffer = impl_from_IDirect3DIndexBuffer8(iface); + struct wined3d_resource *wined3d_resource; struct wined3d_map_desc wined3d_map_desc; struct wined3d_box wined3d_box = {0}; HRESULT hr; @@ -519,8 +523,9 @@ static HRESULT WINAPI d3d8_indexbuffer_Lock(IDirect3DIndexBuffer8 *iface, UINT o wined3d_box.left = offset; wined3d_box.right = offset + size; wined3d_mutex_lock(); - hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), - 0, &wined3d_map_desc, &wined3d_box, wined3dmapflags_from_d3dmapflags(flags)); + wined3d_resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); + hr = wined3d_resource_map(wined3d_resource, 0, &wined3d_map_desc, &wined3d_box, + wined3dmapflags_from_d3dmapflags(flags, buffer->usage)); wined3d_mutex_unlock(); *data = wined3d_map_desc.data; @@ -556,7 +561,7 @@ static HRESULT WINAPI d3d8_indexbuffer_GetDesc(IDirect3DIndexBuffer8 *iface, desc->Format = d3dformat_from_wined3dformat(buffer->format); desc->Type = D3DRTYPE_INDEXBUFFER; - desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage, wined3d_desc.bind_flags); + desc->Usage = buffer->usage; desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->Size = wined3d_desc.size; @@ -627,6 +632,7 @@ HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *de buffer->IDirect3DIndexBuffer8_iface.lpVtbl = &d3d8_indexbuffer_vtbl; d3d8_resource_init(&buffer->resource); buffer->format = wined3dformat_from_d3dformat(format); + buffer->usage = usage; wined3d_mutex_lock(); hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, parent_ops, &buffer->wined3d_buffer); diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 81f4e20..955de86 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -208,7 +208,7 @@ struct d3d8_vertexbuffer struct wined3d_buffer *wined3d_buffer; IDirect3DDevice8 *parent_device; struct wined3d_buffer *draw_buffer; - DWORD fvf; + DWORD fvf, usage; }; HRESULT vertexbuffer_init(struct d3d8_vertexbuffer *buffer, struct d3d8_device *device, @@ -223,6 +223,7 @@ struct d3d8_indexbuffer IDirect3DDevice8 *parent_device; struct wined3d_buffer *draw_buffer; enum wined3d_format_id format; + DWORD usage; }; HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *device, @@ -282,7 +283,7 @@ HRESULT d3d8_pixel_shader_init(struct d3d8_pixel_shader *shader, struct d3d8_dev D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_HIDDEN; -unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags) DECLSPEC_HIDDEN; +unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags, unsigned int usage) DECLSPEC_HIDDEN; void load_local_constants(const DWORD *d3d8_elements, struct wined3d_shader *wined3d_vertex_shader) DECLSPEC_HIDDEN; size_t parse_token(const DWORD *pToken) DECLSPEC_HIDDEN; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index a113e57..0a7f477 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -142,7 +142,7 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) } } -unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags) +unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags, unsigned int usage) { static const unsigned int handled = D3DLOCK_NOSYSLOCK | D3DLOCK_NOOVERWRITE @@ -151,12 +151,12 @@ unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags) unsigned int wined3d_flags; wined3d_flags = flags & handled; - if (!(flags & (D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD))) + if (~usage & D3DUSAGE_WRITEONLY && !(flags & (D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD))) wined3d_flags |= WINED3D_MAP_READ; if (!(flags & D3DLOCK_READONLY)) wined3d_flags |= WINED3D_MAP_WRITE; if (!(wined3d_flags & (WINED3D_MAP_READ | WINED3D_MAP_WRITE))) - wined3d_flags |= WINED3D_MAP_READ | WINED3D_MAP_WRITE; + wined3d_flags |= WINED3D_MAP_WRITE; flags &= ~(handled | D3DLOCK_READONLY); if (flags) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 0d87937..2edc51d 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -245,7 +245,7 @@ static HRESULT WINAPI d3d8_surface_LockRect(IDirect3DSurface8 *iface, } hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx, - &map_desc, rect ? &box : NULL, wined3dmapflags_from_d3dmapflags(flags)); + &map_desc, rect ? &box : NULL, wined3dmapflags_from_d3dmapflags(flags, 0)); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 00dd78a..26e0617 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -149,7 +149,7 @@ static HRESULT WINAPI d3d8_volume_LockBox(IDirect3DVolume8 *iface, wined3d_mutex_lock(); if (FAILED(hr = wined3d_resource_map(wined3d_texture_get_resource(volume->wined3d_texture), volume->sub_resource_idx, &map_desc, (const struct wined3d_box *)box, - wined3dmapflags_from_d3dmapflags(flags)))) + wined3dmapflags_from_d3dmapflags(flags, 0)))) map_desc.data = NULL; wined3d_mutex_unlock();

1 0

← Newer
1
2
3
4
5
6
7
...
50
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 January 2019