wine-commits January 2019

wine-commits@winehq.org

2 participants
499 discussions

Józef Kucia : vkd3d: Implement d3d12_command_list_SOSetTargets().
by Alexandre Julliard 14 Jan '19

14 Jan '19

Module: vkd3d Branch: master Commit: e73fe9cc4113df3a8a9bcf1f2da8673a266d0669 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e73fe9cc4113df3a8a9bcf1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 14 17:05:40 2019 +0100 vkd3d: Implement d3d12_command_list_SOSetTargets(). 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 | 62 +++++++++++++++++++++++++++++++++++++++++++++- libs/vkd3d/vkd3d_private.h | 3 +++ 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index ce4af4e..8402668 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1754,6 +1754,9 @@ static void d3d12_command_list_reset_state(struct d3d12_command_list *list, list->state = NULL; + memset(list->so_counter_buffers, 0, sizeof(list->so_counter_buffers)); + memset(list->so_counter_buffer_offsets, 0, sizeof(list->so_counter_buffer_offsets)); + ID3D12GraphicsCommandList_SetPipelineState(iface, initial_pipeline_state); } @@ -3609,7 +3612,64 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12Graphi static void STDMETHODCALLTYPE d3d12_command_list_SOSetTargets(ID3D12GraphicsCommandList *iface, UINT start_slot, UINT view_count, const D3D12_STREAM_OUTPUT_BUFFER_VIEW *views) { - FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", iface, start_slot, view_count, views); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + VkDeviceSize offsets[ARRAY_SIZE(list->so_counter_buffers)]; + VkDeviceSize sizes[ARRAY_SIZE(list->so_counter_buffers)]; + VkBuffer buffers[ARRAY_SIZE(list->so_counter_buffers)]; + struct vkd3d_gpu_va_allocator *gpu_va_allocator; + const struct vkd3d_vk_device_procs *vk_procs; + struct d3d12_resource *resource; + unsigned int i, first, count; + + TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); + + d3d12_command_list_end_current_render_pass(list); + + if (!list->device->vk_info.EXT_transform_feedback) + { + FIXME("Transform feedback is not supported by Vulkan implementation.\n"); + return; + } + + if (start_slot >= ARRAY_SIZE(buffers) || view_count > ARRAY_SIZE(buffers) - start_slot) + { + WARN("Invalid start slot %u / view count %u.\n", start_slot, view_count); + return; + } + + vk_procs = &list->device->vk_procs; + gpu_va_allocator = &list->device->gpu_va_allocator; + + count = 0; + first = start_slot; + for (i = 0; i < view_count; ++i) + { + if (views[i].BufferLocation && views[i].SizeInBytes) + { + resource = vkd3d_gpu_va_allocator_dereference(gpu_va_allocator, views[i].BufferLocation); + buffers[count] = resource->u.vk_buffer; + offsets[count] = views[i].BufferLocation - resource->gpu_address; + sizes[count] = views[i].SizeInBytes; + + resource = vkd3d_gpu_va_allocator_dereference(gpu_va_allocator, views[i].BufferFilledSizeLocation); + list->so_counter_buffers[start_slot + i] = resource->u.vk_buffer; + list->so_counter_buffer_offsets[start_slot + i] = views[i].BufferFilledSizeLocation - resource->gpu_address; + ++count; + } + else + { + if (count) + VK_CALL(vkCmdBindTransformFeedbackBuffersEXT(list->vk_command_buffer, first, count, buffers, offsets, sizes)); + count = 0; + first = start_slot + i + 1; + + list->so_counter_buffers[start_slot + i] = VK_NULL_HANDLE; + list->so_counter_buffer_offsets[start_slot + i] = 0; + } + } + + if (count) + VK_CALL(vkCmdBindTransformFeedbackBuffersEXT(list->vk_command_buffer, first, count, buffers, offsets, sizes)); } static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12GraphicsCommandList *iface, diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 3b78a5e..62245b1 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -794,6 +794,9 @@ struct d3d12_command_list struct d3d12_command_allocator *allocator; struct d3d12_device *device; + VkBuffer so_counter_buffers[D3D12_SO_BUFFER_SLOT_COUNT]; + VkDeviceSize so_counter_buffer_offsets[D3D12_SO_BUFFER_SLOT_COUNT]; + struct vkd3d_private_store private_store; };

1 0

Józef Kucia : vkd3d: Set transform feedback buffer usage flags.
by Alexandre Julliard 14 Jan '19

14 Jan '19

Module: vkd3d Branch: master Commit: 799a8b41ce5bc0c2736e493c29076827cbff180a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=799a8b41ce5bc0c2736e493… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 14 17:05:39 2019 +0100 vkd3d: Set transform feedback buffer usage flags. 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/resource.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 5b41108..64d6e65 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -481,6 +481,13 @@ HRESULT vkd3d_create_buffer(struct d3d12_device *device, | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT; + if (heap_properties->Type == D3D12_HEAP_TYPE_DEFAULT + && device->vk_info.EXT_transform_feedback) + { + buffer_info.usage |= VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT + | VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT; + } + if (heap_properties->Type == D3D12_HEAP_TYPE_UPLOAD) buffer_info.usage &= ~VK_BUFFER_USAGE_TRANSFER_DST_BIT; else if (heap_properties->Type == D3D12_HEAP_TYPE_READBACK)

1 0

Józef Kucia : vkd3d: Enable VK_EXT_transform_feedback.
by Alexandre Julliard 14 Jan '19

14 Jan '19

Module: vkd3d Branch: master Commit: 5759cb52e05960bedfc7ec24dbf14ffa4b4bb073 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5759cb52e05960bedfc7ec2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 14 17:05:38 2019 +0100 vkd3d: Enable VK_EXT_transform_feedback. 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> --- configure.ac | 2 +- libs/vkd3d/device.c | 39 +++++++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 1 + libs/vkd3d/vulkan_procs.h | 6 ++++++ 4 files changed, 47 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 8c82741..6e55279 100644 --- a/configure.ac +++ b/configure.ac @@ -61,7 +61,7 @@ AS_IF([test "x$ac_cv_header_spirv_unified1_GLSL_std_450_h" != "xyes" \ -a "x$ac_cv_header_vulkan_GLSL_std_450_h" != "xyes"], [AC_MSG_ERROR([GLSL.std.450.h not found.])]) -VKD3D_CHECK_VULKAN_HEADER_VERSION([84], [AC_MSG_ERROR([Vulkan headers are too old, 1.1.84 is required.])]) +VKD3D_CHECK_VULKAN_HEADER_VERSION([88], [AC_MSG_ERROR([Vulkan headers are too old, 1.1.88 is required.])]) dnl Check for libraries m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG], [m4_fatal([pkg-config autoconf macros not found.])]) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 9b09f66..71666f9 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -84,6 +84,8 @@ static const char * const required_device_extensions[] = static const struct vkd3d_optional_extension_info optional_device_extensions[] = { {VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_push_descriptor)}, + {VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, + offsetof(struct vkd3d_vulkan_info, EXT_transform_feedback)}, {VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_vertex_attribute_divisor)}, }; @@ -621,6 +623,7 @@ static void vkd3d_trace_physical_device_limits(const VkPhysicalDeviceProperties2 { const VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT *divisor_properties; const VkPhysicalDeviceLimits *limits = &properties2->properties.limits; + const VkPhysicalDeviceTransformFeedbackPropertiesEXT *xfb; TRACE("Device limits:\n"); TRACE(" maxImageDimension1D: %u.\n", limits->maxImageDimension1D); @@ -739,6 +742,22 @@ static void vkd3d_trace_physical_device_limits(const VkPhysicalDeviceProperties2 TRACE(" optimalBufferCopyRowPitchAlignment: %#"PRIx64".\n", limits->optimalBufferCopyRowPitchAlignment); TRACE(" nonCoherentAtomSize: %#"PRIx64".\n", limits->nonCoherentAtomSize); + xfb = vk_find_struct(properties2->pNext, PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_PROPERTIES_EXT); + if (xfb) + { + TRACE(" VkPhysicalDeviceTransformFeedbackPropertiesEXT:\n"); + TRACE(" maxTransformFeedbackStreams: %u.\n", xfb->maxTransformFeedbackStreams); + TRACE(" maxTransformFeedbackBuffers: %u.\n", xfb->maxTransformFeedbackBuffers); + TRACE(" maxTransformFeedbackBufferSize: %#"PRIx64".\n", xfb->maxTransformFeedbackBufferSize); + TRACE(" maxTransformFeedbackStreamDataSize: %u.\n", xfb->maxTransformFeedbackStreamDataSize); + TRACE(" maxTransformFeedbackBufferDataSize: %u.\n", xfb->maxTransformFeedbackBufferDataSize); + TRACE(" maxTransformFeedbackBufferDataStride: %u.\n", xfb->maxTransformFeedbackBufferDataStride); + TRACE(" transformFeedbackQueries: %#x.\n", xfb->transformFeedbackQueries); + TRACE(" transformFeedbackStreamsLinesTriangles: %#x.\n", xfb->transformFeedbackStreamsLinesTriangles); + TRACE(" transformFeedbackRasterizationStreamSelect: %#x.\n", xfb->transformFeedbackRasterizationStreamSelect); + TRACE(" transformFeedbackDraw: %x.\n", xfb->transformFeedbackDraw); + } + divisor_properties = vk_find_struct(properties2->pNext, PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT); if (divisor_properties) @@ -752,6 +771,7 @@ static void vkd3d_trace_physical_device_features(const VkPhysicalDeviceFeatures2 { const VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *divisor_features; const VkPhysicalDeviceFeatures *features = &features2->features; + const VkPhysicalDeviceTransformFeedbackFeaturesEXT *xfb; TRACE("Device features:\n"); TRACE(" robustBufferAccess: %#x.\n", features->robustBufferAccess); @@ -810,6 +830,14 @@ static void vkd3d_trace_physical_device_features(const VkPhysicalDeviceFeatures2 TRACE(" variableMultisampleRate: %#x.\n", features->variableMultisampleRate); TRACE(" inheritedQueries: %#x.\n", features->inheritedQueries); + xfb = vk_find_struct(features2->pNext, PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT); + if (xfb) + { + TRACE(" VkPhysicalDeviceTransformFeedbackFeaturesEXT:\n"); + TRACE(" transformFeedback: %#x.\n", xfb->transformFeedback); + TRACE(" geometryStreams: %#x.\n", xfb->geometryStreams); + } + divisor_features = vk_find_struct(features2->pNext, PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT); if (divisor_features) { @@ -863,6 +891,9 @@ static void vkd3d_check_feature_level_11_requirements(const struct vkd3d_vulkan_ CHECK_FEATURE(shaderClipDistance); CHECK_FEATURE(shaderCullDistance); + if (!vk_info->EXT_transform_feedback) + WARN("Stream output is not supported.\n"); + if (!vk_info->EXT_vertex_attribute_divisor) WARN("Vertex attribute instance rate divisor is not supported.\n"); else if (!vk_info->vertex_attrib_zero_divisor) @@ -880,6 +911,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT vertex_divisor_properties; const VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *divisor_features; + VkPhysicalDeviceTransformFeedbackPropertiesEXT xfb_properties; VkPhysicalDevice physical_device = device->vk_physical_device; VkPhysicalDeviceFeatures *features = &features2->features; struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; @@ -892,8 +924,11 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vkd3d_trace_physical_device_features(features2); + memset(&xfb_properties, 0, sizeof(xfb_properties)); + xfb_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_PROPERTIES_EXT; memset(&vertex_divisor_properties, 0, sizeof(vertex_divisor_properties)); vertex_divisor_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT; + vertex_divisor_properties.pNext = &xfb_properties; device_properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; device_properties2.pNext = &vertex_divisor_properties; if (vulkan_info->KHR_get_physical_device_properties2) @@ -1092,6 +1127,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, unsigned int direct_queue_family_index, copy_queue_family_index, compute_queue_family_index; const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT vertex_divisor_features; + VkPhysicalDeviceTransformFeedbackFeaturesEXT xfb_features; struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; VkQueueFamilyProperties *queue_properties = NULL; VkDeviceQueueCreateInfo *queue_info = NULL; @@ -1182,8 +1218,11 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VK_CALL(vkGetPhysicalDeviceMemoryProperties(physical_device, &device->memory_properties)); + memset(&xfb_features, 0, sizeof(xfb_features)); + xfb_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT; memset(&vertex_divisor_features, 0, sizeof(vertex_divisor_features)); vertex_divisor_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT; + vertex_divisor_features.pNext = &xfb_features; features2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2; features2.pNext = &vertex_divisor_features; if (vulkan_info->KHR_get_physical_device_properties2) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9ffaa79..3b78a5e 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -87,6 +87,7 @@ struct vkd3d_vulkan_info bool EXT_debug_report; /* device extensions */ bool KHR_push_descriptor; + bool EXT_transform_feedback; bool EXT_vertex_attribute_divisor; bool vertex_attrib_zero_divisor; diff --git a/libs/vkd3d/vulkan_procs.h b/libs/vkd3d/vulkan_procs.h index ac03b3f..be983ec 100644 --- a/libs/vkd3d/vulkan_procs.h +++ b/libs/vkd3d/vulkan_procs.h @@ -176,6 +176,12 @@ VK_DEVICE_PFN(vkUpdateDescriptorSets) VK_DEVICE_PFN(vkWaitForFences) /* VK_KHR_push_descriptor */ VK_DEVICE_EXT_PFN(vkCmdPushDescriptorSetKHR) +/* VK_EXT_transform_feedback */ +VK_DEVICE_EXT_PFN(vkCmdBeginQueryIndexedEXT) +VK_DEVICE_EXT_PFN(vkCmdBeginTransformFeedbackEXT) +VK_DEVICE_EXT_PFN(vkCmdBindTransformFeedbackBuffersEXT) +VK_DEVICE_EXT_PFN(vkCmdEndQueryIndexedEXT) +VK_DEVICE_EXT_PFN(vkCmdEndTransformFeedbackEXT) #undef VK_INSTANCE_PFN #undef VK_INSTANCE_EXT_PFN

1 0

Józef Kucia : include: Add stream output constants.
by Alexandre Julliard 11 Jan '19

11 Jan '19

Module: vkd3d Branch: master Commit: bf4619115d61100227657efdccab5fb21af6e819 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bf4619115d61100227657ef… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 11 16:45:36 2019 +0100 include: Add stream output constants. 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_d3d12.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 29f4ab3..c025dbe 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -54,6 +54,12 @@ const UINT D3D12_REQ_TEXTURE3D_U_V_OR_W_DIMENSION = 2048; const UINT D3D12_REQ_TEXTURECUBE_DIMENSION = 16384; const UINT D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES = 0xffffffff; const UINT D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT = 8; +const UINT D3D12_SO_BUFFER_MAX_STRIDE_IN_BYTES = 2048; +const UINT D3D12_SO_BUFFER_SLOT_COUNT = 4; +const UINT D3D12_SO_DDI_REGISTER_INDEX_DENOTING_GAP = 0xffffffff; +const UINT D3D12_SO_NO_RASTERIZED_STREAM = 0xffffffff; +const UINT D3D12_SO_OUTPUT_COMPONENT_COUNT = 128; +const UINT D3D12_SO_STREAM_COUNT = 4; const UINT D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT = 256; const UINT D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT = 4194304; const UINT D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT = 65536;

1 0

Józef Kucia : vkd3d: Add FIXME() for sample mask.
by Alexandre Julliard 11 Jan '19

11 Jan '19

Module: vkd3d Branch: master Commit: c509e6e83f284967a3fc900abab46419acc3ef6c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c509e6e83f284967a3fc900… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 11 16:45:35 2019 +0100 vkd3d: Add FIXME() for sample mask. 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/state.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 771ef24..86ceee3 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2353,6 +2353,9 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s if (!graphics->attachment_count && !(desc->PS.pShaderBytecode && desc->PS.BytecodeLength)) graphics->rs_desc.rasterizerDiscardEnable = VK_TRUE; + if (desc->SampleMask != ~0u) + FIXME("Ignoring sample mask %#x.\n", desc->SampleMask); + graphics->ms_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO; graphics->ms_desc.pNext = NULL; graphics->ms_desc.flags = 0;

1 0

Józef Kucia : include: Include stdbool.h in vkd3d_shader.h.
by Alexandre Julliard 11 Jan '19

11 Jan '19

Module: vkd3d Branch: master Commit: fbcc78d2f20611dd9932deacd0940bf0015ea7e4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fbcc78d2f20611dd9932dea… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 11 16:45:34 2019 +0100 include: Include stdbool.h in vkd3d_shader.h. 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 1153fde..946defb 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -19,6 +19,7 @@ #ifndef __VKD3D_SHADER_H #define __VKD3D_SHADER_H +#include <stdbool.h> #include <vkd3d_types.h> #ifdef __cplusplus

1 0

Józef Kucia : vkd3d-shader: Declare OriginUpperLeft execution mode for fragment shaders.
by Alexandre Julliard 11 Jan '19

11 Jan '19

Module: vkd3d Branch: master Commit: dadf2eda08ebd2cc93a45563d61085e1696f853e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=dadf2eda08ebd2cc93a4556… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 11 16:45:33 2019 +0100 vkd3d-shader: Declare OriginUpperLeft execution mode for fragment shaders. Required by the Vulkan spec: "fragment entry points must declare OriginUpperLeft." 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-shader/spirv.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a24585c..9a14e80 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1901,6 +1901,21 @@ struct vkd3d_dxbc_compiler static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_compiler *compiler); +static void vkd3d_dxbc_compiler_emit_execution_mode(struct vkd3d_dxbc_compiler *compiler, + SpvExecutionMode mode, const uint32_t *literals, unsigned int literal_count) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + + vkd3d_spirv_build_op_execution_mode(&builder->execution_mode_stream, + builder->main_function_id, mode, literals, literal_count); +} + +static void vkd3d_dxbc_compiler_emit_execution_mode1(struct vkd3d_dxbc_compiler *compiler, + SpvExecutionMode mode, const uint32_t literal) +{ + vkd3d_dxbc_compiler_emit_execution_mode(compiler, mode, &literal, 1); +} + struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_desc *shader_desc, uint32_t compiler_options, const struct vkd3d_shader_interface *shader_interface, @@ -1943,6 +1958,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader break; case VKD3D_SHADER_TYPE_PIXEL: vkd3d_spirv_set_execution_model(&compiler->spirv_builder, SpvExecutionModelFragment); + vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeOriginUpperLeft, NULL, 0); break; case VKD3D_SHADER_TYPE_COMPUTE: vkd3d_spirv_set_execution_model(&compiler->spirv_builder, SpvExecutionModelGLCompute); @@ -2719,21 +2735,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_reg(struct vkd3d_dxbc_compiler *co return val_id; } -static void vkd3d_dxbc_compiler_emit_execution_mode(struct vkd3d_dxbc_compiler *compiler, - SpvExecutionMode mode, const uint32_t *literals, unsigned int literal_count) -{ - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - - vkd3d_spirv_build_op_execution_mode(&builder->execution_mode_stream, - builder->main_function_id, mode, literals, literal_count); -} - -static void vkd3d_dxbc_compiler_emit_execution_mode1(struct vkd3d_dxbc_compiler *compiler, - SpvExecutionMode mode, const uint32_t literal) -{ - vkd3d_dxbc_compiler_emit_execution_mode(compiler, mode, &literal, 1); -} - static uint32_t vkd3d_dxbc_compiler_emit_abs(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, DWORD write_mask, uint32_t val_id) {

1 0

Alexandre Julliard : Wine release 4.0-rc6
by Alexandre Julliard 11 Jan '19

11 Jan '19

Module: website Branch: master Commit: b7fdc2ae08855be328c61408d8de75a6a7df1022 URL: https://source.winehq.org/git/website.git/?a=commit;h=b7fdc2ae08855be328c61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 11 19:05:44 2019 +0100 Wine release 4.0-rc6 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019011101.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2019011101.xml b/news/en/2019011101.xml new file mode 100644 index 0000000..64c06b7 --- /dev/null +++ b/news/en/2019011101.xml @@ -0,0 +1,12 @@ +<news> +<date>January 11, 2019</date> +<title>Wine 4.0-rc6 Released</title> +<body> + The Wine development release 4.0-rc6 is now available. + <a href="{$root}/announce/4.0-rc6">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.0/wine-4.0-rc6.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>. +</body></news>

1 0

Tag wine-4.0-rc6 : Alexandre Julliard : Release 4.0-rc6
by Alexandre Julliard 11 Jan '19

11 Jan '19

Module: wine Branch: refs/tags/wine-4.0-rc6 Tag: 88a30b31d94a295732fe920d10654b448aa27959 URL: https://source.winehq.org/git/wine.git/?a=tag;h=88a30b31d94a295732fe920d106… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 11 19:03:44 2019 +0100 Release 4.0-rc6

1 0

Alexandre Julliard : Release 4.0-rc6.
by Alexandre Julliard 11 Jan '19

11 Jan '19

Module: wine Branch: master Commit: 5b72f909bb80c690e21bb33cadd3913903c38019 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b72f909bb80c690e21bb33c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 11 19:03:44 2019 +0100 Release 4.0-rc6. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 152 +++++++++++++++++++++++++++++++++++++++++++------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 ++++---- 4 files changed, 117 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5b72f909bb80c690e21b…

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2019