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

[PATCH] winex11: Fix a compiler warning when building without vulkan support.
by Akihiro Sagawa 11 Oct '18

11 Oct '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winex11.drv/vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 063281d3d5..28ae1a9e0e 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -41,9 +41,9 @@ #include "wine/vulkan_driver.h" WINE_DEFAULT_DEBUG_CHANNEL(vulkan); -WINE_DECLARE_DEBUG_CHANNEL(fps); #ifdef SONAME_LIBVULKAN +WINE_DECLARE_DEBUG_CHANNEL(fps); static CRITICAL_SECTION context_section; static CRITICAL_SECTION_DEBUG critsect_debug = -- 2.17.1

1 0

[PATCH vkd3d 7/7] vkd3d-shader: Add OpenGL SPIR-V target environment.
by Józef Kucia 11 Oct '18

11 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> More changes are needed for full support. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_shader.h | 10 +++++ libs/vkd3d-shader/spirv.c | 63 +++++++++++++++++++-------- libs/vkd3d-shader/vkd3d_shader_main.c | 21 +++++++++ libs/vkd3d/state.c | 1 + 4 files changed, 78 insertions(+), 17 deletions(-) diff --git a/include/private/vkd3d_shader.h b/include/private/vkd3d_shader.h index 61789d63e246..121fa7557384 100644 --- a/include/private/vkd3d_shader.h +++ b/include/private/vkd3d_shader.h @@ -125,8 +125,18 @@ struct vkd3d_shader_interface unsigned int uav_counter_count; }; +enum vkd3d_shader_target +{ + VKD3D_SHADER_TARGET_NONE, + VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5, + VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0, /* default target */ + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TARGET), +}; + struct vkd3d_shader_compile_arguments { + enum vkd3d_shader_target target; unsigned int *output_swizzles; unsigned int output_swizzle_count; }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7d4a3b300a97..644c0a71d6af 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -36,7 +36,21 @@ #ifdef HAVE_SPIRV_TOOLS # include "spirv-tools/libspirv.h" -static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv) +static spv_target_env spv_target_env_from_vkd3d(enum vkd3d_shader_target target) +{ + switch (target) + { + case VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5: + return SPV_ENV_OPENGL_4_5; + case VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0: + return SPV_ENV_VULKAN_1_0; + default: + ERR("Invalid shader target %#x.\n", target); + return SPV_ENV_VULKAN_1_0; + } +} + +static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv, enum vkd3d_shader_target target) { const static uint32_t options = SPV_BINARY_TO_TEXT_OPTION_FRIENDLY_NAMES | SPV_BINARY_TO_TEXT_OPTION_INDENT; @@ -45,7 +59,7 @@ static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv) spv_context context; spv_result_t ret; - context = spvContextCreate(SPV_ENV_VULKAN_1_0); + context = spvContextCreate(spv_target_env_from_vkd3d(target)); if (!(ret = spvBinaryToText(context, spirv->code, spirv->size / sizeof(uint32_t), options, &text, &diagnostic))) @@ -68,13 +82,13 @@ static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv) spvContextDestroy(context); } -static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv) +static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv, enum vkd3d_shader_target target) { spv_diagnostic diagnostic = NULL; spv_context context; spv_result_t ret; - context = spvContextCreate(SPV_ENV_VULKAN_1_0); + context = spvContextCreate(spv_target_env_from_vkd3d(target)); if ((ret = spvValidateBinary(context, spirv->code, spirv->size / sizeof(uint32_t), &diagnostic))) @@ -89,8 +103,8 @@ static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv) #else -static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv) {} -static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv) {} +static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv, enum vkd3d_shader_target target) {} +static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv, enum vkd3d_shader_target target) {} #endif /* HAVE_SPIRV_TOOLS */ @@ -1968,6 +1982,12 @@ 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) +{ + 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, enum vkd3d_shader_visibility visibility) { @@ -2983,9 +3003,13 @@ static const struct { enum vkd3d_shader_input_sysval_semantic sysval; struct vkd3d_spirv_builtin builtin; + enum vkd3d_shader_target target; } vkd3d_system_value_builtins[] = { + {VKD3D_SIV_VERTEX_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInVertexId}, VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5}, + {VKD3D_SIV_INSTANCE_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInInstanceId}, VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5}, + {VKD3D_SIV_POSITION, {VKD3D_TYPE_FLOAT, 4, SpvBuiltInPosition}}, {VKD3D_SIV_VERTEX_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInVertexIndex}}, {VKD3D_SIV_INSTANCE_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInInstanceIndex, sv_instance_id_fixup}}, @@ -3020,16 +3044,20 @@ vkd3d_register_builtins[] = }; static const struct vkd3d_spirv_builtin *get_spirv_builtin_for_sysval( - enum vkd3d_shader_input_sysval_semantic sysval) + struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_input_sysval_semantic sysval) { + enum vkd3d_shader_target target; unsigned int i; if (!sysval) return NULL; + target = vkd3d_dxbc_compiler_get_target(compiler); for (i = 0; i < ARRAY_SIZE(vkd3d_system_value_builtins); ++i) { - if (vkd3d_system_value_builtins[i].sysval == sysval) + if (vkd3d_system_value_builtins[i].sysval == sysval + && (!vkd3d_system_value_builtins[i].target + || vkd3d_system_value_builtins[i].target == target)) return &vkd3d_system_value_builtins[i].builtin; } @@ -3052,12 +3080,12 @@ static const struct vkd3d_spirv_builtin *get_spirv_builtin_for_register( return NULL; } -static const struct vkd3d_spirv_builtin *vkd3d_get_spirv_builtin(enum vkd3d_shader_register_type reg_type, - enum vkd3d_shader_input_sysval_semantic sysval) +static const struct vkd3d_spirv_builtin *vkd3d_get_spirv_builtin(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; - if ((builtin = get_spirv_builtin_for_sysval(sysval))) + if ((builtin = get_spirv_builtin_for_sysval(compiler, sysval))) return builtin; if ((builtin = get_spirv_builtin_for_register(reg_type))) return builtin; @@ -3124,7 +3152,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi reg_idx = reg->idx[0].offset; } - builtin = get_spirv_builtin_for_sysval(sysval); + builtin = get_spirv_builtin_for_sysval(compiler, sysval); component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); component_count = vkd3d_write_mask_component_count(dst->write_mask); @@ -3321,7 +3349,7 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ if (clip_distance_mask) { count = vkd3d_popcount(clip_distance_mask); - builtin = get_spirv_builtin_for_sysval(VKD3D_SIV_CLIP_DISTANCE); + builtin = get_spirv_builtin_for_sysval(compiler, VKD3D_SIV_CLIP_DISTANCE); clip_distance_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, SpvStorageClassOutput, builtin->component_type, builtin->component_count, count); vkd3d_spirv_add_iface_variable(builder, clip_distance_id); @@ -3331,7 +3359,7 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ if (cull_distance_mask) { count = vkd3d_popcount(cull_distance_mask); - builtin = get_spirv_builtin_for_sysval(VKD3D_SIV_CULL_DISTANCE); + builtin = get_spirv_builtin_for_sysval(compiler, VKD3D_SIV_CULL_DISTANCE); cull_distance_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, SpvStorageClassOutput, builtin->component_type, builtin->component_count, count); vkd3d_spirv_add_iface_variable(builder, cull_distance_id); @@ -3383,7 +3411,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler return; } - builtin = vkd3d_get_spirv_builtin(dst->reg.type, sysval); + builtin = vkd3d_get_spirv_builtin(compiler, dst->reg.type, sysval); component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); component_count = vkd3d_write_mask_component_count(dst->write_mask); @@ -6631,8 +6659,9 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, if (TRACE_ON()) { - vkd3d_spirv_dump(spirv); - vkd3d_spirv_validate(spirv); + enum vkd3d_shader_target target = vkd3d_dxbc_compiler_get_target(compiler); + vkd3d_spirv_dump(spirv, target); + vkd3d_spirv_validate(spirv, target); } return VKD3D_OK; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index f6bb96455771..5b269bd6a343 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -56,6 +56,24 @@ static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) free_shader_desc(&parser->shader_desc); } +static int vkd3d_shader_validate_compile_args(const struct vkd3d_shader_compile_arguments *compile_args) +{ + if (!compile_args) + return VKD3D_OK; + + switch (compile_args->target) + { + case VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5: + case VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0: + break; + default: + WARN("Invalid shader target %#x.\n", compile_args->target); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + + return VKD3D_OK; +} + int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_code *spirv, uint32_t compiler_options, const struct vkd3d_shader_interface *shader_interface, @@ -70,6 +88,9 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, TRACE("dxbc {%p, %zu}, spirv %p, compiler_options %#x, shader_interface %p, compile_args %p.\n", dxbc->code, dxbc->size, spirv, compiler_options, shader_interface, compile_args); + if ((ret = vkd3d_shader_validate_compile_args(compile_args)) < 0) + return ret; + if ((ret = vkd3d_shader_scan_dxbc(dxbc, &scan_info)) < 0) return ret; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 1d18c31a053f..82721f27b448 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1994,6 +1994,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s } graphics->attachment_count = graphics->rt_idx + rt_count; + ps_compile_args.target = VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0; ps_compile_args.output_swizzles = ps_output_swizzle; ps_compile_args.output_swizzle_count = rt_count; -- 2.18.1

2 1

[PATCH vkd3d 5/7] vkd3d: Avoid using VkCopyDescriptorSet.
by Józef Kucia 11 Oct '18

11 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> VkCopyDescriptorSet may result in the CPU reading GPU memory then writing GPU memory. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 101 ++++--------------------------------- libs/vkd3d/vkd3d_private.h | 1 + 2 files changed, 10 insertions(+), 92 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d77d6d41da5b..437c29f3b229 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1983,98 +1983,11 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list return true; } -static void d3d12_command_list_copy_descriptors(struct d3d12_command_list *list, - const struct vkd3d_pipeline_bindings *bindings, VkDescriptorSet src_set) -{ - const struct d3d12_root_signature *root_signature = bindings->root_signature; - const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; - const struct d3d12_root_descriptor_table *descriptor_table; - const struct d3d12_root_descriptor_table_range *range; - VkDevice vk_device = list->device->vk_device; - VkCopyDescriptorSet *descriptor_copies; - unsigned int copy_descriptor_count; - unsigned int i, j, k, count; - unsigned int idx; - - count = 0; - for (i = 0; i < root_signature->parameter_count; ++i) - { - if (root_signature->parameters[i].parameter_type != D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) - continue; - if (bindings->descriptor_table_dirty_mask & ((uint64_t)1 << i)) - continue; - - descriptor_table = &root_signature->parameters[i].u.descriptor_table; - for (j = 0; j < descriptor_table->range_count; ++j) - { - range = &descriptor_table->ranges[j]; - switch (range->descriptor_magic) - { - case VKD3D_DESCRIPTOR_MAGIC_SRV: - case VKD3D_DESCRIPTOR_MAGIC_UAV: - count += 2 * range->descriptor_count; - break; - default: - ++count; - break; - } - } - } - - if (!count) - return; - - if (!(descriptor_copies = vkd3d_calloc(count, sizeof(*descriptor_copies)))) - return; - - idx = 0; - for (i = 0; i < root_signature->parameter_count; ++i) - { - if (root_signature->parameters[i].parameter_type != D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) - continue; - if (bindings->descriptor_table_dirty_mask & ((uint64_t)1 << i)) - continue; - - descriptor_table = &root_signature->parameters[i].u.descriptor_table; - for (j = 0; j < descriptor_table->range_count; ++j) - { - range = &descriptor_table->ranges[j]; - if (range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_SRV - || range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_UAV) - copy_descriptor_count = 2 * range->descriptor_count; - else - copy_descriptor_count = 1; - for (k = 0; k < copy_descriptor_count; ++k) - { - descriptor_copies[idx].sType = VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET; - descriptor_copies[idx].pNext = NULL; - descriptor_copies[idx].srcSet = src_set; - descriptor_copies[idx].srcBinding = range->binding + k; - descriptor_copies[idx].srcArrayElement = 0; - descriptor_copies[idx].dstSet = bindings->descriptor_set; - descriptor_copies[idx].dstBinding = range->binding + k; - descriptor_copies[idx].dstArrayElement = 0; - if (range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_SRV - || range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_UAV) - descriptor_copies[idx].descriptorCount = 1; - else - descriptor_copies[idx].descriptorCount = range->descriptor_count; - ++idx; - } - } - } - assert(count == idx); - VK_CALL(vkUpdateDescriptorSets(vk_device, 0, NULL, count, descriptor_copies)); - - vkd3d_free(descriptor_copies); -} - static void d3d12_command_list_prepare_descriptors(struct d3d12_command_list *list, VkPipelineBindPoint bind_point) { struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; const struct d3d12_root_signature *root_signature = bindings->root_signature; - VkDescriptorSet previous_descriptor_set = bindings->descriptor_set; if (bindings->descriptor_set && !bindings->in_use) return; @@ -2095,10 +2008,8 @@ static void d3d12_command_list_prepare_descriptors(struct d3d12_command_list *li root_signature->vk_set_layout); bindings->in_use = false; + bindings->descriptor_table_dirty_mask |= bindings->descriptor_table_active_mask; bindings->push_descriptor_dirty_mask |= bindings->push_descriptor_active_mask; - - if (previous_descriptor_set) - d3d12_command_list_copy_descriptors(list, bindings, previous_descriptor_set); } static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_descriptor_write, @@ -2193,6 +2104,12 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list if (!descriptor_count) return; + if (!(descriptor = d3d12_desc_from_gpu_handle(base_descriptor))) + { + WARN("Descriptor table %u is not set.\n", index); + return; + } + if (!(descriptor_writes = vkd3d_calloc(descriptor_count, sizeof(*descriptor_writes)))) return; if (!(image_infos = vkd3d_calloc(descriptor_count, sizeof(*image_infos)))) @@ -2201,8 +2118,6 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list return; } - descriptor = d3d12_desc_from_gpu_handle(base_descriptor); - descriptor_count = 0; current_descriptor_write = descriptor_writes; current_image_info = image_infos; @@ -3329,6 +3244,7 @@ static void d3d12_command_list_set_root_signature(struct d3d12_command_list *lis bindings->root_signature = root_signature; bindings->descriptor_set = VK_NULL_HANDLE; + bindings->descriptor_table_active_mask = 0; bindings->push_descriptor_active_mask = 0; } @@ -3365,6 +3281,7 @@ static void d3d12_command_list_set_descriptor_table(struct d3d12_command_list *l assert(index < ARRAY_SIZE(bindings->descriptor_tables)); bindings->descriptor_tables[index] = base_descriptor; bindings->descriptor_table_dirty_mask |= (uint64_t)1 << index; + bindings->descriptor_table_active_mask |= (uint64_t)1 << index; } static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootDescriptorTable(ID3D12GraphicsCommandList *iface, diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index bbd88aeca805..cb3d597a18a1 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -661,6 +661,7 @@ struct vkd3d_pipeline_bindings D3D12_GPU_DESCRIPTOR_HANDLE descriptor_tables[D3D12_MAX_ROOT_COST]; uint64_t descriptor_table_dirty_mask; + uint64_t descriptor_table_active_mask; VkBufferView vk_uav_counter_views[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS]; uint8_t uav_counter_dirty_mask; -- 2.18.1

2 1

[PATCH vkd3d 2/7] vkd3d: Simplify d3d12_command_list_set_root_descriptor().
by Józef Kucia 11 Oct '18

11 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 1ed92ca1d6a6..3f3ed05b3b0c 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3465,12 +3465,8 @@ static void d3d12_command_list_set_root_descriptor(struct d3d12_command_list *li return; } - if (!vk_info->KHR_push_descriptor) - d3d12_command_list_prepare_descriptors(list, bind_point); - descriptor_write.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; descriptor_write.pNext = NULL; - descriptor_write.dstSet = bindings->descriptor_set; descriptor_write.dstBinding = root_descriptor->binding; descriptor_write.dstArrayElement = 0; descriptor_write.descriptorCount = 1; @@ -3481,11 +3477,14 @@ static void d3d12_command_list_set_root_descriptor(struct d3d12_command_list *li if (vk_info->KHR_push_descriptor) { + descriptor_write.dstSet = VK_NULL_HANDLE; 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_CALL(vkUpdateDescriptorSets(list->device->vk_device, 1, &descriptor_write, 0, NULL)); } } -- 2.18.1

2 1

[PATCH vkd3d 6/7] vkd3d-shader: Recognize enableMinimumPrecision global flag.
by Józef Kucia 11 Oct '18

11 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-shader/trace.c | 34 +++++++++++++----------- libs/vkd3d-shader/vkd3d_shader_private.h | 7 ++--- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 63a1a0e0b7c2..7d4a3b300a97 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3468,7 +3468,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_global_flags(struct vkd3d_dxbc_compiler const struct vkd3d_shader_instruction *instruction) { if (instruction->flags & ~(VKD3DSGF_REFACTORING_ALLOWED | VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS)) - FIXME("Unrecognized global flags %#x.\n", instruction->flags); + FIXME("Unhandled global flags %#x.\n", instruction->flags); else WARN("Unhandled global flags %#x.\n", instruction->flags); } diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 420ccea37f94..e0cb5bab6aea 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -398,26 +398,30 @@ static unsigned int shader_get_float_offset(enum vkd3d_shader_register_type regi static void shader_dump_global_flags(struct vkd3d_string_buffer *buffer, DWORD global_flags) { - if (global_flags & VKD3DSGF_REFACTORING_ALLOWED) - { - shader_addline(buffer, "refactoringAllowed"); - global_flags &= ~VKD3DSGF_REFACTORING_ALLOWED; - if (global_flags) - shader_addline(buffer, " | "); - } + unsigned int i; - if (global_flags & VKD3DSGF_FORCE_EARLY_DEPTH_STENCIL) + static const struct { - shader_addline(buffer, "forceEarlyDepthStencil"); - global_flags &= ~VKD3DSGF_FORCE_EARLY_DEPTH_STENCIL; - if (global_flags) - shader_addline(buffer, " | "); + unsigned int flag; + const char *name; } + global_flag_info[] = + { + {VKD3DSGF_REFACTORING_ALLOWED, "refactoringAllowed"}, + {VKD3DSGF_FORCE_EARLY_DEPTH_STENCIL, "forceEarlyDepthStencil"}, + {VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS, "enableRawAndStructuredBuffers"}, + {VKD3DSGF_ENABLE_MINIMUM_PRECISION, "enableMinimumPrecision"}, + }; - if (global_flags & VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS) + for (i = 0; i < ARRAY_SIZE(global_flag_info); ++i) { - shader_addline(buffer, "enableRawAndStructuredBuffers"); - global_flags &= ~VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS; + if (global_flags & global_flag_info[i].flag) + { + shader_addline(buffer, global_flag_info[i].name); + global_flags &= ~global_flag_info[i].flag; + if (global_flags) + shader_addline(buffer, " | "); + } } if (global_flags) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b1eadde08017..a2747acd09b2 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -439,9 +439,10 @@ enum vkd3d_shader_interpolation_mode enum vkd3d_shader_global_flags { - VKD3DSGF_REFACTORING_ALLOWED = 0x1, - VKD3DSGF_FORCE_EARLY_DEPTH_STENCIL = 0x4, - VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS = 0x8, + VKD3DSGF_REFACTORING_ALLOWED = 0x01, + VKD3DSGF_FORCE_EARLY_DEPTH_STENCIL = 0x04, + VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS = 0x08, + VKD3DSGF_ENABLE_MINIMUM_PRECISION = 0x20 }; enum vkd3d_shader_sync_flags -- 2.18.1

2 1

[PATCH vkd3d 3/7] vkd3d: Prepare descriptors once for all descriptor tables.
by Józef Kucia 11 Oct '18

11 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3f3ed05b3b0c..2830a038c887 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2220,8 +2220,6 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list descriptor = d3d12_desc_from_gpu_handle(base_descriptor); - d3d12_command_list_prepare_descriptors(list, bind_point); - descriptor_count = 0; current_descriptor_write = descriptor_writes; current_image_info = image_infos; @@ -2329,6 +2327,9 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis if (!rs || !rs->pool_size_count || !rs->vk_set_layout) return; + if (bindings->descriptor_table_dirty_mask) + d3d12_command_list_prepare_descriptors(list, bind_point); + for (i = 0; i < ARRAY_SIZE(bindings->descriptor_tables); ++i) { if (bindings->descriptor_table_dirty_mask & ((uint64_t)1 << i)) -- 2.18.1

2 1

[PATCH vkd3d 4/7] vkd3d: Avoid copying root descriptors.
by Józef Kucia 11 Oct '18

11 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 138 +++++++++++++++++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 18 +++++ 2 files changed, 136 insertions(+), 20 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 2830a038c887..d77d6d41da5b 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1988,7 +1988,6 @@ static void d3d12_command_list_copy_descriptors(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_table *descriptor_table; const struct d3d12_root_descriptor_table_range *range; VkDevice vk_device = list->device->vk_device; @@ -1998,8 +1997,6 @@ static void d3d12_command_list_copy_descriptors(struct d3d12_command_list *list, unsigned int idx; count = 0; - if (!vk_info->KHR_push_descriptor) - count += root_signature->root_descriptor_count; for (i = 0; i < root_signature->parameter_count; ++i) { if (root_signature->parameters[i].parameter_type != D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) @@ -2031,22 +2028,6 @@ static void d3d12_command_list_copy_descriptors(struct d3d12_command_list *list, return; idx = 0; - if (!vk_info->KHR_push_descriptor) - { - for (i = 0; i < root_signature->root_descriptor_count; ++i) - { - descriptor_copies[idx].sType = VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET; - descriptor_copies[idx].pNext = NULL; - descriptor_copies[idx].srcSet = src_set; - descriptor_copies[idx].srcBinding = i; - descriptor_copies[idx].srcArrayElement = 0; - descriptor_copies[idx].dstSet = bindings->descriptor_set; - descriptor_copies[idx].dstBinding = i; - descriptor_copies[idx].dstArrayElement = 0; - descriptor_copies[idx].descriptorCount = 1; - ++idx; - } - } for (i = 0; i < root_signature->parameter_count; ++i) { if (root_signature->parameters[i].parameter_type != D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) @@ -2114,6 +2095,8 @@ static void d3d12_command_list_prepare_descriptors(struct d3d12_command_list *li root_signature->vk_set_layout); bindings->in_use = false; + bindings->push_descriptor_dirty_mask |= bindings->push_descriptor_active_mask; + if (previous_descriptor_set) d3d12_command_list_copy_descriptors(list, bindings, previous_descriptor_set); } @@ -2264,6 +2247,109 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list vkd3d_free(image_infos); } +static bool vk_write_descriptor_set_from_root_descriptor(VkWriteDescriptorSet *vk_descriptor_write, + const struct d3d12_root_parameter *root_parameter, VkDescriptorSet vk_descriptor_set, + VkBufferView *vk_buffer_view, const VkDescriptorBufferInfo *vk_buffer_info) +{ + const struct d3d12_root_descriptor *root_descriptor; + + switch (root_parameter->parameter_type) + { + case D3D12_ROOT_PARAMETER_TYPE_CBV: + vk_descriptor_write->descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; + break; + case D3D12_ROOT_PARAMETER_TYPE_SRV: + vk_descriptor_write->descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; + break; + case D3D12_ROOT_PARAMETER_TYPE_UAV: + vk_descriptor_write->descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; + break; + default: + ERR("Invalid root descriptor.\n"); + return false; + } + + root_descriptor = &root_parameter->u.descriptor; + + vk_descriptor_write->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; + vk_descriptor_write->pNext = NULL; + vk_descriptor_write->dstSet = vk_descriptor_set; + vk_descriptor_write->dstBinding = root_descriptor->binding; + vk_descriptor_write->dstArrayElement = 0; + vk_descriptor_write->descriptorCount = 1; + vk_descriptor_write->pImageInfo = NULL; + vk_descriptor_write->pBufferInfo = vk_buffer_info; + vk_descriptor_write->pTexelBufferView = vk_buffer_view; + + return true; +} + +static void d3d12_command_list_update_push_descriptors(struct d3d12_command_list *list, + VkPipelineBindPoint bind_point) +{ + struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; + const struct d3d12_root_signature *root_signature = bindings->root_signature; + 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; + struct vkd3d_push_descriptor *push_descriptor; + struct d3d12_device *device = list->device; + VkDescriptorBufferInfo *vk_buffer_info; + unsigned int i, descriptor_count; + VkBufferView *vk_buffer_view; + + if (!bindings->push_descriptor_dirty_mask) + return; + + descriptor_count = vkd3d_popcount(bindings->push_descriptor_dirty_mask); + + if (!(descriptor_writes = vkd3d_calloc(descriptor_count, sizeof(*descriptor_writes)))) + return; + if (!(buffer_infos = vkd3d_calloc(descriptor_count, sizeof(*buffer_infos)))) + goto done; + + descriptor_count = 0; + current_buffer_info = buffer_infos; + current_descriptor_write = descriptor_writes; + for (i = 0; i < ARRAY_SIZE(bindings->push_descriptors); ++i) + { + if (!(bindings->push_descriptor_dirty_mask & (1u << i))) + continue; + + push_descriptor = &bindings->push_descriptors[i]; + + if (root_signature->parameters[i].parameter_type == D3D12_ROOT_PARAMETER_TYPE_CBV) + { + vk_buffer_view = NULL; + vk_buffer_info = current_buffer_info; + vk_buffer_info->buffer = push_descriptor->u.cbv.vk_buffer; + vk_buffer_info->offset = push_descriptor->u.cbv.offset; + vk_buffer_info->range = VK_WHOLE_SIZE; + } + else + { + vk_buffer_view = &push_descriptor->u.vk_buffer_view; + vk_buffer_info = NULL; + } + + if (!vk_write_descriptor_set_from_root_descriptor(current_descriptor_write, + &root_signature->parameters[i], bindings->descriptor_set, + vk_buffer_view, vk_buffer_info)) + continue; + + ++descriptor_count; + ++current_descriptor_write; + ++current_buffer_info; + } + + VK_CALL(vkUpdateDescriptorSets(device->vk_device, descriptor_count, descriptor_writes, 0, NULL)); + bindings->push_descriptor_dirty_mask = 0; + +done: + vkd3d_free(descriptor_writes); + vkd3d_free(buffer_infos); +} + static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_command_list *list, VkPipelineBindPoint bind_point) { @@ -2327,7 +2413,7 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis if (!rs || !rs->pool_size_count || !rs->vk_set_layout) return; - if (bindings->descriptor_table_dirty_mask) + if (bindings->descriptor_table_dirty_mask || bindings->push_descriptor_dirty_mask) d3d12_command_list_prepare_descriptors(list, bind_point); for (i = 0; i < ARRAY_SIZE(bindings->descriptor_tables); ++i) @@ -2337,6 +2423,8 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis } bindings->descriptor_table_dirty_mask = 0; + d3d12_command_list_update_push_descriptors(list, bind_point); + if (bindings->descriptor_set) { VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point, @@ -3241,6 +3329,7 @@ static void d3d12_command_list_set_root_signature(struct d3d12_command_list *lis bindings->root_signature = root_signature; bindings->descriptor_set = VK_NULL_HANDLE; + bindings->push_descriptor_active_mask = 0; } static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootSignature(ID3D12GraphicsCommandList *iface, @@ -3405,6 +3494,11 @@ static void d3d12_command_list_set_root_cbv(struct d3d12_command_list *list, d3d12_command_list_prepare_descriptors(list, bind_point); descriptor_write.dstSet = bindings->descriptor_set; VK_CALL(vkUpdateDescriptorSets(list->device->vk_device, 1, &descriptor_write, 0, NULL)); + + 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; + bindings->push_descriptor_active_mask |= 1u << index; } } @@ -3487,6 +3581,10 @@ static void d3d12_command_list_set_root_descriptor(struct d3d12_command_list *li d3d12_command_list_prepare_descriptors(list, bind_point); descriptor_write.dstSet = bindings->descriptor_set; VK_CALL(vkUpdateDescriptorSets(list->device->vk_device, 1, &descriptor_write, 0, NULL)); + + 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; } } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index d744af5a5bac..bbd88aeca805 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -639,6 +639,19 @@ struct d3d12_command_allocator HRESULT d3d12_command_allocator_create(struct d3d12_device *device, D3D12_COMMAND_LIST_TYPE type, struct d3d12_command_allocator **allocator) DECLSPEC_HIDDEN; +struct vkd3d_push_descriptor +{ + union + { + VkBufferView vk_buffer_view; + struct + { + VkBuffer vk_buffer; + VkDeviceSize offset; + } cbv; + } u; +}; + struct vkd3d_pipeline_bindings { const struct d3d12_root_signature *root_signature; @@ -651,6 +664,11 @@ struct vkd3d_pipeline_bindings VkBufferView vk_uav_counter_views[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS]; uint8_t uav_counter_dirty_mask; + + /* Needed when VK_KHR_push_descriptor is not available. */ + struct vkd3d_push_descriptor push_descriptors[D3D12_MAX_ROOT_COST / 2]; + uint32_t push_descriptor_dirty_mask; + uint32_t push_descriptor_active_mask; }; /* ID3D12CommandList */ -- 2.18.1

2 1

[PATCH vkd3d 1/7] vkd3d: Simplify d3d12_command_list_set_root_cbv().
by Józef Kucia 11 Oct '18

11 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 55fa93347808..1ed92ca1d6a6 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3383,12 +3383,8 @@ static void d3d12_command_list_set_root_cbv(struct d3d12_command_list *list, buffer_info.offset = gpu_address - resource->gpu_address; buffer_info.range = VK_WHOLE_SIZE; - if (!vk_info->KHR_push_descriptor) - d3d12_command_list_prepare_descriptors(list, bind_point); - descriptor_write.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; descriptor_write.pNext = NULL; - descriptor_write.dstSet = bindings->descriptor_set; descriptor_write.dstBinding = root_descriptor->binding; descriptor_write.dstArrayElement = 0; descriptor_write.descriptorCount = 1; @@ -3399,11 +3395,14 @@ static void d3d12_command_list_set_root_cbv(struct d3d12_command_list *list, if (vk_info->KHR_push_descriptor) { + descriptor_write.dstSet = VK_NULL_HANDLE; 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_CALL(vkUpdateDescriptorSets(list->device->vk_device, 1, &descriptor_write, 0, NULL)); } } -- 2.18.1

2 1

[PATCH] wined3d: Refactor blend factor from DWORD to wined3d_color
by Daniel Ansorregui 11 Oct '18

11 Oct '18

Signed-off-by: Daniel Ansorregui <mailszeros(a)gmail.com> --- dlls/d3d11/device.c | 15 ++++++++------- dlls/d3d9/device.c | 9 ++++++++- dlls/wined3d/cs.c | 28 ++++++++++++++++++++++++++++ dlls/wined3d/device.c | 29 +++++++++++++++++++++++++++++ dlls/wined3d/state.c | 11 ++++++----- dlls/wined3d/stateblock.c | 7 +++++-- dlls/wined3d/utils.c | 3 ++- dlls/wined3d/wined3d.spec | 3 +++ dlls/wined3d/wined3d_private.h | 7 ++++++- include/wine/wined3d.h | 4 +++- 10 files changed, 98 insertions(+), 18 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 157ff0341a..9964568acb 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -700,6 +700,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi { struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); static const float default_blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; + struct wined3d_color blend_color; struct d3d_blend_state *blend_state_impl; const D3D11_BLEND_DESC *desc; @@ -709,6 +710,12 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi if (!blend_factor) blend_factor = default_blend_factor; + /* Assign the blend factor (given, or default) to wine color */ + blend_color.r = blend_factor[0]; + blend_color.g = blend_factor[1]; + blend_color.b = blend_factor[2]; + blend_color.a = blend_factor[3]; + wined3d_mutex_lock(); memcpy(device->blend_factor, blend_factor, 4 * sizeof(*blend_factor)); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEMASK, sample_mask); @@ -743,13 +750,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLENDALPHA, d->SrcBlendAlpha); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLENDALPHA, d->DestBlendAlpha); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOPALPHA, d->BlendOpAlpha); - - if (memcmp(blend_factor, default_blend_factor, sizeof(default_blend_factor)) - && (d->SrcBlend == D3D11_BLEND_BLEND_FACTOR || d->SrcBlend == D3D11_BLEND_INV_BLEND_FACTOR - || d->DestBlend == D3D11_BLEND_BLEND_FACTOR || d->DestBlend == D3D11_BLEND_INV_BLEND_FACTOR - || d->SrcBlendAlpha == D3D11_BLEND_BLEND_FACTOR || d->SrcBlendAlpha == D3D11_BLEND_INV_BLEND_FACTOR - || d->DestBlendAlpha == D3D11_BLEND_BLEND_FACTOR || d->DestBlendAlpha == D3D11_BLEND_INV_BLEND_FACTOR)) - FIXME("Ignoring blend factor %s.\n", debug_float4(blend_factor)); + wined3d_device_set_blendfactor(device->wined3d_device, &blend_color); } wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_COLORWRITEENABLE, desc->RenderTarget[0].RenderTargetWriteMask); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index a31360886b..c43e4971ff 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2221,7 +2221,14 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_SetRenderState(IDirect3DDevi TRACE("iface %p, state %#x, value %#x.\n", iface, state, value); wined3d_mutex_lock(); - wined3d_device_set_render_state(device->wined3d_device, state, value); + switch (state) + { + case D3DRS_BLENDFACTOR: + wined3d_device_set_blendfactor_integer(device->wined3d_device, value); + break; + default: + wined3d_device_set_render_state(device->wined3d_device, state, value); + } wined3d_mutex_unlock(); return D3D_OK; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index af1dbef84c..9cfa0b107b 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -49,6 +49,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_SAMPLER, WINED3D_CS_OP_SET_SHADER, WINED3D_CS_OP_SET_BLEND_STATE, + WINED3D_CS_OP_SET_BLENDFACTOR, WINED3D_CS_OP_SET_RASTERIZER_STATE, WINED3D_CS_OP_SET_RENDER_STATE, WINED3D_CS_OP_SET_TEXTURE_STATE, @@ -266,6 +267,12 @@ struct wined3d_cs_set_blend_state struct wined3d_blend_state *state; }; +struct wined3d_cs_set_blendfactor +{ + enum wined3d_cs_op opcode; + struct wined3d_color factor; +}; + struct wined3d_cs_set_rasterizer_state { enum wined3d_cs_op opcode; @@ -471,6 +478,7 @@ static const char *debug_cs_op(enum wined3d_cs_op op) WINED3D_TO_STR(WINED3D_CS_OP_SET_SAMPLER); WINED3D_TO_STR(WINED3D_CS_OP_SET_SHADER); WINED3D_TO_STR(WINED3D_CS_OP_SET_BLEND_STATE); + WINED3D_TO_STR(WINED3D_CS_OP_SET_BLENDFACTOR); WINED3D_TO_STR(WINED3D_CS_OP_SET_RASTERIZER_STATE); WINED3D_TO_STR(WINED3D_CS_OP_SET_RENDER_STATE); WINED3D_TO_STR(WINED3D_CS_OP_SET_TEXTURE_STATE); @@ -1555,6 +1563,25 @@ void wined3d_cs_emit_set_blend_state(struct wined3d_cs *cs, struct wined3d_blend cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); } +static void wined3d_cs_exec_set_blendfactor(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_blendfactor *op = data; + + cs->state.blend_factor = op->factor; + device_invalidate_state(cs->device, STATE_BLENDFACTOR); +} + +void wined3d_cs_emit_set_blendfactor(struct wined3d_cs *cs, struct wined3d_color *factor) +{ + struct wined3d_cs_set_blendfactor *op; + + op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op->opcode = WINED3D_CS_OP_SET_BLENDFACTOR; + op->factor = *factor; + + cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); +} + static void wined3d_cs_exec_set_rasterizer_state(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_set_rasterizer_state *op = data; @@ -2505,6 +2532,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_SAMPLER */ wined3d_cs_exec_set_sampler, /* WINED3D_CS_OP_SET_SHADER */ wined3d_cs_exec_set_shader, /* WINED3D_CS_OP_SET_BLEND_STATE */ wined3d_cs_exec_set_blend_state, + /* WINED3D_CS_OP_SET_BLENDFACTOR */ wined3d_cs_exec_set_blendfactor, /* WINED3D_CS_OP_SET_RASTERIZER_STATE */ wined3d_cs_exec_set_rasterizer_state, /* WINED3D_CS_OP_SET_RENDER_STATE */ wined3d_cs_exec_set_render_state, /* WINED3D_CS_OP_SET_TEXTURE_STATE */ wined3d_cs_exec_set_texture_state, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index abb2a89363..3b966d7eed 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1993,6 +1993,35 @@ struct wined3d_blend_state * CDECL wined3d_device_get_blend_state(const struct w return device->state.blend_state; } +void CDECL wined3d_device_set_blendfactor_integer(struct wined3d_device *device, DWORD factori) +{ + struct wined3d_color factor; + + wined3d_color_from_d3dcolor(&factor, factori); + wined3d_device_set_blendfactor(device, &factor); +} + +void CDECL wined3d_device_set_blendfactor(struct wined3d_device *device, struct wined3d_color *factor) +{ + struct wined3d_color *prev; + + TRACE("device %p, blendfactor %s.\n", device, debug_color(factor)); + + prev = &device->update_state->blend_factor; + if (!memcmp(prev, factor, sizeof(*factor))) + return; + + device->update_state->blend_factor = *factor; + wined3d_cs_emit_set_blendfactor(device->cs, factor); +} + +struct wined3d_color * CDECL wined3d_device_get_blendfactor(struct wined3d_device *device) +{ + TRACE("device %p.\n", device); + + return &device->state.blend_factor; +} + void CDECL wined3d_device_set_rasterizer_state(struct wined3d_device *device, struct wined3d_rasterizer_state *rasterizer_state) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 375bc6562a..0c2e340ee7 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -605,11 +605,10 @@ static void state_blendfactor_w(struct wined3d_context *context, const struct wi static void state_blendfactor(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_color color; + struct wined3d_color color = state->blend_factor; - TRACE("Setting blend factor to %#x.\n", state->render_states[WINED3D_RS_BLENDFACTOR]); + TRACE("Setting blend factor to %s\n", debug_color(&color)); - wined3d_color_from_d3dcolor(&color, state->render_states[WINED3D_RS_BLENDFACTOR]); GL_EXTCALL(glBlendColor(color.r, color.g, color.b, color.a)); checkGLcall("glBlendColor"); } @@ -4689,8 +4688,8 @@ const struct StateEntryTemplate misc_state_template[] = { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE2), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE3), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE3), state_colorwrite3 }, EXT_DRAW_BUFFERS2 }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE3), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_BLENDFACTOR), { STATE_RENDER(WINED3D_RS_BLENDFACTOR), state_blendfactor }, EXT_BLEND_COLOR }, - { STATE_RENDER(WINED3D_RS_BLENDFACTOR), { STATE_RENDER(WINED3D_RS_BLENDFACTOR), state_blendfactor_w }, WINED3D_GL_EXT_NONE }, + { STATE_BLENDFACTOR, { STATE_BLENDFACTOR, state_blendfactor }, EXT_BLEND_COLOR }, + { STATE_BLENDFACTOR, { STATE_BLENDFACTOR, state_blendfactor_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DEPTHBIAS), { STATE_RENDER(WINED3D_RS_DEPTHBIAS), state_depthbias }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_ZVISIBLE), { STATE_RENDER(WINED3D_RS_ZVISIBLE), state_zvisible }, WINED3D_GL_EXT_NONE }, /* Samplers */ @@ -5453,6 +5452,7 @@ static void validate_state_table(struct StateEntry *state_table) {149, 150}, {169, 169}, {177, 177}, + {193, 193}, {196, 197}, { 0, 0}, }; @@ -5488,6 +5488,7 @@ static void validate_state_table(struct StateEntry *state_table) STATE_POINT_ENABLE, STATE_COLOR_KEY, STATE_BLEND, + STATE_BLENDFACTOR, }; unsigned int i, current; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 45a4008ac4..da3e59eb5a 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -35,7 +35,6 @@ static const DWORD pixel_states_render[] = WINED3D_RS_ALPHAREF, WINED3D_RS_ALPHATESTENABLE, WINED3D_RS_ANTIALIASEDLINEENABLE, - WINED3D_RS_BLENDFACTOR, WINED3D_RS_BLENDOP, WINED3D_RS_BLENDOPALPHA, WINED3D_RS_BACK_STENCILFAIL, @@ -1255,7 +1254,6 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d state->render_states[WINED3D_RS_COLORWRITEENABLE1] = 0x0000000f; state->render_states[WINED3D_RS_COLORWRITEENABLE2] = 0x0000000f; state->render_states[WINED3D_RS_COLORWRITEENABLE3] = 0x0000000f; - state->render_states[WINED3D_RS_BLENDFACTOR] = 0xffffffff; state->render_states[WINED3D_RS_SRGBWRITEENABLE] = 0; state->render_states[WINED3D_RS_DEPTHBIAS] = 0; state->render_states[WINED3D_RS_WRAP8] = 0; @@ -1271,6 +1269,11 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d state->render_states[WINED3D_RS_DESTBLENDALPHA] = WINED3D_BLEND_ZERO; state->render_states[WINED3D_RS_BLENDOPALPHA] = WINED3D_BLEND_OP_ADD; + state->blend_factor.r = 1.0f; + state->blend_factor.g = 1.0f; + state->blend_factor.b = 1.0f; + state->blend_factor.a = 1.0f; + /* Texture Stage States - Put directly into state block, we will call function below */ for (i = 0; i < MAX_TEXTURES; ++i) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e3df24ade4..41e41a2184 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4716,7 +4716,6 @@ const char *debug_d3drenderstate(enum wined3d_render_state state) D3DSTATE_TO_STR(WINED3D_RS_COLORWRITEENABLE1); D3DSTATE_TO_STR(WINED3D_RS_COLORWRITEENABLE2); D3DSTATE_TO_STR(WINED3D_RS_COLORWRITEENABLE3); - D3DSTATE_TO_STR(WINED3D_RS_BLENDFACTOR); D3DSTATE_TO_STR(WINED3D_RS_SRGBWRITEENABLE); D3DSTATE_TO_STR(WINED3D_RS_DEPTHBIAS); D3DSTATE_TO_STR(WINED3D_RS_WRAP8); @@ -4965,6 +4964,8 @@ const char *debug_d3dstate(DWORD state) return "STATE_STREAM_OUTPUT"; if (STATE_IS_BLEND(state)) return "STATE_BLEND"; + if (STATE_IS_BLENDFACTOR(state)) + return "STATE_BLENDFACTOR"; return wine_dbg_sprintf("UNKNOWN_STATE(%#x)", state); } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 7944387bca..ac0a52efc9 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -58,6 +58,7 @@ @ cdecl wined3d_device_get_available_texture_mem(ptr) @ cdecl wined3d_device_get_base_vertex_index(ptr) @ cdecl wined3d_device_get_blend_state(ptr) +@ cdecl wined3d_device_get_blendfactor(ptr) @ cdecl wined3d_device_get_clip_plane(ptr long ptr) @ cdecl wined3d_device_get_clip_status(ptr ptr) @ cdecl wined3d_device_get_compute_shader(ptr) @@ -130,6 +131,8 @@ @ cdecl wined3d_device_restore_fullscreen_window(ptr ptr ptr) @ cdecl wined3d_device_set_base_vertex_index(ptr long) @ cdecl wined3d_device_set_blend_state(ptr ptr) +@ cdecl wined3d_device_set_blendfactor_integer(ptr long) +@ cdecl wined3d_device_set_blendfactor(ptr ptr) @ cdecl wined3d_device_set_clip_plane(ptr long ptr) @ cdecl wined3d_device_set_clip_status(ptr ptr) @ cdecl wined3d_device_set_compute_shader(ptr ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 20e626cd43..3d15fa6fcf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1645,7 +1645,10 @@ enum wined3d_pipeline #define STATE_BLEND (STATE_STREAM_OUTPUT + 1) #define STATE_IS_BLEND(a) ((a) == STATE_BLEND) -#define STATE_COMPUTE_OFFSET (STATE_BLEND + 1) +#define STATE_BLENDFACTOR (STATE_BLEND + 1) +#define STATE_IS_BLENDFACTOR(a) ((a) == STATE_BLENDFACTOR) + +#define STATE_COMPUTE_OFFSET (STATE_BLENDFACTOR + 1) #define STATE_COMPUTE_SHADER (STATE_COMPUTE_OFFSET) #define STATE_IS_COMPUTE_SHADER(a) ((a) == STATE_COMPUTE_SHADER) @@ -2934,6 +2937,7 @@ struct wined3d_state DWORD render_states[WINEHIGHEST_RENDER_STATE + 1]; struct wined3d_blend_state *blend_state; + struct wined3d_color blend_factor; struct wined3d_rasterizer_state *rasterizer_state; }; @@ -3642,6 +3646,7 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *query, DWORD flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_blend_state(struct wined3d_cs *cs, struct wined3d_blend_state *state) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_blendfactor(struct wined3d_cs *cs, struct wined3d_color *factor) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture *texture, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c62d3640e5..bcfbcbd134 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -388,7 +388,6 @@ enum wined3d_render_state WINED3D_RS_COLORWRITEENABLE1 = 190, WINED3D_RS_COLORWRITEENABLE2 = 191, WINED3D_RS_COLORWRITEENABLE3 = 192, - WINED3D_RS_BLENDFACTOR = 193, WINED3D_RS_SRGBWRITEENABLE = 194, WINED3D_RS_DEPTHBIAS = 195, WINED3D_RS_WRAP8 = 198, @@ -2265,6 +2264,7 @@ void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *devic UINT __cdecl wined3d_device_get_available_texture_mem(const struct wined3d_device *device); INT __cdecl wined3d_device_get_base_vertex_index(const struct wined3d_device *device); struct wined3d_blend_state * __cdecl wined3d_device_get_blend_state(const struct wined3d_device *device); +struct wined3d_color * __cdecl wined3d_device_get_blendfactor(struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_clip_plane(const struct wined3d_device *device, UINT plane_idx, struct wined3d_vec4 *plane); HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, @@ -2380,6 +2380,8 @@ void __cdecl wined3d_device_restore_fullscreen_window(struct wined3d_device *dev const RECT *window_rect); void __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index); void __cdecl wined3d_device_set_blend_state(struct wined3d_device *device, struct wined3d_blend_state *blend_state); +void __cdecl wined3d_device_set_blendfactor_integer(struct wined3d_device *device, DWORD factor); +void __cdecl wined3d_device_set_blendfactor(struct wined3d_device *device, struct wined3d_color *factor); HRESULT __cdecl wined3d_device_set_clip_plane(struct wined3d_device *device, UINT plane_idx, const struct wined3d_vec4 *plane); HRESULT __cdecl wined3d_device_set_clip_status(struct wined3d_device *device, -- 2.17.1

4 5

[PATCH] winevulkan: cleanup make_vulkan
by Michał Janiszewski 11 Oct '18

11 Oct '18

-- Michal Janiszewski

2 1