January 2019 - Wine-devel - list.winehq.org

[PATCH vkd3d 04/10] vkd3d: Implement RasterizedStream.
by Józef Kucia 14 Jan '19

14 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 1 + libs/vkd3d/state.c | 27 ++++++++++++++++++++++++++- libs/vkd3d/vkd3d_private.h | 26 +++++++++++++++----------- 3 files changed, 42 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 71666f965416..03a7a25bab8e 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -940,6 +940,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vulkan_info->device_limits = device_properties2.properties.limits; vulkan_info->sparse_properties = device_properties2.properties.sparseProperties; + vulkan_info->rasterization_stream = xfb_properties.transformFeedbackRasterizationStreamSelect; vulkan_info->max_vertex_attrib_divisor = max(vertex_divisor_properties.maxVertexAttribDivisor, 1); device->feature_options.DoublePrecisionFloatShaderOps = features->shaderFloat64; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 86ceee31803e..7af8b6030d58 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1614,6 +1614,27 @@ static void rs_desc_from_d3d12(struct VkPipelineRasterizationStateCreateInfo *vk FIXME("Ignoring ConservativeRaster %#x.\n", d3d12_desc->ConservativeRaster); } +static void rs_stream_desc_from_d3d12(VkPipelineRasterizationStateStreamCreateInfoEXT *vk_desc, + VkPipelineRasterizationStateCreateInfo *vk_rs_desc, const D3D12_STREAM_OUTPUT_DESC *so_desc, + const struct vkd3d_vulkan_info *vk_info) +{ + if (!so_desc->RasterizedStream || so_desc->RasterizedStream == D3D12_SO_NO_RASTERIZED_STREAM) + return; + + if (!vk_info->rasterization_stream) + { + FIXME("Rasterization stream select is not supported by Vulkan implementation.\n"); + return; + } + + vk_desc->sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_STREAM_CREATE_INFO_EXT; + vk_desc->pNext = NULL; + vk_desc->flags = 0; + vk_desc->rasterizationStream = so_desc->RasterizedStream; + + vk_rs_desc->pNext = vk_desc; +} + static enum VkStencilOp vk_stencil_op_from_d3d12(D3D12_STENCIL_OP op) { switch (op) @@ -1916,6 +1937,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s unsigned int ps_output_swizzle[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT]; struct d3d12_graphics_pipeline_state *graphics = &state->u.graphics; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + const D3D12_STREAM_OUTPUT_DESC *so_desc = &desc->StreamOutput; VkVertexInputBindingDivisorDescriptionEXT *binding_divisor; const struct vkd3d_vulkan_info *vk_info = &device->vk_info; const struct vkd3d_shader_compile_arguments *compile_args; @@ -2350,9 +2372,12 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s } rs_desc_from_d3d12(&graphics->rs_desc, &desc->RasterizerState); - if (!graphics->attachment_count && !(desc->PS.pShaderBytecode && desc->PS.BytecodeLength)) + if ((!graphics->attachment_count && !(desc->PS.pShaderBytecode && desc->PS.BytecodeLength)) + || so_desc->RasterizedStream == D3D12_SO_NO_RASTERIZED_STREAM) graphics->rs_desc.rasterizerDiscardEnable = VK_TRUE; + rs_stream_desc_from_d3d12(&graphics->rs_stream_desc, &graphics->rs_desc, so_desc, vk_info); + if (desc->SampleMask != ~0u) FIXME("Ignoring sample mask %#x.\n", desc->SampleMask); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 62245b1e57a0..4564b9635fe5 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -90,6 +90,8 @@ struct vkd3d_vulkan_info bool EXT_transform_feedback; bool EXT_vertex_attribute_divisor; + bool rasterization_stream; + bool vertex_attrib_zero_divisor; unsigned int max_vertex_attrib_divisor; @@ -559,7 +561,7 @@ struct d3d12_root_signature VkDescriptorSetLayout vk_push_set_layout; VkDescriptorSetLayout vk_set_layout; - struct VkDescriptorPoolSize *pool_sizes; + VkDescriptorPoolSize *pool_sizes; size_t pool_size_count; struct d3d12_root_parameter *parameters; @@ -593,25 +595,27 @@ struct d3d12_root_signature *unsafe_impl_from_ID3D12RootSignature(ID3D12RootSign struct d3d12_graphics_pipeline_state { - struct VkPipelineShaderStageCreateInfo stages[VKD3D_MAX_SHADER_STAGES]; + VkPipelineShaderStageCreateInfo stages[VKD3D_MAX_SHADER_STAGES]; size_t stage_count; - struct VkVertexInputAttributeDescription attributes[D3D12_VS_INPUT_REGISTER_COUNT]; - enum VkVertexInputRate input_rates[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; + VkVertexInputAttributeDescription attributes[D3D12_VS_INPUT_REGISTER_COUNT]; + VkVertexInputRate input_rates[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; VkVertexInputBindingDivisorDescriptionEXT instance_divisors[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; size_t instance_divisor_count; size_t attribute_count; - struct VkAttachmentDescription attachments[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; - struct VkAttachmentReference attachment_references[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; - struct VkPipelineColorBlendAttachmentState blend_attachments[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT]; + VkAttachmentDescription attachments[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; + VkAttachmentReference attachment_references[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; + VkPipelineColorBlendAttachmentState blend_attachments[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT]; size_t attachment_count, rt_idx; VkRenderPass render_pass; D3D12_INDEX_BUFFER_STRIP_CUT_VALUE index_buffer_strip_cut_value; - struct VkPipelineRasterizationStateCreateInfo rs_desc; - struct VkPipelineMultisampleStateCreateInfo ms_desc; - struct VkPipelineDepthStencilStateCreateInfo ds_desc; + VkPipelineRasterizationStateCreateInfo rs_desc; + VkPipelineMultisampleStateCreateInfo ms_desc; + VkPipelineDepthStencilStateCreateInfo ds_desc; + + VkPipelineRasterizationStateStreamCreateInfoEXT rs_stream_desc; const struct d3d12_root_signature *root_signature; @@ -961,7 +965,7 @@ static inline unsigned int d3d12_resource_desc_get_sub_resource_count(const D3D1 return d3d12_resource_desc_get_layer_count(desc) * desc->MipLevels; } -enum VkCompareOp vk_compare_op_from_d3d12(D3D12_COMPARISON_FUNC op) DECLSPEC_HIDDEN; +VkCompareOp vk_compare_op_from_d3d12(D3D12_COMPARISON_FUNC op) DECLSPEC_HIDDEN; VkSampleCountFlagBits vk_samples_from_dxgi_sample_desc(const DXGI_SAMPLE_DESC *desc) DECLSPEC_HIDDEN; bool is_valid_feature_level(D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDEN; -- 2.19.2

2 1

[PATCH vkd3d 09/10] vkd3d: Implement stream output resource barriers naively.
by Józef Kucia 14 Jan '19

14 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> With some tracking we could do better. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9c3165c98765..49c3830030ee 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1308,13 +1308,28 @@ static void d3d12_command_list_end_current_render_pass(struct d3d12_command_list { VK_CALL(vkCmdEndTransformFeedbackEXT(list->vk_command_buffer, 0, ARRAY_SIZE(list->so_counter_buffers), list->so_counter_buffers, list->so_counter_buffer_offsets)); - list->xfb_enabled = false; } if (list->current_render_pass) VK_CALL(vkCmdEndRenderPass(list->vk_command_buffer)); list->current_render_pass = VK_NULL_HANDLE; + + if (list->xfb_enabled) + { + VkMemoryBarrier vk_barrier; + + /* We need a barrier between pause and resume. */ + vk_barrier.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER; + vk_barrier.pNext = NULL; + vk_barrier.srcAccessMask = VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT; + vk_barrier.dstAccessMask = VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT; + VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer, + VK_PIPELINE_STAGE_TRANSFORM_FEEDBACK_BIT_EXT, VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT, 0, + 1, &vk_barrier, 0, NULL, 0, NULL)); + + list->xfb_enabled = false; + } } static void d3d12_command_list_invalidate_current_render_pass(struct d3d12_command_list *list) @@ -1419,8 +1434,14 @@ static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, return true; case D3D12_RESOURCE_STATE_STREAM_OUT: - FIXME("Unhandled resource state %#x.\n", state); - return false; + *access_mask = VK_ACCESS_TRANSFORM_FEEDBACK_WRITE_BIT_EXT + | VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT + | VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT; + *stage_flags = VK_PIPELINE_STAGE_TRANSFORM_FEEDBACK_BIT_EXT + | VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT; + if (image_layout) + *image_layout = VK_IMAGE_LAYOUT_UNDEFINED; + return true; /* Set the Vulkan image layout for read-only states. */ case D3D12_RESOURCE_STATE_DEPTH_READ: -- 2.19.2

2 1

[PATCH vkd3d 01/10] vkd3d: Enable VK_EXT_transform_feedback.
by Józef Kucia 14 Jan '19

14 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 8c82741a9bae..6e5527952ba1 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 9b09f66b7251..71666f965416 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 9ffaa7920eb1..3b78a5e2c55d 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 ac03b3f89ff8..be983ec4db54 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 -- 2.19.2

3 2

[PATCH vkd3d 10/10] tests: Add test for stream output without geometry shader.
by Józef Kucia 14 Jan '19

14 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> The test is skipped when transform feedback is not supported by Vulkan implementation. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index f34b82c855d7..a2a40d665a9d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -22454,6 +22454,111 @@ static void test_primitive_restart(void) destroy_test_context(&context); } +static void test_vertex_shader_stream_output(void) +{ + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12Resource *counter_buffer, *so_buffer; + ID3D12GraphicsCommandList *command_list; + D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv; + ID3D12Resource *upload_buffer; + struct test_context_desc desc; + struct resource_readback rb; + struct test_context context; + ID3D12CommandQueue *queue; + unsigned int counter, i; + const struct vec4 *data; + ID3D12Device *device; + HRESULT hr; + + static const D3D12_SO_DECLARATION_ENTRY so_declaration[] = + { + {0, "SV_Position", 0, 0, 4, 0}, + }; + static const struct vec4 expected_output[] = + { + {-1.0f, 1.0f, 0.0f, 1.0f}, + { 3.0f, 1.0f, 0.0f, 1.0f}, + {-1.0f,-3.0f, 0.0f, 1.0f}, + }; + unsigned int strides[] = {16}; + + memset(&desc, 0, sizeof(desc)); + desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT; + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + init_pipeline_state_desc(&pso_desc, context.root_signature, 0, NULL, NULL, NULL); + pso_desc.StreamOutput.NumEntries = ARRAY_SIZE(so_declaration); + pso_desc.StreamOutput.pSODeclaration = so_declaration; + pso_desc.StreamOutput.pBufferStrides = strides; + pso_desc.StreamOutput.NumStrides = ARRAY_SIZE(strides); + pso_desc.StreamOutput.RasterizedStream = D3D12_SO_NO_RASTERIZED_STREAM; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + if (hr == E_NOTIMPL) + { + skip("Stream output is not supported.\n"); + destroy_test_context(&context); + return; + } + ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); + + counter = 0; + upload_buffer = create_upload_buffer(device, sizeof(counter), &counter); + + counter_buffer = create_default_buffer(device, 32, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + so_buffer = create_default_buffer(device, 1024, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_STREAM_OUT); + sobv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer); + sobv.SizeInBytes = 1024; + sobv.BufferFilledSizeLocation = ID3D12Resource_GetGPUVirtualAddress(counter_buffer); + + ID3D12GraphicsCommandList_CopyBufferRegion(command_list, counter_buffer, 0, + upload_buffer, 0, sizeof(counter)); + + transition_resource_state(command_list, counter_buffer, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_STREAM_OUT); + + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 1, &sobv); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, counter_buffer, + D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); + transition_resource_state(command_list, so_buffer, + D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_buffer_readback_with_command_list(counter_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + counter = get_readback_uint(&rb, 0, 0, 0); + ok(counter == 3 * sizeof(struct vec4), "Got unexpected counter %u.\n", counter); + release_resource_readback(&rb); + reset_command_list(command_list, context.allocator); + get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); + for (i = 0; i < ARRAY_SIZE(expected_output); ++i) + { + const struct vec4 *expected = &expected_output[i]; + data = get_readback_vec4(&rb, i, 0); + ok(compare_vec4(data, expected, 1), + "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w); + } + release_resource_readback(&rb); + + ID3D12Resource_Release(counter_buffer); + ID3D12Resource_Release(upload_buffer); + ID3D12Resource_Release(so_buffer); + destroy_test_context(&context); +} + START_TEST(d3d12) { parse_args(argc, argv); @@ -22573,4 +22678,5 @@ START_TEST(d3d12) run_test(test_dual_source_blending); run_test(test_multisample_rendering); run_test(test_primitive_restart); + run_test(test_vertex_shader_stream_output); } -- 2.19.2

2 1

[PATCH vkd3d 03/10] vkd3d: Implement d3d12_command_list_SOSetTargets().
by Józef Kucia 14 Jan '19

14 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 ce4af4e6a6fd..8402668f3a05 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 3b78a5e2c55d..62245b1e57a0 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; }; -- 2.19.2

2 1

[PATCH vkd3d 08/10] vkd3d: Enable transform feedback for pipeline states with stream output.
by Józef Kucia 14 Jan '19

14 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 19 +++++++++++++++++++ libs/vkd3d/state.c | 3 +++ libs/vkd3d/vkd3d_private.h | 4 ++++ 3 files changed, 26 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 8402668f3a05..9c3165c98765 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1304,6 +1304,13 @@ static void d3d12_command_list_end_current_render_pass(struct d3d12_command_list { const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + if (list->xfb_enabled) + { + VK_CALL(vkCmdEndTransformFeedbackEXT(list->vk_command_buffer, 0, ARRAY_SIZE(list->so_counter_buffers), + list->so_counter_buffers, list->so_counter_buffer_offsets)); + list->xfb_enabled = false; + } + if (list->current_render_pass) VK_CALL(vkCmdEndRenderPass(list->vk_command_buffer)); @@ -1746,6 +1753,8 @@ static void d3d12_command_list_reset_state(struct d3d12_command_list *list, list->fb_height = 0; list->fb_layer_count = 0; + list->xfb_enabled = false; + list->current_framebuffer = VK_NULL_HANDLE; list->current_pipeline = VK_NULL_HANDLE; list->current_render_pass = VK_NULL_HANDLE; @@ -2252,6 +2261,7 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list) { const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + struct d3d12_graphics_pipeline_state *graphics; struct VkRenderPassBeginInfo begin_desc; VkRenderPass vk_render_pass; @@ -2287,6 +2297,15 @@ static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list list->current_render_pass = vk_render_pass; + graphics = &list->state->u.graphics; + if (graphics->xfb_enabled) + { + VK_CALL(vkCmdBeginTransformFeedbackEXT(list->vk_command_buffer, 0, ARRAY_SIZE(list->so_counter_buffers), + list->so_counter_buffers, list->so_counter_buffer_offsets)); + + list->xfb_enabled = true; + } + return true; } diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 77538ebb3dce..a9a463de97e2 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2165,6 +2165,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s } } + graphics->xfb_enabled = false; if (so_desc->NumEntries) { if (!vk_info->EXT_transform_feedback) @@ -2174,6 +2175,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } + graphics->xfb_enabled = true; + xfb_info.type = VKD3D_SHADER_STRUCTURE_TYPE_TRANSFORM_FEEDBACK_INFO; xfb_info.next = NULL; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 4564b9635fe5..65fcd9f5ce11 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -620,6 +620,8 @@ struct d3d12_graphics_pipeline_state const struct d3d12_root_signature *root_signature; struct list compiled_pipelines; + + bool xfb_enabled; }; struct d3d12_compute_pipeline_state @@ -788,6 +790,8 @@ struct d3d12_command_list unsigned int fb_height; unsigned int fb_layer_count; + bool xfb_enabled; + VkFramebuffer current_framebuffer; VkPipeline current_pipeline; VkRenderPass current_render_pass; -- 2.19.2

2 1

[PATCH vkd3d 07/10] vkd3d: Pass transform feedback info to vkd3d-shader.
by Józef Kucia 14 Jan '19

14 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 7af8b6030d58..77538ebb3dce 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1931,6 +1931,8 @@ bool d3d12_pipeline_state_is_render_pass_compatible(const struct d3d12_pipeline_ return true; } +STATIC_ASSERT(sizeof(struct vkd3d_shader_transform_feedback_element) == sizeof(D3D12_SO_DECLARATION_ENTRY)); + static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *state, struct d3d12_device *device, const D3D12_GRAPHICS_PIPELINE_STATE_DESC *desc) { @@ -1944,11 +1946,13 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s uint32_t instance_divisors[D3D12_VS_INPUT_REGISTER_COUNT]; uint32_t aligned_offsets[D3D12_VS_INPUT_REGISTER_COUNT]; struct vkd3d_shader_compile_arguments ps_compile_args; + struct vkd3d_shader_transform_feedback_info xfb_info; const struct d3d12_root_signature *root_signature; struct vkd3d_shader_interface shader_interface; struct vkd3d_shader_signature input_signature; struct VkSubpassDescription sub_pass_desc; struct VkRenderPassCreateInfo pass_desc; + VkShaderStageFlagBits xfb_stage = 0; VkSampleCountFlagBits sample_count; const struct vkd3d_format *format; enum VkVertexInputRate input_rate; @@ -2161,6 +2165,31 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s } } + if (so_desc->NumEntries) + { + if (!vk_info->EXT_transform_feedback) + { + hr = E_NOTIMPL; + FIXME("Transform feedback is not supported by Vulkan implementation.\n"); + goto fail; + } + + xfb_info.type = VKD3D_SHADER_STRUCTURE_TYPE_TRANSFORM_FEEDBACK_INFO; + xfb_info.next = NULL; + + xfb_info.elements = (const struct vkd3d_shader_transform_feedback_element *)so_desc->pSODeclaration; + xfb_info.element_count = so_desc->NumEntries; + xfb_info.buffer_strides = so_desc->pBufferStrides; + xfb_info.buffer_stride_count = so_desc->NumStrides; + + if (desc->GS.pShaderBytecode) + xfb_stage = VK_SHADER_STAGE_GEOMETRY_BIT; + else if (desc->DS.pShaderBytecode) + xfb_stage = VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT; + else + xfb_stage = VK_SHADER_STAGE_VERTEX_BIT; + } + shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE; shader_interface.next = NULL; shader_interface.bindings = root_signature->descriptor_mapping; @@ -2225,6 +2254,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } + shader_interface.next = shader_stages[i].stage == xfb_stage ? &xfb_info : NULL; + if (FAILED(hr = create_shader_stage(device, &graphics->stages[graphics->stage_count], shader_stages[i].stage, b, &shader_interface, compile_args))) goto fail; -- 2.19.2

2 1

[PATCH vkd3d 02/10] vkd3d: Set transform feedback buffer usage flags.
by Józef Kucia 14 Jan '19

14 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 5b4110886299..64d6e658bd5a 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) -- 2.19.2

2 1

[PATCH vkd3d 06/10] vkd3d-shader: Add basic support for transform feedback.
by Józef Kucia 14 Jan '19

14 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_shader.h | 24 +++++++++++ libs/vkd3d-shader/spirv.c | 91 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 946defb2f87e..2ac8e0fd9505 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -20,6 +20,7 @@ #define __VKD3D_SHADER_H #include <stdbool.h> +#include <stdint.h> #include <vkd3d_types.h> #ifdef __cplusplus @@ -31,6 +32,7 @@ enum vkd3d_shader_structure_type VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE, VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS, VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO, + VKD3D_SHADER_STRUCTURE_TYPE_TRANSFORM_FEEDBACK_INFO, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE), }; @@ -151,6 +153,28 @@ struct vkd3d_shader_interface unsigned int uav_counter_count; }; +struct vkd3d_shader_transform_feedback_element +{ + unsigned int stream_index; + const char *semantic_name; + unsigned int semantic_index; + uint8_t component_index; + uint8_t component_count; + uint8_t output_slot; +}; + +/* Extends vkd3d_shader_interface. */ +struct vkd3d_shader_transform_feedback_info +{ + enum vkd3d_shader_structure_type type; + const void *next; + + const struct vkd3d_shader_transform_feedback_element *elements; + unsigned int element_count; + const unsigned int *buffer_strides; + unsigned int buffer_stride_count; +}; + enum vkd3d_shader_target { VKD3D_SHADER_TARGET_NONE, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 538c44fdbcaf..9d1a0df7566f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -108,6 +108,27 @@ static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv, enum vkd #endif /* HAVE_SPIRV_TOOLS */ +struct vkd3d_struct +{ + enum vkd3d_shader_structure_type type; + const void *next; +}; + +#define vkd3d_find_struct(c, t) vkd3d_find_struct_(c, VKD3D_SHADER_STRUCTURE_TYPE_##t) +static const void *vkd3d_find_struct_(const struct vkd3d_struct *chain, + enum vkd3d_shader_structure_type type) +{ + while (chain) + { + if (chain->type == type) + return chain; + + chain = chain->next; + } + + return NULL; +} + #define VKD3D_SPIRV_VERSION 0x00010000 #define VKD3D_SPIRV_GENERATOR_ID 18 #define VKD3D_SPIRV_GENERATOR_VERSION 1 @@ -1884,6 +1905,7 @@ struct vkd3d_dxbc_compiler bool after_declarations_section; const struct vkd3d_shader_signature *input_signature; const struct vkd3d_shader_signature *output_signature; + const struct vkd3d_shader_transform_feedback_info *xfb_info; struct vkd3d_shader_output_info { uint32_t id; @@ -1934,6 +1956,8 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader if (shader_interface) { + compiler->xfb_info = vkd3d_find_struct(shader_interface->next, TRANSFORM_FEEDBACK_INFO); + compiler->shader_interface = *shader_interface; if (shader_interface->push_constant_buffer_count) { @@ -3178,6 +3202,64 @@ static unsigned int vkd3d_count_signature_elements_for_reg( return count; } +static void vkd3d_dxbc_compiler_decorate_xfb_output(struct vkd3d_dxbc_compiler *compiler, + uint32_t id, unsigned int component_count, const struct vkd3d_shader_signature_element *signature_element) +{ + const struct vkd3d_shader_transform_feedback_info *xfb_info = compiler->xfb_info; + const struct vkd3d_shader_transform_feedback_element *xfb_element; + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + unsigned int offset, stride, i; + + if (!xfb_info) + return; + + offset = 0; + xfb_element = NULL; + for (i = 0; i < xfb_info->element_count; ++i) + { + const struct vkd3d_shader_transform_feedback_element *e = &xfb_info->elements[i]; + + if (e->stream_index == signature_element->stream_index + && !strcasecmp(e->semantic_name, signature_element->semantic_name) + && e->semantic_index == signature_element->semantic_index) + { + xfb_element = e; + break; + } + + offset += 4 * e->component_count; + } + + if (!xfb_element) + return; + + if (xfb_element->component_index || xfb_element->component_count > component_count) + { + FIXME("Unhandled component range %u, %u.\n", xfb_element->component_index, xfb_element->component_count); + return; + } + + if (xfb_element->output_slot < xfb_info->buffer_stride_count) + { + stride = xfb_info->buffer_strides[xfb_element->output_slot]; + } + else + { + stride = 0; + for (i = 0; i < xfb_info->element_count; ++i) + { + const struct vkd3d_shader_transform_feedback_element *e = &xfb_info->elements[i]; + + if (e->stream_index == xfb_element->stream_index && e->output_slot == xfb_element->output_slot) + stride += 4 * e->component_count; + } + } + + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationXfbBuffer, xfb_element->output_slot); + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationXfbStride, stride); + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationOffset, offset); +} + static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval) { @@ -3541,6 +3623,8 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler if (component_idx) vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationComponent, component_idx); } + + vkd3d_dxbc_compiler_decorate_xfb_output(compiler, id, output_component_count, signature_element); } compiler->output_info[signature_idx].id = id; @@ -3583,6 +3667,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_compiler *compiler) { + const struct vkd3d_shader_transform_feedback_info *xfb_info = compiler->xfb_info; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; switch (compiler->shader_type) @@ -3610,6 +3695,12 @@ static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_comp ERR("Invalid shader type %#x.\n", compiler->shader_type); } + if (xfb_info && xfb_info->element_count) + { + vkd3d_spirv_enable_capability(builder, SpvCapabilityTransformFeedback); + vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeXfb, NULL, 0); + } + vkd3d_dxbc_compiler_emit_shader_signature_outputs(compiler); } -- 2.19.2

2 1

[PATCH] crypt32/tests: Fix a typo in ok() message.
by Gijs Vermeulen 14 Jan '19

14 Jan '19

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/crypt32/tests/store.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 9915482277..0adfeb8529 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -541,7 +541,7 @@ static void testStoresInCollection(void) cert2 = CertCreateCertificateContext(X509_ASN_ENCODING, signedBigCert, sizeof(signedBigCert)); ok (cert2 != NULL, "Failed to create cert context %x\n", GetLastError()); ret = CertAddCertificateContextToStore(collection, cert2, CERT_STORE_ADD_REPLACE_EXISTING, NULL); - ok (ret, "Failed to add cert3 to the store %x\n",GetLastError()); + ok (ret, "Failed to add cert2 to the store %x\n",GetLastError()); /** checking certificates in the stores */ tcert1 = CertEnumCertificatesInStore(ro_store, 0); -- 2.20.1

1 0