October 2018 - Wine-Devel - list.winehq.org

[PATCH vkd3d 7/7] vkd3d-shader: Add support for OpenGL atomic counters.
by Józef Kucia Oct. 17, 2018

Oct. 17, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 46 ++++++++++++++++++++++++++-------- 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/include/private/vkd3d_shader.h b/include/private/vkd3d_shader.h index 121fa7557384..f0ff82b8ce7f 100644 --- a/include/private/vkd3d_shader.h +++ b/include/private/vkd3d_shader.h @@ -96,6 +96,7 @@ struct vkd3d_shader_uav_counter_binding unsigned int register_index; /* u# */ struct vkd3d_shader_descriptor_binding binding; + unsigned int offset; }; struct vkd3d_shader_push_constant_buffer diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index fce6e03909b0..7cf58f8eb2f2 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1988,6 +1988,11 @@ static enum vkd3d_shader_target vkd3d_dxbc_compiler_get_target(const struct vkd3 return args ? args->target : VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0; } +static bool vkd3d_dxbc_compiler_is_opengl_target(const struct vkd3d_dxbc_compiler *compiler) +{ + return vkd3d_dxbc_compiler_get_target(compiler) == VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5; +} + static bool vkd3d_dxbc_compiler_check_shader_visibility(const struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_visibility visibility) { @@ -2062,6 +2067,9 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor { const struct vkd3d_shader_uav_counter_binding *current = &shader_interface->uav_counters[i]; + if (current->offset) + FIXME("Atomic counter offsets are not supported yet.\n"); + /* FIXME: Implement shader visibility for UAV counters. */ if (current->register_index == reg_idx) return current->binding; @@ -3837,11 +3845,11 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp const struct vkd3d_shader_register *reg, enum vkd3d_shader_resource_type resource_type, enum vkd3d_data_type resource_data_type, unsigned int structure_stride, bool raw) { - const SpvStorageClass storage_class = SpvStorageClassUniformConstant; + uint32_t counter_type_id, type_id, ptr_type_id, var_id, counter_var_id = 0; const struct vkd3d_shader_scan_info *scan_info = compiler->scan_info; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + SpvStorageClass storage_class = SpvStorageClassUniformConstant; const struct vkd3d_spirv_resource_type *resource_type_info; - uint32_t type_id, ptr_type_id, var_id, counter_var_id = 0; enum vkd3d_component_type sampled_type; struct vkd3d_symbol resource_symbol; bool is_uav; @@ -3872,6 +3880,15 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp if (is_uav && (scan_info->uav_counter_mask & (1u << reg->idx[0].offset))) { assert(structure_stride); /* counters are valid only for structured buffers */ + + if (vkd3d_dxbc_compiler_is_opengl_target(compiler)) + { + vkd3d_spirv_enable_capability(builder, SpvCapabilityAtomicStorage); + storage_class = SpvStorageClassAtomicCounter; + counter_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, counter_type_id); + } + counter_var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, ptr_type_id, storage_class, 0); @@ -5901,7 +5918,8 @@ static void vkd3d_dxbc_compiler_emit_uav_counter_instruction(struct vkd3d_dxbc_c struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; - uint32_t ptr_type_id, type_id, image_id, result_id; + unsigned int memory_semantics = SpvMemorySemanticsMaskNone; + uint32_t ptr_type_id, type_id, counter_id, result_id; uint32_t coordinate_id, sample_id, pointer_id; const struct vkd3d_symbol *resource_symbol; uint32_t operands[3]; @@ -5911,18 +5929,26 @@ static void vkd3d_dxbc_compiler_emit_uav_counter_instruction(struct vkd3d_dxbc_c ? SpvOpAtomicIIncrement : SpvOpAtomicIDecrement; resource_symbol = vkd3d_dxbc_compiler_find_resource(compiler, &src->reg); - image_id = resource_symbol->info.resource.uav_counter_id; - assert(image_id); + counter_id = resource_symbol->info.resource.uav_counter_id; + assert(counter_id); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassImage, type_id); - coordinate_id = sample_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, 0); - pointer_id = vkd3d_spirv_build_op_image_texel_pointer(builder, - ptr_type_id, image_id, coordinate_id, sample_id); + if (vkd3d_dxbc_compiler_is_opengl_target(compiler)) + { + pointer_id = counter_id; + memory_semantics |= SpvMemorySemanticsAtomicCounterMemoryMask; + } + else + { + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassImage, type_id); + coordinate_id = sample_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, 0); + pointer_id = vkd3d_spirv_build_op_image_texel_pointer(builder, + ptr_type_id, counter_id, coordinate_id, sample_id); + } operands[0] = pointer_id; operands[1] = vkd3d_dxbc_compiler_get_constant_uint(compiler, SpvScopeDevice); - operands[2] = vkd3d_dxbc_compiler_get_constant_uint(compiler, SpvMemorySemanticsMaskNone); + operands[2] = vkd3d_dxbc_compiler_get_constant_uint(compiler, memory_semantics); result_id = vkd3d_spirv_build_op_trv(builder, &builder->function_stream, op, type_id, operands, ARRAY_SIZE(operands)); if (op == SpvOpAtomicIDecrement) -- 2.18.1

2 1

[PATCH vkd3d 5/7] vkd3d-shader: Translate sample_d instructions.
by Józef Kucia Oct. 17, 2018

Oct. 17, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e9726dd7f68c..5d34a847b10a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1335,7 +1335,7 @@ static uint32_t vkd3d_spirv_build_op_image_sample(struct vkd3d_spirv_builder *bu const uint32_t operands[] = {sampled_image_id, coordinate_id}; if (op == SpvOpImageSampleExplicitLod) - assert(image_operands_mask & SpvImageOperandsLodMask); + assert(image_operands_mask & (SpvImageOperandsLodMask | SpvImageOperandsGradMask)); else assert(op == SpvOpImageSampleImplicitLod); @@ -1350,7 +1350,7 @@ static uint32_t vkd3d_spirv_build_op_image_sample_dref(struct vkd3d_spirv_builde const uint32_t operands[] = {sampled_image_id, coordinate_id, dref_id}; if (op == SpvOpImageSampleDrefExplicitLod) - assert(image_operands_mask & SpvImageOperandsLodMask); + assert(image_operands_mask & (SpvImageOperandsLodMask | SpvImageOperandsGradMask)); else assert(op == SpvOpImageSampleDrefImplicitLod); @@ -5436,14 +5436,27 @@ static void vkd3d_dxbc_compiler_emit_sample(struct vkd3d_dxbc_compiler *compiler SpvImageOperandsMask operands_mask = 0; unsigned int image_operand_count = 0; struct vkd3d_shader_image image; - uint32_t image_operands[2]; + uint32_t image_operands[3]; + DWORD coordinate_mask; SpvOp op; + vkd3d_dxbc_compiler_prepare_sampled_image(compiler, &image, + &src[1].reg, &src[2].reg, VKD3D_IMAGE_FLAG_NONE); + switch (instruction->handler_idx) { case VKD3DSIH_SAMPLE: op = SpvOpImageSampleImplicitLod; break; + case VKD3DSIH_SAMPLE_GRAD: + op = SpvOpImageSampleExplicitLod; + operands_mask |= SpvImageOperandsGradMask; + coordinate_mask = (1u << image.resource_type_info->offset_component_count) - 1; + image_operands[image_operand_count++] = vkd3d_dxbc_compiler_emit_load_src(compiler, + &src[3], coordinate_mask); + image_operands[image_operand_count++] = vkd3d_dxbc_compiler_emit_load_src(compiler, + &src[4], coordinate_mask); + break; case VKD3DSIH_SAMPLE_LOD: op = SpvOpImageSampleExplicitLod; operands_mask |= SpvImageOperandsLodMask; @@ -5455,9 +5468,6 @@ static void vkd3d_dxbc_compiler_emit_sample(struct vkd3d_dxbc_compiler *compiler return; } - vkd3d_dxbc_compiler_prepare_sampled_image(compiler, &image, - &src[1].reg, &src[2].reg, VKD3D_IMAGE_FLAG_NONE); - if (vkd3d_shader_instruction_has_texel_offset(instruction)) { operands_mask |= SpvImageOperandsConstOffsetMask; @@ -5467,6 +5477,7 @@ static void vkd3d_dxbc_compiler_emit_sample(struct vkd3d_dxbc_compiler *compiler sampled_type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, VKD3D_VEC4_SIZE); coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], VKD3DSP_WRITEMASK_ALL); + assert(image_operand_count <= ARRAY_SIZE(image_operands)); val_id = vkd3d_spirv_build_op_image_sample(builder, op, sampled_type_id, image.sampled_image_id, coordinate_id, operands_mask, image_operands, image_operand_count); @@ -6447,6 +6458,7 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler vkd3d_dxbc_compiler_emit_ld(compiler, instruction); break; case VKD3DSIH_SAMPLE: + case VKD3DSIH_SAMPLE_GRAD: case VKD3DSIH_SAMPLE_LOD: vkd3d_dxbc_compiler_emit_sample(compiler, instruction); break; -- 2.18.1

2 1

[PATCH vkd3d 4/7] vkd3d: Add asserts() for root descriptor indices.
by Józef Kucia Oct. 17, 2018

Oct. 17, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 27c8ad0773ec..e17fca979a9d 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3405,6 +3405,7 @@ static void d3d12_command_list_set_root_cbv(struct d3d12_command_list *list, root_parameter, bindings->descriptor_set, NULL, &buffer_info); VK_CALL(vkUpdateDescriptorSets(list->device->vk_device, 1, &descriptor_write, 0, NULL)); + assert(index < ARRAY_SIZE(bindings->push_descriptors)); bindings->push_descriptors[index].u.cbv.vk_buffer = buffer_info.buffer; bindings->push_descriptors[index].u.cbv.offset = buffer_info.offset; bindings->push_descriptor_dirty_mask |= 1u << index; @@ -3478,6 +3479,7 @@ static void d3d12_command_list_set_root_descriptor(struct d3d12_command_list *li root_parameter, bindings->descriptor_set, &vk_buffer_view, NULL); VK_CALL(vkUpdateDescriptorSets(list->device->vk_device, 1, &descriptor_write, 0, NULL)); + assert(index < ARRAY_SIZE(bindings->push_descriptors)); bindings->push_descriptors[index].u.vk_buffer_view = vk_buffer_view; bindings->push_descriptor_dirty_mask |= 1u << index; bindings->push_descriptor_active_mask |= 1u << index; -- 2.18.1

2 1

[PATCH vkd3d 2/7] vkd3d-shader: Constify vkd3d_dxbc_compiler pointers.
by Józef Kucia Oct. 17, 2018

Oct. 17, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 644c0a71d6af..e9726dd7f68c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1982,13 +1982,13 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader return compiler; } -static enum vkd3d_shader_target vkd3d_dxbc_compiler_get_target(struct vkd3d_dxbc_compiler *compiler) +static enum vkd3d_shader_target vkd3d_dxbc_compiler_get_target(const struct vkd3d_dxbc_compiler *compiler) { const struct vkd3d_shader_compile_arguments *args = compiler->compile_args; return args ? args->target : VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0; } -static bool vkd3d_dxbc_compiler_check_shader_visibility(struct vkd3d_dxbc_compiler *compiler, +static bool vkd3d_dxbc_compiler_check_shader_visibility(const struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_visibility visibility) { switch (visibility) @@ -2012,7 +2012,7 @@ static bool vkd3d_dxbc_compiler_check_shader_visibility(struct vkd3d_dxbc_compil } static struct vkd3d_push_constant_buffer_binding *vkd3d_dxbc_compiler_find_push_constant_buffer( - struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg) + const struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg) { unsigned int reg_idx = reg->idx[0].offset; unsigned int i; @@ -2362,7 +2362,7 @@ struct vkd3d_shader_register_info unsigned int structure_stride; }; -static bool vkd3d_dxbc_compiler_get_register_info(struct vkd3d_dxbc_compiler *compiler, +static bool vkd3d_dxbc_compiler_get_register_info(const struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, struct vkd3d_shader_register_info *register_info) { struct vkd3d_symbol reg_symbol, *symbol; @@ -3044,7 +3044,7 @@ vkd3d_register_builtins[] = }; static const struct vkd3d_spirv_builtin *get_spirv_builtin_for_sysval( - struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_input_sysval_semantic sysval) + const struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_input_sysval_semantic sysval) { enum vkd3d_shader_target target; unsigned int i; @@ -3080,7 +3080,7 @@ static const struct vkd3d_spirv_builtin *get_spirv_builtin_for_register( return NULL; } -static const struct vkd3d_spirv_builtin *vkd3d_get_spirv_builtin(struct vkd3d_dxbc_compiler *compiler, +static const struct vkd3d_spirv_builtin *vkd3d_get_spirv_builtin(const struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_register_type reg_type, enum vkd3d_shader_input_sysval_semantic sysval) { const struct vkd3d_spirv_builtin *builtin; @@ -3293,7 +3293,7 @@ static unsigned int vkd3d_dxbc_compiler_get_output_variable_index( return register_idx; } -static unsigned int get_shader_output_swizzle(struct vkd3d_dxbc_compiler *compiler, +static unsigned int get_shader_output_swizzle(const struct vkd3d_dxbc_compiler *compiler, unsigned int register_idx) { const struct vkd3d_shader_compile_arguments *compile_args; -- 2.18.1

2 1

[PATCH vkd3d 3/7] vkd3d: Use vk_write_descriptor_set_from_root_descriptor() in more places.
by Józef Kucia Oct. 17, 2018

Oct. 17, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 59 ++++++++++++++------------------------------ 1 file changed, 19 insertions(+), 40 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 437c29f3b229..27c8ad0773ec 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2207,6 +2207,7 @@ static void d3d12_command_list_update_push_descriptors(struct d3d12_command_list VkWriteDescriptorSet *descriptor_writes = NULL, *current_descriptor_write; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; VkDescriptorBufferInfo *buffer_infos = NULL, *current_buffer_info; + const struct d3d12_root_parameter *root_parameter; struct vkd3d_push_descriptor *push_descriptor; struct d3d12_device *device = list->device; VkDescriptorBufferInfo *vk_buffer_info; @@ -2231,9 +2232,10 @@ static void d3d12_command_list_update_push_descriptors(struct d3d12_command_list if (!(bindings->push_descriptor_dirty_mask & (1u << i))) continue; + root_parameter = &root_signature->parameters[i]; push_descriptor = &bindings->push_descriptors[i]; - if (root_signature->parameters[i].parameter_type == D3D12_ROOT_PARAMETER_TYPE_CBV) + if (root_parameter->parameter_type == D3D12_ROOT_PARAMETER_TYPE_CBV) { vk_buffer_view = NULL; vk_buffer_info = current_buffer_info; @@ -2248,8 +2250,7 @@ static void d3d12_command_list_update_push_descriptors(struct d3d12_command_list } if (!vk_write_descriptor_set_from_root_descriptor(current_descriptor_write, - &root_signature->parameters[i], bindings->descriptor_set, - vk_buffer_view, vk_buffer_info)) + root_parameter, bindings->descriptor_set, vk_buffer_view, vk_buffer_info)) continue; ++descriptor_count; @@ -3377,39 +3378,31 @@ static void d3d12_command_list_set_root_cbv(struct d3d12_command_list *list, const struct d3d12_root_signature *root_signature = bindings->root_signature; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; const struct vkd3d_vulkan_info *vk_info = &list->device->vk_info; - const struct d3d12_root_descriptor *root_descriptor; + const struct d3d12_root_parameter *root_parameter; struct VkWriteDescriptorSet descriptor_write; struct VkDescriptorBufferInfo buffer_info; struct d3d12_resource *resource; - assert(root_signature->parameters[index].parameter_type == D3D12_ROOT_PARAMETER_TYPE_CBV); - root_descriptor = &root_signature->parameters[index].u.descriptor; + root_parameter = &root_signature->parameters[index]; + assert(root_parameter->parameter_type == D3D12_ROOT_PARAMETER_TYPE_CBV); resource = vkd3d_gpu_va_allocator_dereference(&list->device->gpu_va_allocator, gpu_address); buffer_info.buffer = resource->u.vk_buffer; buffer_info.offset = gpu_address - resource->gpu_address; buffer_info.range = VK_WHOLE_SIZE; - descriptor_write.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; - descriptor_write.pNext = NULL; - descriptor_write.dstBinding = root_descriptor->binding; - descriptor_write.dstArrayElement = 0; - descriptor_write.descriptorCount = 1; - descriptor_write.descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; - descriptor_write.pImageInfo = NULL; - descriptor_write.pBufferInfo = &buffer_info; - descriptor_write.pTexelBufferView = NULL; - if (vk_info->KHR_push_descriptor) { - descriptor_write.dstSet = VK_NULL_HANDLE; + vk_write_descriptor_set_from_root_descriptor(&descriptor_write, + root_parameter, VK_NULL_HANDLE, NULL, &buffer_info); VK_CALL(vkCmdPushDescriptorSetKHR(list->vk_command_buffer, bind_point, root_signature->vk_pipeline_layout, 0, 1, &descriptor_write)); } else { d3d12_command_list_prepare_descriptors(list, bind_point); - descriptor_write.dstSet = bindings->descriptor_set; + vk_write_descriptor_set_from_root_descriptor(&descriptor_write, + root_parameter, bindings->descriptor_set, NULL, &buffer_info); VK_CALL(vkUpdateDescriptorSets(list->device->vk_device, 1, &descriptor_write, 0, NULL)); bindings->push_descriptors[index].u.cbv.vk_buffer = buffer_info.buffer; @@ -3448,20 +3441,14 @@ static void d3d12_command_list_set_root_descriptor(struct d3d12_command_list *li const struct d3d12_root_signature *root_signature = bindings->root_signature; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; const struct vkd3d_vulkan_info *vk_info = &list->device->vk_info; - const struct d3d12_root_descriptor *root_descriptor; + const struct d3d12_root_parameter *root_parameter; struct VkWriteDescriptorSet descriptor_write; VkDevice vk_device = list->device->vk_device; - VkDescriptorType descriptor_type; VkBufferView vk_buffer_view; - assert(root_signature->parameters[index].parameter_type == D3D12_ROOT_PARAMETER_TYPE_SRV - || root_signature->parameters[index].parameter_type == D3D12_ROOT_PARAMETER_TYPE_UAV); - root_descriptor = &root_signature->parameters[index].u.descriptor; - - if (root_signature->parameters[index].parameter_type == D3D12_ROOT_PARAMETER_TYPE_SRV) - descriptor_type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; - else - descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; + root_parameter = &root_signature->parameters[index]; + assert(root_parameter->parameter_type == D3D12_ROOT_PARAMETER_TYPE_SRV + || root_parameter->parameter_type == D3D12_ROOT_PARAMETER_TYPE_UAV); /* FIXME: Re-use buffer views. */ if (!vkd3d_create_raw_buffer_view(list->device, gpu_address, &vk_buffer_view)) @@ -3477,26 +3464,18 @@ static void d3d12_command_list_set_root_descriptor(struct d3d12_command_list *li return; } - descriptor_write.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; - descriptor_write.pNext = NULL; - descriptor_write.dstBinding = root_descriptor->binding; - descriptor_write.dstArrayElement = 0; - descriptor_write.descriptorCount = 1; - descriptor_write.descriptorType = descriptor_type; - descriptor_write.pImageInfo = NULL; - descriptor_write.pBufferInfo = NULL; - descriptor_write.pTexelBufferView = &vk_buffer_view; - if (vk_info->KHR_push_descriptor) { - descriptor_write.dstSet = VK_NULL_HANDLE; + vk_write_descriptor_set_from_root_descriptor(&descriptor_write, + root_parameter, VK_NULL_HANDLE, &vk_buffer_view, NULL); VK_CALL(vkCmdPushDescriptorSetKHR(list->vk_command_buffer, bind_point, root_signature->vk_pipeline_layout, 0, 1, &descriptor_write)); } else { d3d12_command_list_prepare_descriptors(list, bind_point); - descriptor_write.dstSet = bindings->descriptor_set; + vk_write_descriptor_set_from_root_descriptor(&descriptor_write, + root_parameter, bindings->descriptor_set, &vk_buffer_view, NULL); VK_CALL(vkUpdateDescriptorSets(list->device->vk_device, 1, &descriptor_write, 0, NULL)); bindings->push_descriptors[index].u.vk_buffer_view = vk_buffer_view; -- 2.18.1

2 1

[PATCH vkd3d 1/7] vkd3d: Remove "unhandled next" warnings.
by Józef Kucia Oct. 17, 2018

Oct. 17, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 2 -- libs/vkd3d/vkd3d_main.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index a839dcc4d3b4..727259a92e56 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -475,8 +475,6 @@ HRESULT vkd3d_create_instance(const struct vkd3d_instance_create_info *create_in WARN("Invalid structure type %#x.\n", create_info->type); return E_INVALIDARG; } - if (create_info->next) - WARN("Unhandled next %p.\n", create_info->next); if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 063a4ca1c9ea..63dabda06395 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -35,8 +35,6 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, WARN("Invalid structure type %#x.\n", create_info->type); return E_INVALIDARG; } - if (create_info->next) - WARN("Unhandled next %p.\n", create_info->next); if (!create_info->instance && !create_info->instance_create_info) { ERR("Instance or instance create info is required.\n"); -- 2.18.1

2 1

[PATCH] testbot/Build: Detect when make_requests needs to be re-run.
by Francois Gouget Oct. 17, 2018

Oct. 17, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/Build/Utils.pm | 11 +++++++++++ testbot/lib/WineTestBot/PatchUtils.pm | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 2e6cc853b3..aa5c205d2d 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -114,6 +114,17 @@ sub ApplyPatch($$) } my $Impacts = GetPatchImpacts($PatchFile); + if ($Impacts->{MakeRequests}) + { + InfoMsg "\nRunning make_requests\n"; + system("cd '$DataDir/$Dir' && set -x && ./tools/make_requests"); + if ($? != 0) + { + LogMsg "make_requests failed\n"; + return undef; + } + } + if ($Impacts->{MakeMakefiles}) { InfoMsg "\nRunning make_makefiles\n"; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 502a781f6c..7df50f9b21 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -300,6 +300,11 @@ sub GetPatchImpacts($) $Impacts->{PatchedRoot} = $Impacts->{MakeMakefiles} = 1; $Impacts->{IsWinePatch} = 1; } + elsif ($Line =~ m=^--- \w+/server/protocol\.def$=) + { + $Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1; + $Impacts->{IsWinePatch} = 1; + } elsif ($Line =~ m=^--- /dev/null$=) { $Change = "new"; @@ -344,7 +349,7 @@ sub GetPatchImpacts($) $Impacts->{BuildModules} = {}; # Also backup the build-related fields. - foreach my $Field ("Autoconf", "MakeMakefiles", + foreach my $Field ("Autoconf", "MakeMakefiles", "MakeRequests", "PatchedRoot", "PatchedModules", "PatchedTests") { $PastImpacts->{$Field} = $Impacts->{$Field}; @@ -435,6 +440,7 @@ sub GetPatchImpacts($) { $Impacts->{Autoconf} ||= $PastImpacts->{Autoconf}; $Impacts->{MakeMakefiles} ||= $PastImpacts->{MakeMakefiles}; + $Impacts->{MakeRequests} ||= $PastImpacts->{MakeRequests}; $Impacts->{RebuildRoot} ||= $PastImpacts->{PatchedRoot}; $Impacts->{RebuildModules} ||= $PastImpacts->{PatchedModules}; map { $Impacts->{BuildModules}->{$_} = 1 } keys %{$PastImpacts->{BuildModules}}; -- 2.19.1

1 0

[PATCH] testbot/web: Fix picking which module to test.
by Francois Gouget Oct. 17, 2018

Oct. 17, 2018

Make sure Submit.pl picks the module with the modified tests even if the patch impacts other modules. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This only impacted the suggested command but could be confusing. Whether the command was correct or not depended on the order in the hashtable. testbot/web/Submit.pl | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index d0da7a2497..c10a267909 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -604,10 +604,16 @@ sub DetermineFileType($$) } else { - my $TestInfo = (values %{$Impacts->{Tests}})[0]; - $FileType = "patch"; - $ExeBase = $TestInfo->{ExeBase}; - $TestUnit = (keys %{$TestInfo->{Units}})[0]; + foreach my $TestInfo (values %{$Impacts->{Tests}}) + { + if ($TestInfo->{UnitCount}) + { + $FileType = "patch"; + $ExeBase = $TestInfo->{ExeBase}; + $TestUnit = (keys %{$TestInfo->{Units}})[0]; + last; + } + } } } elsif ($FileType eq "dll32" || $FileType eq "dll64" || $FileType eq "zip") -- 2.19.1

1 0

[PATCH] testbot: All build scripts have now standardized on the 'Task:' prefix.
by Francois Gouget Oct. 17, 2018

Oct. 17, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 1bb8f5aa1d..6caa0212c2 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -130,7 +130,7 @@ sub GetLogLineCategory($) $Line =~ /: error: / or $Line =~ /^make: [*]{3} No rule to make target / or $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or - $Line =~ /^(?:Build|Reconfig|Task): (?!ok)/ or + $Line =~ /^Task: (?!ok)/ or # Typical perl errors _IsPerlError($Line)) { @@ -152,7 +152,7 @@ sub GetLogLineCategory($) } if (# Build messages $Line =~ /^\+ \S/ or - $Line =~ /^(?:Build|Reconfig|Task): ok/) + $Line =~ /^Task: ok/) { return "info"; } -- 2.19.1

1 0

[PATCH] testbot: Factorize the Perl error detection.
by Francois Gouget Oct. 17, 2018

Oct. 17, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 31 +++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 17d44a44c0..1bb8f5aa1d 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -42,6 +42,27 @@ use WineTestBot::Config; # For $MaxUnitSize # Task log parser # +=pod +=over 12 + +=item C<_IsPerlError()> + +Returns true if the string looks like a Perl error message. + +=back +=cut + +sub _IsPerlError($) +{ + my ($Str) = @_; + + return $Str =~ /^Use of uninitialized value / || + $Str =~ /^Undefined subroutine / || + $Str =~ /^Global symbol / || + $Str =~ /^Possible precedence issue /; +} + + =pod =over 12 @@ -71,11 +92,7 @@ sub ParseTaskLog($) $Result = "badpatch"; last; # Should be the last and most specific message } - elsif ($Line =~ /^Task: / or - # Typical perl errors - $Line =~ /^Use of uninitialized value / or - $Line =~ /^Undefined subroutine / or - $Line =~ /^Global symbol /) + elsif ($Line =~ /^Task: / or _IsPerlError($Line)) { $Result = "failed"; } @@ -115,9 +132,7 @@ sub GetLogLineCategory($) $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or $Line =~ /^(?:Build|Reconfig|Task): (?!ok)/ or # Typical perl errors - $Line =~ /^Use of uninitialized value / or - $Line =~ /^Undefined subroutine / or - $Line =~ /^Global symbol /) + _IsPerlError($Line)) { return "error"; } -- 2.19.1

1 0