[PATCH 0/7] MR597: vkd3d: Use debugstr_hresult() in state.c and vkd3d_main.c.
From: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 82782e7d5..ed6bd8802 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2270,7 +2270,7 @@ static HRESULT vkd3d_create_compute_pipeline(struct d3d12_device *device, VK_CALL(vkDestroyShaderModule(device->vk_device, pipeline_info.stage.module, NULL)); if (vr < 0) { - WARN("Failed to create Vulkan compute pipeline, hr %#x.\n", hr); + WARN("Failed to create Vulkan compute pipeline, hr %s.\n", debugstr_hresult(hr)); return hresult_from_vk_result(vr); } -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/597
From: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index ed6bd8802..5044364b1 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2398,7 +2398,7 @@ static HRESULT d3d12_pipeline_state_find_and_init_uav_counters(struct d3d12_pipe } if (FAILED(hr = d3d12_pipeline_state_init_uav_counters(state, device, root_signature, &shader_info, stage_flags))) - WARN("Failed to create descriptor set layout for UAV counters, hr %#x.\n", hr); + WARN("Failed to create descriptor set layout for UAV counters, hr %s.\n", debugstr_hresult(hr)); vkd3d_shader_free_scan_descriptor_info(&shader_info); -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/597
From: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 5044364b1..dda76ab79 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2472,7 +2472,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st if (FAILED(hr = vkd3d_create_compute_pipeline(device, &desc->cs, &shader_interface, vk_pipeline_layout, &state->u.compute.vk_pipeline))) { - WARN("Failed to create Vulkan compute pipeline, hr %#x.\n", hr); + WARN("Failed to create Vulkan compute pipeline, hr %s.\n", debugstr_hresult(hr)); d3d12_pipeline_uav_counter_state_cleanup(&state->uav_counters, device); return hr; } -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/597
From: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/state.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index dda76ab79..8468dc79b 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -4026,14 +4026,14 @@ HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d if (FAILED(hr = vkd3d_create_descriptor_set_layout(device, 0, 1, false, &set_binding, set_layouts[i].set_layout))) { - ERR("Failed to create descriptor set layout %u, hr %#x.\n", i, hr); + ERR("Failed to create descriptor set layout %u, hr %s.\n", i, debugstr_hresult(hr)); goto fail; } if (FAILED(hr = vkd3d_create_pipeline_layout(device, 1, set_layouts[i].set_layout, 1, &push_constant_range, set_layouts[i].pipeline_layout))) { - ERR("Failed to create pipeline layout %u, hr %#x.\n", i, hr); + ERR("Failed to create pipeline layout %u, hr %s.\n", i, debugstr_hresult(hr)); goto fail; } } @@ -4071,7 +4071,7 @@ HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d vkd3d_shader_free_shader_code(&dxbc); if (FAILED(hr)) { - ERR("Failed to create compute pipeline %u, hr %#x.\n", i, hr); + ERR("Failed to create compute pipeline %u, hr %s.\n", i, debugstr_hresult(hr)); goto fail; } } -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/597
From: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/vkd3d_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 245edb5ae..73c0a6aba 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -60,7 +60,7 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, } else if (FAILED(hr = vkd3d_create_instance(create_info->instance_create_info, &instance))) { - WARN("Failed to create instance, hr %#x.\n", hr); + WARN("Failed to create instance, hr %s.\n", debugstr_hresult(hr)); return E_FAIL; } -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/597
From: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/vkd3d_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 73c0a6aba..6758d3026 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -456,7 +456,7 @@ HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, if (error_blob && messages) { if (FAILED(hr = vkd3d_blob_create(messages, strlen(messages), error_blob))) - ERR("Failed to create error blob, hr %#x.\n", hr); + ERR("Failed to create error blob, hr %s.\n", debugstr_hresult(hr)); } return hresult_from_vkd3d_result(ret); } @@ -464,7 +464,7 @@ HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, if (FAILED(hr = vkd3d_blob_create((void *)dxbc.code, dxbc.size, blob))) { - WARN("Failed to create blob object, hr %#x.\n", hr); + WARN("Failed to create blob object, hr %s.\n", debugstr_hresult(hr)); vkd3d_shader_free_shader_code(&dxbc); } return hr; -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/597
From: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/vkd3d_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 6758d3026..0139de5dd 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -497,7 +497,7 @@ HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGN if (error_blob && messages) { if (FAILED(hr = vkd3d_blob_create(messages, strlen(messages), error_blob))) - ERR("Failed to create error blob, hr %#x.\n", hr); + ERR("Failed to create error blob, hr %s.\n", debugstr_hresult(hr)); } return hresult_from_vkd3d_result(ret); } @@ -505,7 +505,7 @@ HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGN if (FAILED(hr = vkd3d_blob_create((void *)dxbc.code, dxbc.size, blob))) { - WARN("Failed to create blob object, hr %#x.\n", hr); + WARN("Failed to create blob object, hr %s.\n", debugstr_hresult(hr)); vkd3d_shader_free_shader_code(&dxbc); } return hr; -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/597
This merge request was approved by Giovanni Mascellani. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/597
participants (3)
-
Giovanni Mascellani (＠giomasce) -
Henri Verbeet
-
Henri Verbeet (＠hverbeet)