July 2021 - Wine-Commits - list.winehq.org

Chip Davis : vkd3d: Pass vkd3d_pipeline_bind_point values to set_root_constants() calls.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: vkd3d Branch: master Commit: 777b9dfc0e170c15eeb5180de88ab2fd5d5231bf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=777b9dfc0e170c15eeb5180… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Tue Jul 27 22:45:57 2021 -0500 vkd3d: Pass vkd3d_pipeline_bind_point values to set_root_constants() calls. Signed-off-by: Chip Davis <cdavis(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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 6cdbdc7..cc40334 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4162,7 +4162,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); } @@ -4174,7 +4174,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); } @@ -4186,7 +4186,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); } @@ -4198,7 +4198,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); }

1 0

Chip Davis : vkd3d: Pass vkd3d_pipeline_bind_point values to invalidate_root_parameters() calls.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: vkd3d Branch: master Commit: 5812aa17c6274c851fcf7bec910dd4d86cb9af80 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5812aa17c6274c851fcf7be… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Tue Jul 27 22:45:59 2021 -0500 vkd3d: Pass vkd3d_pipeline_bind_point values to invalidate_root_parameters() calls. Signed-off-by: Chip Davis <cdavis(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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 33239b8..7150c59 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4909,7 +4909,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");

1 0

Chip Davis : vkd3d: Pass vkd3d_pipeline_bind_point values to set_descriptor_table() calls.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: vkd3d Branch: master Commit: cad0d6770b39c436c95b92b1f0fd9ef20dfbc2a8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cad0d6770b39c436c95b92b… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Tue Jul 27 22:45:56 2021 -0500 vkd3d: Pass vkd3d_pipeline_bind_point values to set_descriptor_table() calls. Signed-off-by: Chip Davis <cdavis(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 fb93068..6cdbdc7 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4125,7 +4125,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); } @@ -4137,7 +4137,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); }

1 0

Chip Davis : vkd3d: Pass vkd3d_pipeline_bind_point values to set_root_signature() calls.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: vkd3d Branch: master Commit: 829c861af43f7849467515abf123fade8dcfbcb4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=829c861af43f7849467515a… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Tue Jul 27 22:45:55 2021 -0500 vkd3d: Pass vkd3d_pipeline_bind_point values to set_root_signature() calls. Signed-off-by: Chip Davis <cdavis(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 bc502c0..fb93068 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4088,7 +4088,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)); } @@ -4099,7 +4099,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)); }

1 0

Chip Davis : vkd3d: Pass vkd3d_pipeline_bind_point values to update_descriptors() calls.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: vkd3d Branch: master Commit: 4e383bf0fae39c89d3a08d8746a0a61446ac3326 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4e383bf0fae39c89d3a08d8… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Tue Jul 27 22:45:54 2021 -0500 vkd3d: Pass vkd3d_pipeline_bind_point values to update_descriptors() calls. Signed-off-by: Chip Davis <cdavis(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 93c519a..bc502c0 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2933,7 +2933,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; } @@ -2950,7 +2950,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;

1 0

Zebediah Figura : vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_descriptor_ranges().
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: vkd3d Branch: master Commit: a0fc2a20f3ffd8fcab6cee4127258530e06978bb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a0fc2a20f3ffd8fcab6cee4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 27 16:06:46 2021 -0500 vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_descriptor_ranges(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index c076b0f..2151869 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2986,7 +2986,7 @@ static void shader_write_root_signature_header(struct root_signature_writer_cont context->chunk_position = bytecode_get_size(buffer); } -static int shader_write_descriptor_ranges(struct root_signature_writer_context *context, +static void shader_write_descriptor_ranges(struct vkd3d_bytecode_buffer *buffer, const struct vkd3d_shader_root_descriptor_table *table) { const struct vkd3d_shader_descriptor_range *ranges = table->descriptor_ranges; @@ -2994,24 +2994,12 @@ static int shader_write_descriptor_ranges(struct root_signature_writer_context * for (i = 0; i < table->descriptor_range_count; ++i) { - if (!write_dword(context, ranges[i].range_type)) - goto fail; - if (!write_dword(context, ranges[i].descriptor_count)) - goto fail; - if (!write_dword(context, ranges[i].base_shader_register)) - goto fail; - if (!write_dword(context, ranges[i].register_space)) - goto fail; - if (!write_dword(context, ranges[i].descriptor_table_offset)) - goto fail; + put_u32(buffer, ranges[i].range_type); + put_u32(buffer, ranges[i].descriptor_count); + put_u32(buffer, ranges[i].base_shader_register); + put_u32(buffer, ranges[i].register_space); + put_u32(buffer, ranges[i].descriptor_table_offset); } - - return VKD3D_OK; - -fail: - vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, - "Out of memory while writing root signature descriptor ranges."); - return VKD3D_ERROR_OUT_OF_MEMORY; } static int shader_write_descriptor_ranges1(struct root_signature_writer_context *context, @@ -3047,12 +3035,15 @@ fail: static int shader_write_descriptor_table(struct root_signature_writer_context *context, const struct vkd3d_shader_root_descriptor_table *table) { + struct vkd3d_bytecode_buffer *buffer = &context->buffer; + if (!write_dword(context, table->descriptor_range_count)) goto fail; if (!write_dword(context, get_chunk_offset(context) + sizeof(DWORD))) /* offset */ goto fail; - return shader_write_descriptor_ranges(context, table); + shader_write_descriptor_ranges(buffer, table); + return VKD3D_OK; fail: vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY,

1 0

Conor McCarthy : vkd3d-shader: Replace individual SpvCapability bit fields with an array.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: vkd3d Branch: master Commit: 82237796ad1b66ab6d714c254e47b7a842ebd8dd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=82237796ad1b66ab6d714c2… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jul 27 23:40:00 2021 +1000 vkd3d-shader: Replace individual SpvCapability bit fields with an array. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 51 ++++++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 2ea7046..4fa9482 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -334,8 +334,9 @@ static bool vkd3d_spirv_stream_append(struct vkd3d_spirv_stream *dst_stream, struct vkd3d_spirv_builder { uint64_t capability_mask; - uint64_t capability_draw_parameters : 1; - uint64_t capability_demote_to_helper_invocation : 1; + SpvCapability *capabilities; + size_t capabilities_size; + size_t capabilities_count; uint32_t ext_instr_set_glsl_450; uint32_t invocation_count; SpvExecutionModel execution_model; @@ -371,25 +372,37 @@ static uint32_t vkd3d_spirv_alloc_id(struct vkd3d_spirv_builder *builder) return builder->current_id++; } +static bool vkd3d_spirv_capability_is_enabled(struct vkd3d_spirv_builder *builder, + SpvCapability cap) +{ + size_t i; + + if (cap < sizeof(builder->capability_mask) * CHAR_BIT) + return (builder->capability_mask >> cap) & 1; + + for (i = 0; i < builder->capabilities_count; ++i) + if (builder->capabilities[i] == cap) + return true; + + return false; +} + static void vkd3d_spirv_enable_capability(struct vkd3d_spirv_builder *builder, SpvCapability cap) { if (cap < sizeof(builder->capability_mask) * CHAR_BIT) { builder->capability_mask |= 1ull << cap; + return; } - else if (cap == SpvCapabilityDrawParameters) - { - builder->capability_draw_parameters = 1; - } - else if (cap == SpvCapabilityDemoteToHelperInvocationEXT) - { - builder->capability_demote_to_helper_invocation = 1; - } - else - { - FIXME("Unhandled capability %#x.\n", cap); - } + + if (vkd3d_spirv_capability_is_enabled(builder, cap)) + return; + + vkd3d_array_reserve((void **)&builder->capabilities, &builder->capabilities_size, + builder->capabilities_count + 1, sizeof(*builder->capabilities)); + + builder->capabilities[builder->capabilities_count++] = cap; } static uint32_t vkd3d_spirv_get_glsl_std450_instr_set(struct vkd3d_spirv_builder *builder) @@ -1801,15 +1814,13 @@ static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, vkd3d_spirv_build_op_capability(&stream, i); capability_mask >>= 1; } - if (builder->capability_draw_parameters) - vkd3d_spirv_build_op_capability(&stream, SpvCapabilityDrawParameters); - if (builder->capability_demote_to_helper_invocation) - vkd3d_spirv_build_op_capability(&stream, SpvCapabilityDemoteToHelperInvocationEXT); + for (i = 0; i < builder->capabilities_count; ++i) + vkd3d_spirv_build_op_capability(&stream, builder->capabilities[i]); /* extensions */ - if (builder->capability_draw_parameters) + if (vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityDrawParameters)) vkd3d_spirv_build_op_extension(&stream, "SPV_KHR_shader_draw_parameters"); - if (builder->capability_demote_to_helper_invocation) + if (vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityDemoteToHelperInvocationEXT)) vkd3d_spirv_build_op_extension(&stream, "SPV_EXT_demote_to_helper_invocation"); if (builder->ext_instr_set_glsl_450)

1 0

Conor McCarthy : vkd3d-shader: Exclude descriptor arrays from combined sampler searches.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: vkd3d Branch: master Commit: 5bebfe264d4e90c3f8fd73dddee49843b207a039 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5bebfe264d4e90c3f8fd73d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jul 27 23:39:58 2021 +1000 vkd3d-shader: Exclude descriptor arrays from combined sampler searches. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 23d1fcc..584f7c1 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2457,7 +2457,10 @@ static bool vkd3d_dxbc_compiler_has_combined_sampler(const struct vkd3d_dxbc_com if (!shader_interface->combined_sampler_count) return false; - if (resource && resource->reg.reg.type == VKD3DSPR_UAV) + if (resource && (resource->reg.reg.type == VKD3DSPR_UAV || resource->range.last != resource->range.first)) + return false; + + if (sampler && sampler->range.first != sampler->range.last) return false; for (i = 0; i < shader_interface->combined_sampler_count; ++i)

1 0

Zebediah Figura : vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_descriptor_table().
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: vkd3d Branch: master Commit: d1671829d946a7b0e4915a516b39a6a06513e9d9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d1671829d946a7b0e4915a5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 27 16:06:48 2021 -0500 vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_descriptor_table(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 368f59c..0ee4fe2 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -3019,23 +3019,15 @@ static void shader_write_descriptor_ranges1(struct vkd3d_bytecode_buffer *buffer } } -static int shader_write_descriptor_table(struct root_signature_writer_context *context, +static void shader_write_descriptor_table(struct root_signature_writer_context *context, const struct vkd3d_shader_root_descriptor_table *table) { struct vkd3d_bytecode_buffer *buffer = &context->buffer; - if (!write_dword(context, table->descriptor_range_count)) - goto fail; - if (!write_dword(context, get_chunk_offset(context) + sizeof(DWORD))) /* offset */ - goto fail; + put_u32(buffer, table->descriptor_range_count); + put_u32(buffer, get_chunk_offset(context) + sizeof(uint32_t)); /* offset */ shader_write_descriptor_ranges(buffer, table); - return VKD3D_OK; - -fail: - vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, - "Out of memory while writing root signature root descriptor table."); - return VKD3D_ERROR_OUT_OF_MEMORY; } static int shader_write_descriptor_table1(struct root_signature_writer_context *context, @@ -3131,13 +3123,15 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co for (i = 0; i < parameter_count; ++i) { + ret = VKD3D_OK; + set_u32(buffer, parameters_position + ((3 * i + 2) * sizeof(uint32_t)), get_chunk_offset(context)); switch (versioned_root_signature_get_parameter_type(desc, i)) { case VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: if (desc->version == VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_0) - ret = shader_write_descriptor_table(context, &desc->u.v_1_0.parameters[i].u.descriptor_table); + shader_write_descriptor_table(context, &desc->u.v_1_0.parameters[i].u.descriptor_table); else ret = shader_write_descriptor_table1(context, &desc->u.v_1_1.parameters[i].u.descriptor_table); break;

1 0

Zebediah Figura : vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_descriptor_ranges1().
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: vkd3d Branch: master Commit: 6f8be6c208e8e80a76a5b77e28c29739e54be6ab URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6f8be6c208e8e80a76a5b77… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 27 16:06:47 2021 -0500 vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_descriptor_ranges1(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 2151869..368f59c 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -3002,7 +3002,7 @@ static void shader_write_descriptor_ranges(struct vkd3d_bytecode_buffer *buffer, } } -static int shader_write_descriptor_ranges1(struct root_signature_writer_context *context, +static void shader_write_descriptor_ranges1(struct vkd3d_bytecode_buffer *buffer, const struct vkd3d_shader_root_descriptor_table1 *table) { const struct vkd3d_shader_descriptor_range1 *ranges = table->descriptor_ranges; @@ -3010,26 +3010,13 @@ static int shader_write_descriptor_ranges1(struct root_signature_writer_context for (i = 0; i < table->descriptor_range_count; ++i) { - if (!write_dword(context, ranges[i].range_type)) - goto fail; - if (!write_dword(context, ranges[i].descriptor_count)) - goto fail; - if (!write_dword(context, ranges[i].base_shader_register)) - goto fail; - if (!write_dword(context, ranges[i].register_space)) - goto fail; - if (!write_dword(context, ranges[i].flags)) - goto fail; - if (!write_dword(context, ranges[i].descriptor_table_offset)) - goto fail; + put_u32(buffer, ranges[i].range_type); + put_u32(buffer, ranges[i].descriptor_count); + put_u32(buffer, ranges[i].base_shader_register); + put_u32(buffer, ranges[i].register_space); + put_u32(buffer, ranges[i].flags); + put_u32(buffer, ranges[i].descriptor_table_offset); } - - return VKD3D_OK; - -fail: - vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, - "Out of memory while writing root signature descriptor ranges."); - return VKD3D_ERROR_OUT_OF_MEMORY; } static int shader_write_descriptor_table(struct root_signature_writer_context *context, @@ -3054,12 +3041,15 @@ fail: static int shader_write_descriptor_table1(struct root_signature_writer_context *context, const struct vkd3d_shader_root_descriptor_table1 *table) { + struct vkd3d_bytecode_buffer *buffer = &context->buffer; + if (!write_dword(context, table->descriptor_range_count)) goto fail; if (!write_dword(context, get_chunk_offset(context) + sizeof(DWORD))) /* offset */ goto fail; - return shader_write_descriptor_ranges1(context, table); + shader_write_descriptor_ranges1(buffer, table); + return VKD3D_OK; fail: vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY,

1 0