Signed-off-by: Chip Davis cdavis@codeweavers.com --- libs/vkd3d/command.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 116a8a6..15cc834 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2932,7 +2932,7 @@ static bool d3d12_command_list_update_compute_state(struct d3d12_command_list *l if (!d3d12_command_list_update_compute_pipeline(list)) return false;
- d3d12_command_list_update_descriptors(list, VK_PIPELINE_BIND_POINT_COMPUTE); + d3d12_command_list_update_descriptors(list, VKD3D_PIPELINE_BIND_POINT_COMPUTE);
return true; } @@ -2949,7 +2949,7 @@ static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list if (!d3d12_command_list_update_current_framebuffer(list)) return false;
- d3d12_command_list_update_descriptors(list, VK_PIPELINE_BIND_POINT_GRAPHICS); + d3d12_command_list_update_descriptors(list, VKD3D_PIPELINE_BIND_POINT_GRAPHICS);
if (list->current_render_pass != VK_NULL_HANDLE) return true; @@ -4087,7 +4087,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootSignature(ID3D12G
TRACE("iface %p, root_signature %p.\n", iface, root_signature);
- d3d12_command_list_set_root_signature(list, VK_PIPELINE_BIND_POINT_COMPUTE, + d3d12_command_list_set_root_signature(list, VKD3D_PIPELINE_BIND_POINT_COMPUTE, unsafe_impl_from_ID3D12RootSignature(root_signature)); }
@@ -4098,7 +4098,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootSignature(ID3D12
TRACE("iface %p, root_signature %p.\n", iface, root_signature);
- d3d12_command_list_set_root_signature(list, VK_PIPELINE_BIND_POINT_GRAPHICS, + d3d12_command_list_set_root_signature(list, VKD3D_PIPELINE_BIND_POINT_GRAPHICS, unsafe_impl_from_ID3D12RootSignature(root_signature)); }
@@ -4124,7 +4124,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootDescriptorTable(I TRACE("iface %p, root_parameter_index %u, base_descriptor %#"PRIx64".\n", iface, root_parameter_index, base_descriptor.ptr);
- d3d12_command_list_set_descriptor_table(list, VK_PIPELINE_BIND_POINT_COMPUTE, + d3d12_command_list_set_descriptor_table(list, VKD3D_PIPELINE_BIND_POINT_COMPUTE, root_parameter_index, base_descriptor); }
@@ -4136,7 +4136,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootDescriptorTable( TRACE("iface %p, root_parameter_index %u, base_descriptor %#"PRIx64".\n", iface, root_parameter_index, base_descriptor.ptr);
- d3d12_command_list_set_descriptor_table(list, VK_PIPELINE_BIND_POINT_GRAPHICS, + d3d12_command_list_set_descriptor_table(list, VKD3D_PIPELINE_BIND_POINT_GRAPHICS, root_parameter_index, base_descriptor); }
@@ -4161,7 +4161,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRoot32BitConstant(ID3 TRACE("iface %p, root_parameter_index %u, data 0x%08x, dst_offset %u.\n", iface, root_parameter_index, data, dst_offset);
- d3d12_command_list_set_root_constants(list, VK_PIPELINE_BIND_POINT_COMPUTE, + d3d12_command_list_set_root_constants(list, VKD3D_PIPELINE_BIND_POINT_COMPUTE, root_parameter_index, dst_offset, 1, &data); }
@@ -4173,7 +4173,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRoot32BitConstant(ID TRACE("iface %p, root_parameter_index %u, data 0x%08x, dst_offset %u.\n", iface, root_parameter_index, data, dst_offset);
- d3d12_command_list_set_root_constants(list, VK_PIPELINE_BIND_POINT_GRAPHICS, + d3d12_command_list_set_root_constants(list, VKD3D_PIPELINE_BIND_POINT_GRAPHICS, root_parameter_index, dst_offset, 1, &data); }
@@ -4185,7 +4185,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRoot32BitConstants(ID TRACE("iface %p, root_parameter_index %u, constant_count %u, data %p, dst_offset %u.\n", iface, root_parameter_index, constant_count, data, dst_offset);
- d3d12_command_list_set_root_constants(list, VK_PIPELINE_BIND_POINT_COMPUTE, + d3d12_command_list_set_root_constants(list, VKD3D_PIPELINE_BIND_POINT_COMPUTE, root_parameter_index, dst_offset, constant_count, data); }
@@ -4197,7 +4197,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRoot32BitConstants(I TRACE("iface %p, root_parameter_index %u, constant_count %u, data %p, dst_offset %u.\n", iface, root_parameter_index, constant_count, data, dst_offset);
- d3d12_command_list_set_root_constants(list, VK_PIPELINE_BIND_POINT_GRAPHICS, + d3d12_command_list_set_root_constants(list, VKD3D_PIPELINE_BIND_POINT_GRAPHICS, root_parameter_index, dst_offset, constant_count, data); }
@@ -4252,7 +4252,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootConstantBufferVie TRACE("iface %p, root_parameter_index %u, address %#"PRIx64".\n", iface, root_parameter_index, address);
- d3d12_command_list_set_root_cbv(list, VK_PIPELINE_BIND_POINT_COMPUTE, root_parameter_index, address); + d3d12_command_list_set_root_cbv(list, VKD3D_PIPELINE_BIND_POINT_COMPUTE, root_parameter_index, address); }
static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootConstantBufferView( @@ -4263,7 +4263,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootConstantBufferVi TRACE("iface %p, root_parameter_index %u, address %#"PRIx64".\n", iface, root_parameter_index, address);
- d3d12_command_list_set_root_cbv(list, VK_PIPELINE_BIND_POINT_GRAPHICS, root_parameter_index, address); + d3d12_command_list_set_root_cbv(list, VKD3D_PIPELINE_BIND_POINT_GRAPHICS, root_parameter_index, address); }
static void d3d12_command_list_set_root_descriptor(struct d3d12_command_list *list, @@ -4908,7 +4908,7 @@ static void d3d12_command_list_clear_uav(struct d3d12_command_list *list,
d3d12_command_list_invalidate_current_pipeline(list); d3d12_command_list_invalidate_bindings(list, list->state); - d3d12_command_list_invalidate_root_parameters(list, VK_PIPELINE_BIND_POINT_COMPUTE); + d3d12_command_list_invalidate_root_parameters(list, VKD3D_PIPELINE_BIND_POINT_COMPUTE);
if (!d3d12_command_allocator_add_view(list->allocator, view)) WARN("Failed to add view.\n");
On Tue, 20 Jul 2021 at 20:24, Chip Davis cdavis@codeweavers.com wrote:
libs/vkd3d/command.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
I'm tempted to just sign off on this because it's an otherwise trivial patch, but that commit message is very poor.
July 22, 2021 4:15 AM, "Henri Verbeet" hverbeet@gmail.com wrote:
On Tue, 20 Jul 2021 at 20:24, Chip Davis cdavis@codeweavers.com wrote:
libs/vkd3d/command.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
I'm tempted to just sign off on this because it's an otherwise trivial patch, but that commit message is very poor.
What would you suggest instead? Something like, "vkd3d: Fix enum conversion warnings. (Clang)", perhaps?
Chip
On Fri, 23 Jul 2021 at 01:36, Chip Davis cdavis@codeweavers.com wrote:
July 22, 2021 4:15 AM, "Henri Verbeet" hverbeet@gmail.com wrote:
On Tue, 20 Jul 2021 at 20:24, Chip Davis cdavis@codeweavers.com wrote:
libs/vkd3d/command.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
I'm tempted to just sign off on this because it's an otherwise trivial patch, but that commit message is very poor.
What would you suggest instead? Something like, "vkd3d: Fix enum conversion warnings. (Clang)", perhaps?
As a rule of thumb, I'd suggest being specific about what the patch changes. In this particular case, perhaps something like "vkd3d: Pass vkd3d_pipeline_bind_point values to d3d12_command_list_update_descriptors() calls." That would require splitting the patch for the different functions it affects, but I don't think that's a bad thing.
-
Chip Davis -
Henri Verbeet