From: Nikolay Sivov nsivov@codeweavers.com
--- tests/d3d12.c | 2 +- tests/driver.c | 2 +- tests/shader_runner.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/d3d12.c b/tests/d3d12.c index 8f100a5e7..649d86ec2 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1058,7 +1058,7 @@ static void test_format_support(void) } unsupported_format_features[] = { - /* A recent version of WARP suppots B8G8R8A8 UAVs even on D3D_FEATURE_LEVEL_11_0. */ + /* A recent version of WARP supports B8G8R8A8 UAVs even on D3D_FEATURE_LEVEL_11_0. */ {{DXGI_FORMAT_B8G8R8A8_TYPELESS, D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW, D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD | D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE}, true}, }; diff --git a/tests/driver.c b/tests/driver.c index 553417ada..504f51dfb 100644 --- a/tests/driver.c +++ b/tests/driver.c @@ -108,7 +108,7 @@ static enum program_result run_program(const char *cmdline, const char *log_file
if (!GetExitCodeProcess(info.hProcess, &exit_code)) { - fprintf(stderr, "Cannot retrive the process exit code, last error %ld.\n", GetLastError()); + fprintf(stderr, "Cannot retrieve the process exit code, last error %ld.\n", GetLastError()); ret = PROGRAM_RESULT_FAILURE; goto out; } diff --git a/tests/shader_runner.c b/tests/shader_runner.c index dadfe3338..7e5958144 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -803,7 +803,7 @@ static HRESULT map_unidentified_hrs(HRESULT hr) { if (hr == 0x80010064) { - trace("Mapping unindentified hr %#x as %#x.\n", hr, E_FAIL); + trace("Mapping unidentified hr %#x as %#x.\n", hr, E_FAIL); return E_FAIL; } return hr;
From: Nikolay Sivov nsivov@codeweavers.com
--- libs/vkd3d-shader/dxil.c | 8 ++++---- libs/vkd3d-shader/hlsl.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 2174ba52c..e21fdca16 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -1910,7 +1910,7 @@ static struct vkd3d_shader_src_param *instruction_src_params_alloc(struct vkd3d_ { ERR("Failed to allocate src params.\n"); vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, - "Out of memory allocating instruction src paramaters."); + "Out of memory allocating instruction src parameters."); return NULL; } ins->src = params; @@ -1926,7 +1926,7 @@ static struct vkd3d_shader_dst_param *instruction_dst_params_alloc(struct vkd3d_ { ERR("Failed to allocate dst params.\n"); vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, - "Out of memory allocating instruction dst paramaters."); + "Out of memory allocating instruction dst parameters."); return NULL; } ins->dst = params; @@ -2138,7 +2138,7 @@ static size_t sm6_parser_get_value_index(struct sm6_parser *sm6, uint64_t idx) WARN("Ignoring upper 32 bits of relative index.\n"); i = (uint32_t)sm6->value_count - (uint32_t)idx;
- /* This may underflow to produce a forward reference, but it must not exceeed the final value count. */ + /* This may underflow to produce a forward reference, but it must not exceed the final value count. */ if (i >= sm6->cur_max_value) { WARN("Invalid value index %"PRIx64" at %zu.\n", idx, sm6->value_count); @@ -3561,7 +3561,7 @@ static void sm6_parser_emit_cmp2(struct sm6_parser *sm6, const struct dxil_recor if (!(flags & FP_ALLOW_UNSAFE_ALGEBRA)) ins->flags |= VKD3DSI_PRECISE_X; flags &= ~FP_ALLOW_UNSAFE_ALGEBRA; - /* SPIR-V FPFastMathMode is only available in the Kernel executon model. */ + /* SPIR-V FPFastMathMode is only available in the Kernel execution model. */ silence_warning = !(flags & ~(FP_NO_NAN | FP_NO_INF | FP_NO_SIGNED_ZEROS | FP_ALLOW_RECIPROCAL)); } if (flags && silence_warning) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index f1eaf6c25..615529c17 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -372,7 +372,7 @@ struct hlsl_attribute /* Reservation of a register and/or an offset for objects inside constant buffers, to be used as a * starting point of their allocation. They are available through the register(·) and the * packoffset(·) syntaxes, respectivelly. - * The costant buffer offset is measured register components. */ + * The constant buffer offset is measured register components. */ struct hlsl_reg_reservation { char reg_type;
From: Nikolay Sivov nsivov@codeweavers.com
--- libs/vkd3d/command.c | 2 +- libs/vkd3d/state.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 37484e5ea..77d0f2751 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2536,7 +2536,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_Reset(ID3D12GraphicsCommandL static void STDMETHODCALLTYPE d3d12_command_list_ClearState(ID3D12GraphicsCommandList5 *iface, ID3D12PipelineState *pipeline_state) { - FIXME("iface %p, pipline_state %p stub!\n", iface, pipeline_state); + FIXME("iface %p, pipeline_state %p stub!\n", iface, pipeline_state); }
static bool d3d12_command_list_has_depth_stencil_view(struct d3d12_command_list *list) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 2545c0f04..2b83cfd85 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -836,7 +836,7 @@ static unsigned int vk_heap_binding_count_from_descriptor_range(const struct d3d else { /* Prefer an unsupported binding count vs a zero count, because shader compilation will fail - * to match a declaration to a zero binding, resulting in failure of pipline state creation. */ + * to match a declaration to a zero binding, resulting in failure of pipeline state creation. */ return max_count + !max_count; } } @@ -3236,7 +3236,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->ms_desc.alphaToCoverageEnable = desc->BlendState.AlphaToCoverageEnable; graphics->ms_desc.alphaToOneEnable = VK_FALSE;
- /* We defer creating the render pass for pipelines wth DSVFormat equal to + /* We defer creating the render pass for pipelines with DSVFormat equal to * DXGI_FORMAT_UNKNOWN. We take the actual DSV format from the bound DSV. */ if (is_dsv_format_unknown) graphics->render_pass = VK_NULL_HANDLE; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 969ea8c44..148ee6c98 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1099,7 +1099,7 @@ HRESULT d3d12_query_heap_create(struct d3d12_device *device, struct d3d12_query_heap *unsafe_impl_from_ID3D12QueryHeap(ID3D12QueryHeap *iface);
/* A Vulkan query has to be issued at least one time before the result is - * available. In D3D12 it is legal to get query reults for not issued queries. + * available. In D3D12 it is legal to get query results for not issued queries. */ static inline bool d3d12_query_heap_is_result_available(const struct d3d12_query_heap *heap, unsigned int query_index)
This merge request was approved by Henri Verbeet.
This merge request was approved by Giovanni Mascellani.
-
Giovanni Mascellani (＠giomasce) -
Henri Verbeet (＠hverbeet)
-
Nikolay Sivov
-
Nikolay Sivov (＠nsivov)