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

Józef Kucia : vkd3d: Add support for VK_EXT_shader_demote_to_helper_invocation.
by Alexandre Julliard July 31, 2019

July 31, 2019

Module: vkd3d Branch: master Commit: ee7d24a21323456525a7298e2ffca220610914b6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ee7d24a21323456525a7298… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Jul 6 07:36:30 2019 +0200 vkd3d: Add support for VK_EXT_shader_demote_to_helper_invocation. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 23 ++++++++++++++++++++++- libs/vkd3d/state.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 5 +++++ 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index b9ac829..979bb8c 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -133,6 +133,8 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = {VK_EXT_DEBUG_MARKER_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_debug_marker)}, {VK_EXT_DEPTH_CLIP_ENABLE_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_depth_clip_enable)}, {VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_descriptor_indexing)}, + {VK_EXT_SHADER_DEMOTE_TO_HELPER_INVOCATION_EXTENSION_NAME, + offsetof(struct vkd3d_vulkan_info, EXT_shader_demote_to_helper_invocation)}, {VK_EXT_TEXEL_BUFFER_ALIGNMENT_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_texel_buffer_alignment)}, {VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_transform_feedback)}, @@ -673,6 +675,7 @@ struct vkd3d_physical_device_info VkPhysicalDeviceConditionalRenderingFeaturesEXT conditional_rendering_features; VkPhysicalDeviceDepthClipEnableFeaturesEXT depth_clip_features; VkPhysicalDeviceDescriptorIndexingFeaturesEXT descriptor_indexing_features; + VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT demote_features; VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT texel_buffer_alignment_features; VkPhysicalDeviceTransformFeedbackFeaturesEXT xfb_features; VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT vertex_divisor_features; @@ -690,6 +693,7 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i VkPhysicalDeviceDescriptorIndexingFeaturesEXT *descriptor_indexing_features; VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *vertex_divisor_features; VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT *buffer_alignment_features; + VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT *demote_features; VkPhysicalDeviceDepthClipEnableFeaturesEXT *depth_clip_features; VkPhysicalDeviceMaintenance3Properties *maintenance3_properties; VkPhysicalDeviceTransformFeedbackPropertiesEXT *xfb_properties; @@ -703,6 +707,7 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i descriptor_indexing_features = &info->descriptor_indexing_features; descriptor_indexing_properties = &info->descriptor_indexing_properties; maintenance3_properties = &info->maintenance3_properties; + demote_features = &info->demote_features; buffer_alignment_features = &info->texel_buffer_alignment_features; buffer_alignment_properties = &info->texel_buffer_alignment_properties; vertex_divisor_features = &info->vertex_divisor_features; @@ -715,8 +720,10 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i depth_clip_features->pNext = conditional_rendering_features; descriptor_indexing_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT; descriptor_indexing_features->pNext = depth_clip_features; + demote_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES_EXT; + demote_features->pNext = descriptor_indexing_features; buffer_alignment_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_FEATURES_EXT; - buffer_alignment_features->pNext = descriptor_indexing_features; + buffer_alignment_features->pNext = demote_features; xfb_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT; xfb_features->pNext = buffer_alignment_features; vertex_divisor_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT; @@ -1023,6 +1030,7 @@ static void vkd3d_trace_physical_device_limits(const struct vkd3d_physical_devic static void vkd3d_trace_physical_device_features(const struct vkd3d_physical_device_info *info) { const VkPhysicalDeviceConditionalRenderingFeaturesEXT *conditional_rendering_features; + const VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT *demote_features; const VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT *buffer_alignment_features; const VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *divisor_features; const VkPhysicalDeviceDescriptorIndexingFeaturesEXT *descriptor_indexing; @@ -1142,6 +1150,10 @@ static void vkd3d_trace_physical_device_features(const struct vkd3d_physical_dev TRACE(" VkPhysicalDeviceDepthClipEnableFeaturesEXT:\n"); TRACE(" depthClipEnable: %#x.\n", depth_clip_features->depthClipEnable); + demote_features = &info->demote_features; + TRACE(" VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT:\n"); + TRACE(" shaderDemoteToHelperInvocation: %#x.\n", demote_features->shaderDemoteToHelperInvocation); + buffer_alignment_features = &info->texel_buffer_alignment_features; TRACE(" VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT:\n"); TRACE(" texelBufferAlignment: %#x.\n", buffer_alignment_features->texelBufferAlignment); @@ -1374,6 +1386,8 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vulkan_info->EXT_conditional_rendering = false; if (!physical_device_info->depth_clip_features.depthClipEnable) vulkan_info->EXT_depth_clip_enable = false; + if (!physical_device_info->demote_features.shaderDemoteToHelperInvocation) + vulkan_info->EXT_shader_demote_to_helper_invocation = false; if (!physical_device_info->texel_buffer_alignment_features.texelBufferAlignment) vulkan_info->EXT_texel_buffer_alignment = false; @@ -1403,6 +1417,13 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, return E_INVALIDARG; } + /* Shader extensions. */ + if (vulkan_info->EXT_shader_demote_to_helper_invocation) + { + vulkan_info->shader_extension_count = 1; + vulkan_info->shader_extensions[0] = VKD3D_SHADER_TARGET_EXTENSION_SPV_EXT_DEMOTE_TO_HELPER_INVOCATION; + } + /* Disable unused Vulkan features. */ features->shaderTessellationAndGeometryPointSize = VK_FALSE; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 26d4a7a..59a70b9 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2254,8 +2254,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s ps_compile_args.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS; ps_compile_args.next = NULL; ps_compile_args.target = VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0; - ps_compile_args.target_extension_count = 0; - ps_compile_args.target_extensions = NULL; + ps_compile_args.target_extension_count = vk_info->shader_extension_count; + ps_compile_args.target_extensions = vk_info->shader_extensions; ps_compile_args.parameter_count = ARRAY_SIZE(ps_shader_parameters); ps_compile_args.parameters = ps_shader_parameters; ps_compile_args.dual_source_blending = is_dual_source_blending(&desc->BlendState.RenderTarget[0]); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 6e2dc2b..6fe8524 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -49,6 +49,7 @@ #define VKD3D_DESCRIPTOR_MAGIC_RTV 0x00565452u #define VKD3D_MAX_QUEUE_FAMILY_COUNT 3u +#define VKD3D_MAX_SHADER_EXTENSIONS 1u #define VKD3D_MAX_SHADER_STAGES 5u #define VKD3D_MAX_VK_SYNC_OBJECTS 4u @@ -102,6 +103,7 @@ struct vkd3d_vulkan_info bool EXT_debug_marker; bool EXT_depth_clip_enable; bool EXT_descriptor_indexing; + bool EXT_shader_demote_to_helper_invocation; bool EXT_texel_buffer_alignment; bool EXT_transform_feedback; bool EXT_vertex_attribute_divisor; @@ -117,6 +119,9 @@ struct vkd3d_vulkan_info VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT texel_buffer_alignment_properties; + unsigned int shader_extension_count; + enum vkd3d_shader_target_extension shader_extensions[VKD3D_MAX_SHADER_EXTENSIONS]; + D3D_FEATURE_LEVEL max_feature_level; };

1 0

Józef Kucia : vkd3d-shader: Add support for SPV_EXT_demote_to_helper_invocation.
by Alexandre Julliard July 31, 2019

July 31, 2019

Module: vkd3d Branch: master Commit: 077e8b14597d17176850436674b94f4023620db1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=077e8b14597d17176850436… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Jul 6 07:36:29 2019 +0200 vkd3d-shader: Add support for SPV_EXT_demote_to_helper_invocation. Requires SPIRV-Headers commit dcce859e34cf0c23625ec75ac44df750aa2f4d70. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 12 +++++++++++- libs/vkd3d-shader/spirv.c | 42 +++++++++++++++++++++++++++++++++++++++++- libs/vkd3d/state.c | 2 ++ 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index fcf5db8..6b4d3f5 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -224,6 +224,13 @@ enum vkd3d_shader_target VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TARGET), }; +enum vkd3d_shader_target_extension +{ + VKD3D_SHADER_TARGET_EXTENSION_NONE, + + VKD3D_SHADER_TARGET_EXTENSION_SPV_EXT_DEMOTE_TO_HELPER_INVOCATION, +}; + struct vkd3d_shader_compile_arguments { enum vkd3d_shader_structure_type type; @@ -231,8 +238,11 @@ struct vkd3d_shader_compile_arguments enum vkd3d_shader_target target; + unsigned int target_extension_count; + const enum vkd3d_shader_target_extension *target_extensions; + unsigned int parameter_count; - struct vkd3d_shader_parameter *parameters; + const struct vkd3d_shader_parameter *parameters; bool dual_source_blending; const unsigned int *output_swizzles; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f17c7fa..0fb499e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -266,6 +266,7 @@ struct vkd3d_spirv_builder { uint64_t capability_mask; uint64_t capability_draw_parameters : 1; + uint64_t capability_demote_to_helper_invocation : 1; uint32_t ext_instr_set_glsl_450; SpvExecutionModel execution_model; @@ -311,6 +312,10 @@ static void vkd3d_spirv_enable_capability(struct vkd3d_spirv_builder *builder, { builder->capability_draw_parameters = 1; } + else if (cap == SpvCapabilityDemoteToHelperInvocationEXT) + { + builder->capability_demote_to_helper_invocation = 1; + } else { FIXME("Unhandled capability %#x.\n", cap); @@ -1222,6 +1227,11 @@ static void vkd3d_spirv_build_op_kill(struct vkd3d_spirv_builder *builder) vkd3d_spirv_build_op(&builder->function_stream, SpvOpKill); } +static void vkd3d_spirv_build_op_demote_to_helper_invocation(struct vkd3d_spirv_builder *builder) +{ + vkd3d_spirv_build_op(&builder->function_stream, SpvOpDemoteToHelperInvocationEXT); +} + static void vkd3d_spirv_build_op_return(struct vkd3d_spirv_builder *builder) { vkd3d_spirv_build_op(&builder->function_stream, SpvOpReturn); @@ -1703,10 +1713,14 @@ static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, } 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); /* extensions */ if (builder->capability_draw_parameters) vkd3d_spirv_build_op_extension(&stream, "SPV_KHR_shader_draw_parameters"); + if (builder->capability_demote_to_helper_invocation) + vkd3d_spirv_build_op_extension(&stream, "SPV_EXT_demote_to_helper_invocation"); if (builder->ext_instr_set_glsl_450) vkd3d_spirv_build_op_ext_inst_import(&stream, builder->ext_instr_set_glsl_450, "GLSL.std.450"); @@ -2148,6 +2162,21 @@ static bool vkd3d_dxbc_compiler_is_opengl_target(const struct vkd3d_dxbc_compile return vkd3d_dxbc_compiler_get_target(compiler) == VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5; } +static bool vkd3d_dxbc_compiler_is_target_extension_supported(const struct vkd3d_dxbc_compiler *compiler, + enum vkd3d_shader_target_extension extension) +{ + const struct vkd3d_shader_compile_arguments *args = compiler->compile_args; + unsigned int i; + + for (i = 0; args && i < args->target_extension_count; ++i) + { + if (args->target_extensions[i] == extension) + return true; + } + + return false; +} + static bool vkd3d_dxbc_compiler_check_shader_visibility(const struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_visibility visibility) { @@ -6477,7 +6506,18 @@ static void vkd3d_dxbc_compiler_emit_kill(struct vkd3d_dxbc_compiler *compiler, merge_block_id = vkd3d_dxbc_compiler_emit_conditional_branch(compiler, instruction, target_id); vkd3d_spirv_build_op_label(builder, target_id); - vkd3d_spirv_build_op_kill(builder); + + if (vkd3d_dxbc_compiler_is_target_extension_supported(compiler, + VKD3D_SHADER_TARGET_EXTENSION_SPV_EXT_DEMOTE_TO_HELPER_INVOCATION)) + { + vkd3d_spirv_build_op_demote_to_helper_invocation(builder); + vkd3d_spirv_build_op_branch(builder, merge_block_id); + } + else + { + vkd3d_spirv_build_op_kill(builder); + } + vkd3d_spirv_build_op_label(builder, merge_block_id); } diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 7946680..26d4a7a 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2254,6 +2254,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s ps_compile_args.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS; ps_compile_args.next = NULL; ps_compile_args.target = VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0; + ps_compile_args.target_extension_count = 0; + ps_compile_args.target_extensions = NULL; ps_compile_args.parameter_count = ARRAY_SIZE(ps_shader_parameters); ps_compile_args.parameters = ps_shader_parameters; ps_compile_args.dual_source_blending = is_dual_source_blending(&desc->BlendState.RenderTarget[0]);

1 0

Józef Kucia : vkd3d: Store vkd3d_format in {dsv, rtv}_desc.
by Alexandre Julliard July 31, 2019

July 31, 2019

Module: vkd3d Branch: master Commit: d9da1c904e20df44d2953f76c3e2d3d908fda694 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d9da1c904e20df44d2953f7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 30 11:40:30 2019 +0200 vkd3d: Store vkd3d_format in {dsv,rtv}_desc. Signed-off-by: Józef Kucia <jkucia(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 | 6 +++--- libs/vkd3d/resource.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index eeae9cf..30b4ae3 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4456,7 +4456,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi list->fb_width = max(list->fb_width, dsv_desc->width); list->fb_height = max(list->fb_height, dsv_desc->height); list->fb_layer_count = max(list->fb_layer_count, dsv_desc->layer_count); - list->dsv_format = dsv_desc->format; + list->dsv_format = dsv_desc->format->vk_format; } else { @@ -4595,7 +4595,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearDepthStencilView(ID3D12Gra d3d12_command_list_track_resource_usage(list, dsv_desc->resource); attachment_desc.flags = 0; - attachment_desc.format = dsv_desc->format; + attachment_desc.format = dsv_desc->format->vk_format; attachment_desc.samples = dsv_desc->sample_count; if (flags & D3D12_CLEAR_FLAG_DEPTH) { @@ -4643,7 +4643,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12Gra d3d12_command_list_track_resource_usage(list, rtv_desc->resource); attachment_desc.flags = 0; - attachment_desc.format = rtv_desc->format; + attachment_desc.format = rtv_desc->format->vk_format; attachment_desc.samples = rtv_desc->sample_count; attachment_desc.loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; attachment_desc.storeOp = VK_ATTACHMENT_STORE_OP_STORE; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index e0e1aad..054ad3f 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2827,8 +2827,8 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev return; rtv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_RTV; - rtv_desc->format = vkd3d_desc.format->vk_format; rtv_desc->sample_count = vk_samples_from_dxgi_sample_desc(&resource->desc.SampleDesc); + rtv_desc->format = vkd3d_desc.format; rtv_desc->width = d3d12_resource_desc_get_width(&resource->desc, vkd3d_desc.miplevel_idx); rtv_desc->height = d3d12_resource_desc_get_height(&resource->desc, vkd3d_desc.miplevel_idx); rtv_desc->layer_count = vkd3d_desc.layer_count; @@ -2910,8 +2910,8 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev return; dsv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_DSV; - dsv_desc->format = vkd3d_desc.format->vk_format; dsv_desc->sample_count = vk_samples_from_dxgi_sample_desc(&resource->desc.SampleDesc); + dsv_desc->format = vkd3d_desc.format; dsv_desc->width = d3d12_resource_desc_get_width(&resource->desc, vkd3d_desc.miplevel_idx); dsv_desc->height = d3d12_resource_desc_get_height(&resource->desc, vkd3d_desc.miplevel_idx); dsv_desc->layer_count = vkd3d_desc.layer_count; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9255580..e32a69f 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -518,8 +518,8 @@ HRESULT vkd3d_create_static_sampler(struct d3d12_device *device, struct d3d12_rtv_desc { uint32_t magic; - VkFormat format; VkSampleCountFlagBits sample_count; + const struct vkd3d_format *format; uint64_t width; unsigned int height; unsigned int layer_count; @@ -538,8 +538,8 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev struct d3d12_dsv_desc { uint32_t magic; - VkFormat format; VkSampleCountFlagBits sample_count; + const struct vkd3d_format *format; uint64_t width; unsigned int height; unsigned int layer_count;

1 0

Jeremy Newman : replace deprecated while each loops with foreach
by Jeremy Newman July 30, 2019

July 30, 2019

Module: appdb Branch: master Commit: 4b9ef856207133e12c6ac6825fbb799c033f11d1 URL: https://source.winehq.org/git/appdb.git/?a=commit;h=4b9ef856207133e12c6ac68… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jul 30 11:41:54 2019 -0500 replace deprecated while each loops with foreach --- include/application.php | 54 ++++++++++++------------- include/category.php | 36 ++++++++--------- include/html.php | 4 +- include/maintainer.php | 46 ++++++++++----------- include/maintainerView.php | 20 +++++----- include/sidebar_login.php | 10 ++--- include/tableve.php | 54 ++++++++++++------------- include/util.php | 18 +++++---- include/version.php | 66 +++++++++++++++---------------- preferences.php | 12 +++--- unit_test/test_application.php | 90 +++++++++++++++++++++--------------------- votestats.php | 10 ++--- 12 files changed, 211 insertions(+), 209 deletions(-) Diff: https://source.winehq.org/git/appdb.git/?a=commitdiff;h=4b9ef856207133e12c6…

1 0

Jeremy Newman : replace while each loops with foreach
by Jeremy Newman July 30, 2019

July 30, 2019

Module: website Branch: master Commit: c8a4bba855c5c92fdbd6a0ab66f749043940e257 URL: https://source.winehq.org/git/website.git/?a=commit;h=c8a4bba855c5c92fdbd6a… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jul 30 11:16:19 2019 -0500 replace while each loops with foreach --- include/config.php | 4 ++-- include/plugins/announce.php | 4 ++-- include/utils.php | 8 ++++---- include/wwn.php | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/config.php b/include/config.php index c3fbed8..86c65fe 100644 --- a/include/config.php +++ b/include/config.php @@ -41,7 +41,7 @@ class config if (preg_match('/^\@/', $arr[0])) { // array - $arr[0] = preg_replace('/\@/', '', $arr[0]); + $arr[0] = preg_replace('/\@/', '', $arr[0]); $this->{$arr[0]} = preg_split('/,\s+/', $arr[1]); } else if (preg_match('/^\%/', $arr[0])) @@ -50,7 +50,7 @@ class config $arr[0] = preg_replace('/\%/', '', $arr[0]); $this->{$arr[0]} = array(); $params = preg_split('/,\s+/', $arr[1]); - while (list($n, $m) = each($params)) + foreach ($params as $n => $m) { list($key, $val) = preg_split('/\|/', $m, 2); $this->{$arr[0]} = array_merge($this->{$arr[0]}, array($key => $val)); diff --git a/include/plugins/announce.php b/include/plugins/announce.php index fb707a0..39bcd25 100644 --- a/include/plugins/announce.php +++ b/include/plugins/announce.php @@ -21,7 +21,7 @@ $title = ""; if ($arr = file($announce)) { $in_header = 1; - while (list($c,$val) = each($arr)) + foreach ($arr as $c => $val) { if ($c == 0) $title = $html->encode(trim($arr[$c])); @@ -42,7 +42,7 @@ if ($arr = file($announce)) $arr[$c] = preg_replace("/AUTHORS/", "<a href=\"".$config->git_tree."/wine.git/".$tag.":\\0\">\\0</a>", $arr[$c]); - } + } else if ($in_bugs) { $arr[$c] = preg_replace("/^( +)([0-9]+)/", diff --git a/include/utils.php b/include/utils.php index 21d5253..4876bd8 100644 --- a/include/utils.php +++ b/include/utils.php @@ -224,10 +224,10 @@ function get_files ($dir, $filter = null) array_push($files, $entry); } closedir($d); - + //sort dir sort($files); - + return $files; } @@ -288,7 +288,7 @@ function bytes2human ($bytes) // search an array for a key, and optionally the value function in_array_key ($key, $array, $value = false) { - while (list($k, $v) = each($array)) + foreach ($array as $k => $v) { if ($key == $k) { @@ -366,7 +366,7 @@ function array_qsort (&$array, $column=0, $order=SORT_ASC, $first=0, $last= -2) // $order - SORT_ASC (default) for ascending or SORT_DESC for descending // $first - start index (row) for partial array sort // $last - stop index (row) for partial array sort - + if($last == -2) $last = count($array) - 1; if($last > $first) { diff --git a/include/wwn.php b/include/wwn.php index 7203b2f..d13957e 100644 --- a/include/wwn.php +++ b/include/wwn.php @@ -6,7 +6,7 @@ by Jeremy Newman <jnewman(a)codeweavers.com> */ -class wwn +class wwn { public $mode = 'wwn'; public $currentTag; @@ -114,7 +114,7 @@ class wwn if ($limit == 0) $back = '<div align=center><table cellpadding=0 cellspacing=20 width="100%"><tr valign=top>'."\n"; - while(list($issue,$file) = each($issues)) + foreach ($issues as $issue => $file) { // inner counter $num++; @@ -218,7 +218,7 @@ class wwn } $c = 0; - while(list($id,$sum) = each($this->summary)) + foreach ($this->summary as $id => $sum) { $summary_box .= '<li><a href="'.$html->_web_root."/".PAGE."/".$cur."#".$sum.'" class="small">'.$sum.'</a></li>'."\n"; $c++; @@ -460,7 +460,7 @@ class wwn if (isset($this->map_array[strtolower($name)])) { $attribs = ""; - while(list($key,$value) = each($attrs)) + foreach ($attrs as $key => $value) { $attribs .= " $key=\"$value\""; }

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/ source/git/website
by Jeremy Newman July 30, 2019

July 30, 2019

Module: website Branch: master Commit: 3420777678fd6db3da5fcf6fb24b2257c079042f URL: https://source.winehq.org/git/website.git/?a=commit;h=3420777678fd6db3da5fc… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jul 30 11:16:11 2019 -0500 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

Jeremy Newman : remove unused funcs and fix for PHP 7.2
by Jeremy Newman July 30, 2019

July 30, 2019

Module: website Branch: master Commit: 2a55925f0a9b8bf38e20a66e912a91c323461602 URL: https://source.winehq.org/git/website.git/?a=commit;h=2a55925f0a9b8bf38e20a… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jul 30 11:14:39 2019 -0500 remove unused funcs and fix for PHP 7.2 * remove some unused code * while each loops are deprecated, use foreach --- include/html.php | 518 ++++--------------------------------------------------- 1 file changed, 30 insertions(+), 488 deletions(-) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=2a55925f0a9b8bf38…

1 0

Alexandre Julliard : Wine release 4.12.1
by Alexandre Julliard July 7, 2019

July 7, 2019

Module: website Branch: master Commit: 8daa8d91847ba242a0643b754b663962c51fe860 URL: https://source.winehq.org/git/website.git/?a=commit;h=8daa8d91847ba242a0643… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jul 7 11:26:51 2019 +0200 Wine release 4.12.1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019070701.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2019070701.xml b/news/en/2019070701.xml new file mode 100644 index 0000000..7775c5e --- /dev/null +++ b/news/en/2019070701.xml @@ -0,0 +1,12 @@ +<news> +<date>July 7, 2019</date> +<title>Wine 4.12.1 Released</title> +<body> +<p> The Wine development release 4.12.1 is now available.</p> +<p> <a href="{$root}/announce/4.12.1">What's new</a> in this release: +<ul> + <li>Fixes for broken 64-bit prefix initialization.</li> +</ul> +<p>The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.12.1.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Tag wine-4.12.1 : Alexandre Julliard : Release 4.12.1
by Alexandre Julliard July 7, 2019

July 7, 2019

Module: wine Branch: refs/tags/wine-4.12.1 Tag: bbca1d9e4f4635c258ec9bbcd66fbd799cdaa434 URL: https://source.winehq.org/git/wine.git/?a=tag;h=bbca1d9e4f4635c258ec9bbcd66… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jul 7 11:25:09 2019 +0200 Release 4.12.1

1 0

Alexandre Julliard : Release 4.12.1.
by Alexandre Julliard July 7, 2019

July 7, 2019

Module: wine Branch: master Commit: 82543e7858758025b50bb5556cbedc43f4d628c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82543e7858758025b50bb555… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jul 7 11:25:09 2019 +0200 Release 4.12.1. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 430 +++----------------------------------------------------------- VERSION | 2 +- configure | 18 +-- 3 files changed, 29 insertions(+), 421 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=82543e7858758025b50b…

1 0