Signed-off-by: Conor McCarthy cmccarthy@codeweavers.com --- tests/d3d12.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/tests/d3d12.c b/tests/d3d12.c index 04c1e2c8..ee9b55fe 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -28194,7 +28194,7 @@ static void test_line_tessellation(void) D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; ID3D12GraphicsCommandList *command_list; D3D12_QUERY_HEAP_DESC query_heap_desc; - D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv; + D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv[2]; D3D12_INPUT_LAYOUT_DESC input_layout; struct test_context_desc desc; D3D12_VERTEX_BUFFER_VIEW vbv; @@ -28361,10 +28361,10 @@ static void test_line_tessellation(void) static const D3D12_SO_DECLARATION_ENTRY so_declaration[] = { {0, "SV_POSITION", 0, 0, 4, 0}, - {0, "COLOR", 0, 0, 4, 0}, - {0, "PRIMITIVE_ID", 0, 0, 4, 0}, + {0, "COLOR", 0, 0, 4, 1}, + {0, "PRIMITIVE_ID", 0, 0, 4, 1}, }; - unsigned int strides[] = {48}; + unsigned int strides[] = {16, 32}; static const struct { struct vec4 position; @@ -28450,13 +28450,17 @@ static void test_line_tessellation(void)
so_buffer = create_default_buffer(context.device, 4096, D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_STREAM_OUT); - sobv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer); - sobv.SizeInBytes = 1024; - sobv.BufferFilledSizeLocation = sobv.BufferLocation + sobv.SizeInBytes; + + for (i = 0; i < ARRAY_SIZE(sobv); ++i) + { + sobv[i].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer) + i * 2048; + sobv[i].SizeInBytes = 1024; + sobv[i].BufferFilledSizeLocation = sobv[i].BufferLocation + sobv[i].SizeInBytes; + }
ID3D12GraphicsCommandList_BeginQuery(command_list, query_heap, D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0, 0);
- ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 1, &sobv); + ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 2, sobv);
ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); @@ -28493,19 +28497,21 @@ static void test_line_tessellation(void) get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); for (i = 0; i < ARRAY_SIZE(expected_data) / 3 ; ++i) { - data = get_readback_data(&rb, i, 0, 0, 3 * sizeof(*data)); + data = get_readback_data(&rb, i, 0, 0, sizeof(*data)); expected = &expected_data[3 * i + 0]; ok(compare_vec4(data, expected, 1), "Got position {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at %u.\n", data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w, i); - ++data; + data = get_readback_data(&rb, i + 2048 / (2 * sizeof(*data)), 0, 0, 2 * sizeof(*data)); expected = &expected_data[3 * i + 1]; bug_if(is_nvidia_device(context.device)) + todo_if(i != 6) ok(compare_vec4(data, expected, 1), "Got color {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at %u.\n", data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w, i); ++data; expected = &expected_data[3 * i + 2]; + todo ok(compare_vec4(data, expected, 1), "Got primitive ID {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at %u.\n", data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w, i);
Fixes NVIDIA HairWorks GPU crash on Metro Exodus.
From: Hans-Kristian Arntzen post@arntzen-software.no Signed-off-by: Conor McCarthy cmccarthy@codeweavers.com --- libs/vkd3d-shader/spirv.c | 11 +++++++---- tests/d3d12.c | 2 -- 2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 65834696..445ca668 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -17,6 +17,7 @@ */
#include "vkd3d_shader_private.h" +#include "vkd3d_d3d12.h" #include "rbtree.h"
#include <stdarg.h> @@ -4066,13 +4067,15 @@ static void vkd3d_dxbc_compiler_decorate_xfb_output(struct vkd3d_dxbc_compiler * 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; + unsigned int buffer_offsets[D3D12_SO_BUFFER_SLOT_COUNT]; + unsigned int stride, i;
if (!xfb_info) return;
- offset = 0; + memset(buffer_offsets, 0, sizeof(buffer_offsets)); xfb_element = NULL; + for (i = 0; i < xfb_info->element_count; ++i) { const struct vkd3d_shader_transform_feedback_element *e = &xfb_info->elements[i]; @@ -4085,7 +4088,7 @@ static void vkd3d_dxbc_compiler_decorate_xfb_output(struct vkd3d_dxbc_compiler * break; }
- offset += 4 * e->component_count; + buffer_offsets[e->output_slot] += 4 * e->component_count; }
if (!xfb_element) @@ -4115,7 +4118,7 @@ static void vkd3d_dxbc_compiler_decorate_xfb_output(struct vkd3d_dxbc_compiler *
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); + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationOffset, buffer_offsets[xfb_element->output_slot]); }
static uint32_t vkd3d_dxbc_compiler_emit_builtin_variable(struct vkd3d_dxbc_compiler *compiler, diff --git a/tests/d3d12.c b/tests/d3d12.c index ee9b55fe..940736bb 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -28505,13 +28505,11 @@ static void test_line_tessellation(void) data = get_readback_data(&rb, i + 2048 / (2 * sizeof(*data)), 0, 0, 2 * sizeof(*data)); expected = &expected_data[3 * i + 1]; bug_if(is_nvidia_device(context.device)) - todo_if(i != 6) ok(compare_vec4(data, expected, 1), "Got color {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at %u.\n", data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w, i); ++data; expected = &expected_data[3 * i + 2]; - todo ok(compare_vec4(data, expected, 1), "Got primitive ID {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at %u.\n", data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w, i);
On Tue, 20 Jul 2021 at 16:25, Conor McCarthy cmccarthy@codeweavers.com wrote:
@@ -4066,13 +4067,15 @@ static void vkd3d_dxbc_compiler_decorate_xfb_output(struct vkd3d_dxbc_compiler * 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;
- unsigned int buffer_offsets[D3D12_SO_BUFFER_SLOT_COUNT];
- unsigned int stride, i;
vkd3d-shader is not limited to being used with d3d12, and the vkd3d_shader_transform_feedback_info structure doesn't impose such a limit on the number of output slots. But it's also unnecessary to track offsets for all output slots; the only one we care about is "xfb_element->output_slot".
-
Conor McCarthy -
Henri Verbeet -
Henri Verbeet