February 2019 - Wine-Commits

Jacek Caban : ntoskrnl.exe: Introduce common kernel object allocator and use it for driver object.
by Alexandre Julliard Feb. 26, 2019

Feb. 26, 2019

Module: wine Branch: master Commit: bb94d94bb02bc38aacce2fd79e78c5399bd28329 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb94d94bb02bc38aacce2fd7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 13:39:11 2019 +0100 ntoskrnl.exe: Introduce common kernel object allocator and use it for driver object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 57 +++++++++++++++++++++++++++++------- dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 + 2 files changed, 47 insertions(+), 11 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e7f6b1d..2ae57c8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -98,11 +98,10 @@ static DWORD client_pid; struct wine_driver { - struct wine_rb_entry entry; - DRIVER_OBJECT driver_obj; DRIVER_EXTENSION driver_extension; SERVICE_STATUS_HANDLE service_handle; + struct wine_rb_entry entry; }; struct device_interface @@ -252,6 +251,38 @@ static HANDLE get_device_manager(void) } +struct object_header +{ + LONG ref; + POBJECT_TYPE type; +}; + +static void free_kernel_object( void *obj ) +{ + struct object_header *header = (struct object_header *)obj - 1; + HeapFree( GetProcessHeap(), 0, header ); +} + +void *alloc_kernel_object( POBJECT_TYPE type, SIZE_T size, LONG ref ) +{ + struct object_header *header; + + if (!(header = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*header) + size)) ) + return NULL; + + header->ref = ref; + header->type = type; + return header + 1; +} + +/* FIXME: Use ObDereferenceObject instead. */ +static void dereference_kernel_object( void *obj ) +{ + struct object_header *header = (struct object_header*)obj - 1; + if (!InterlockedDecrement( &header->ref ) && header->type->release) + header->type->release( obj ); +} + static const WCHAR file_type_name[] = {'F','i','l','e',0}; static struct _OBJECT_TYPE file_type = { @@ -1100,11 +1131,20 @@ static NTSTATUS WINAPI unhandled_irp( DEVICE_OBJECT *device, IRP *irp ) } +static void free_driver_object( void *obj ) +{ + struct wine_driver *driver = obj; + RtlFreeUnicodeString( &driver->driver_obj.DriverName ); + RtlFreeUnicodeString( &driver->driver_obj.DriverExtension->ServiceKeyName ); + free_kernel_object( driver ); +} + static const WCHAR driver_type_name[] = {'D','r','i','v','e','r',0}; static struct _OBJECT_TYPE driver_type = { driver_type_name, + free_driver_object }; POBJECT_TYPE IoDriverObjectType = &driver_type; @@ -1121,13 +1161,12 @@ NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) TRACE("(%s, %p)\n", debugstr_us(name), init); - if (!(driver = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(*driver) ))) + if (!(driver = alloc_kernel_object( IoDriverObjectType, sizeof(*driver), 1 ))) return STATUS_NO_MEMORY; if ((status = RtlDuplicateUnicodeString( 1, name, &driver->driver_obj.DriverName ))) { - RtlFreeHeap( GetProcessHeap(), 0, driver ); + free_kernel_object( driver ); return status; } @@ -1142,9 +1181,7 @@ NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) status = driver->driver_obj.DriverInit( &driver->driver_obj, &driver->driver_extension.ServiceKeyName ); if (status) { - RtlFreeUnicodeString( &driver->driver_obj.DriverName ); - RtlFreeUnicodeString( &driver->driver_extension.ServiceKeyName ); - RtlFreeHeap( GetProcessHeap(), 0, driver ); + dereference_kernel_object( driver ); return status; } @@ -1173,9 +1210,7 @@ void WINAPI IoDeleteDriver( DRIVER_OBJECT *driver_object ) wine_rb_remove_key( &wine_drivers, &driver_object->DriverName ); LeaveCriticalSection( &drivers_cs ); - RtlFreeUnicodeString( &driver_object->DriverName ); - RtlFreeUnicodeString( &driver_object->DriverExtension->ServiceKeyName ); - RtlFreeHeap( GetProcessHeap(), 0, CONTAINING_RECORD( driver_object, struct wine_driver, driver_obj ) ); + dereference_kernel_object( driver_object ); } diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 859c1d1..027036e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -23,6 +23,7 @@ struct _OBJECT_TYPE { const WCHAR *name; /* object type name used for type validation */ + void (*release)(void*); /* called when the last reference is released */ }; #ifdef __i386__

1 0

Jacek Caban : ntoskrnl.exe: Add partial ObReferenceObjectByHandle implementation.
by Alexandre Julliard Feb. 26, 2019

Feb. 26, 2019

Module: wine Branch: master Commit: ad7c1392cece0046cf3a0d97c96357d2dbf44b8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad7c1392cece0046cf3a0d97… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 13:39:43 2019 +0100 ntoskrnl.exe: Add partial ObReferenceObjectByHandle implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 80 ++++++++++++++++++++++++++++-------- dlls/ntoskrnl.exe/ntoskrnl_private.h | 5 ++- dlls/ntoskrnl.exe/tests/driver.c | 9 ++-- 3 files changed, 70 insertions(+), 24 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 8591cd4..66ad3e3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -275,6 +275,13 @@ void *alloc_kernel_object( POBJECT_TYPE type, SIZE_T size, LONG ref ) return header + 1; } +/* FIXME: Use ObReferenceObject instead. */ +static void reference_kernel_object( void *obj ) +{ + struct object_header *header = (struct object_header*)obj - 1; + InterlockedIncrement( &header->ref ); +} + /* FIXME: Use ObDereferenceObject instead. */ static void dereference_kernel_object( void *obj ) { @@ -288,11 +295,66 @@ static void ObReferenceObject( void *obj ) TRACE( "(%p): stub\n", obj ); } +static NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret ) +{ + char buf[256]; + OBJECT_TYPE_INFORMATION *type_info = (OBJECT_TYPE_INFORMATION *)buf; + ULONG size; + void *obj; + NTSTATUS status; + + status = NtQueryObject(handle, ObjectTypeInformation, buf, sizeof(buf), &size); + if (status) return status; + + if (!!RtlCompareUnicodeStrings(type->name, strlenW(type->name), type_info->TypeName.Buffer, + type_info->TypeName.Length / sizeof(WCHAR), FALSE)) + return STATUS_OBJECT_TYPE_MISMATCH; + + FIXME( "semi-stub: returning new %s object instance\n", debugstr_w(type->name) ); + + if (type->constructor) + obj = type->constructor( handle ); + else + { + obj = alloc_kernel_object( type, 0, 0 ); + FIXME( "No constructor for type %s returning empty %p object\n", debugstr_w(type->name), obj ); + } + if (!obj) return STATUS_NO_MEMORY; + + TRACE( "%p -> %p\n", handle, obj ); + *ret = obj; + return STATUS_SUCCESS; +} + +/*********************************************************************** + * ObReferenceObjectByHandle (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ObReferenceObjectByHandle( HANDLE handle, ACCESS_MASK access, + POBJECT_TYPE type, + KPROCESSOR_MODE mode, void **ptr, + POBJECT_HANDLE_INFORMATION info ) +{ + NTSTATUS status; + + TRACE( "%p %x %p %d %p %p\n", handle, access, type, mode, ptr, info ); + + if (mode != KernelMode) + { + FIXME("UserMode access not implemented\n"); + return STATUS_NOT_IMPLEMENTED; + } + + status = kernel_object_from_handle( handle, type, ptr ); + if (!status) reference_kernel_object( *ptr ); + return status; +} + static const WCHAR file_type_name[] = {'F','i','l','e',0}; static struct _OBJECT_TYPE file_type = { file_type_name, + NULL, free_kernel_object }; @@ -1151,6 +1213,7 @@ static const WCHAR driver_type_name[] = {'D','r','i','v','e','r',0}; static struct _OBJECT_TYPE driver_type = { driver_type_name, + NULL, free_driver_object }; @@ -1226,6 +1289,7 @@ static const WCHAR device_type_name[] = {'D','e','v','i','c','e',0}; static struct _OBJECT_TYPE device_type = { device_type_name, + NULL, free_kernel_object }; @@ -2583,22 +2647,6 @@ VOID WINAPI MmUnmapIoSpace( PVOID BaseAddress, SIZE_T NumberOfBytes ) /*********************************************************************** - * ObReferenceObjectByHandle (NTOSKRNL.EXE.@) - */ -NTSTATUS WINAPI ObReferenceObjectByHandle( HANDLE obj, ACCESS_MASK access, - POBJECT_TYPE type, - KPROCESSOR_MODE mode, PVOID* ptr, - POBJECT_HANDLE_INFORMATION info) -{ - FIXME( "stub: %p %x %p %d %p %p\n", obj, access, type, mode, ptr, info); - - if(ptr) - *ptr = UlongToHandle(0xdeadbeaf); - - return STATUS_SUCCESS; -} - - /*********************************************************************** * ObReferenceObjectByName (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI ObReferenceObjectByName( UNICODE_STRING *ObjectName, diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 027036e..87aa4f7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -22,8 +22,9 @@ #define __WINE_NTOSKRNL_PRIVATE_H struct _OBJECT_TYPE { - const WCHAR *name; /* object type name used for type validation */ - void (*release)(void*); /* called when the last reference is released */ + const WCHAR *name; /* object type name used for type validation */ + void *(*constructor)(HANDLE); /* used for creating an object from server handle */ + void (*release)(void*); /* called when the last reference is released */ }; #ifdef __i386__ diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index b16c428..aae5839 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -699,14 +699,10 @@ static void test_ob_reference(const WCHAR *test_path) ok(!status, "PsCreateSystemThread returned: %#x\n", status); status = ObReferenceObjectByHandle(NULL, SYNCHRONIZE, *pExEventObjectType, KernelMode, &obj1, NULL); - todo_wine ok(status == STATUS_INVALID_HANDLE, "ObReferenceObjectByHandle failed: %#x\n", status); - if (!status) ObDereferenceObject(obj1); status = ObReferenceObjectByHandle(event_handle, SYNCHRONIZE, *pIoFileObjectType, KernelMode, &obj1, NULL); - todo_wine ok(status == STATUS_OBJECT_TYPE_MISMATCH, "ObReferenceObjectByHandle returned: %#x\n", status); - if (!status) ObDereferenceObject(obj1); status = ObReferenceObjectByHandle(event_handle, SYNCHRONIZE, *pExEventObjectType, KernelMode, &obj1, NULL); ok(!status, "ObReferenceObjectByHandle failed: %#x\n", status); @@ -718,12 +714,11 @@ static void test_ob_reference(const WCHAR *test_path) } status = ObReferenceObjectByHandle(event_handle, SYNCHRONIZE, *pIoFileObjectType, KernelMode, &obj2, NULL); - todo_wine ok(status == STATUS_OBJECT_TYPE_MISMATCH, "ObReferenceObjectByHandle returned: %#x\n", status); - if (!status) ObDereferenceObject(obj2); status = ObReferenceObjectByHandle(event_handle, SYNCHRONIZE, *pExEventObjectType, KernelMode, &obj2, NULL); ok(!status, "ObReferenceObjectByHandle failed: %#x\n", status); + todo_wine ok(obj1 == obj2, "obj1 != obj2\n"); ObDereferenceObject(obj1); @@ -734,6 +729,7 @@ static void test_ob_reference(const WCHAR *test_path) status = ObReferenceObjectByHandle(file_handle2, SYNCHRONIZE, *pIoFileObjectType, KernelMode, &obj2, NULL); ok(!status, "ObReferenceObjectByHandle failed: %#x\n", status); + todo_wine ok(obj1 == obj2, "obj1 != obj2\n"); ObDereferenceObject(obj1); @@ -744,6 +740,7 @@ static void test_ob_reference(const WCHAR *test_path) status = ObReferenceObjectByHandle(thread_handle, SYNCHRONIZE, *pPsThreadType, KernelMode, &obj2, NULL); ok(!status, "ObReferenceObjectByHandle failed: %#x\n", status); + todo_wine ok(obj1 == obj2, "obj1 != obj2\n"); ObDereferenceObject(obj1);

1 0

Jacek Caban : ntoskrnl.exe: Implement ObReferenceObject and ObDereferenceObject.
by Alexandre Julliard Feb. 26, 2019

Feb. 26, 2019

Module: wine Branch: master Commit: 855314449be7f7bfb22b7b049e4c0fab212dd3b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=855314449be7f7bfb22b7b04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 13:39:51 2019 +0100 ntoskrnl.exe: Implement ObReferenceObject and ObDereferenceObject. NULL checks are meant to prevent regressions in applications trying to reference NULL objects returned from stubs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 64 +++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 27 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 66ad3e3..1a8a433 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -275,24 +275,43 @@ void *alloc_kernel_object( POBJECT_TYPE type, SIZE_T size, LONG ref ) return header + 1; } -/* FIXME: Use ObReferenceObject instead. */ -static void reference_kernel_object( void *obj ) -{ - struct object_header *header = (struct object_header*)obj - 1; - InterlockedIncrement( &header->ref ); -} -/* FIXME: Use ObDereferenceObject instead. */ -static void dereference_kernel_object( void *obj ) +/*********************************************************************** + * ObDereferenceObject (NTOSKRNL.EXE.@) + */ +void WINAPI ObDereferenceObject( void *obj ) { struct object_header *header = (struct object_header*)obj - 1; - if (!InterlockedDecrement( &header->ref ) && header->type->release) - header->type->release( obj ); + LONG ref; + + if (!obj) + { + FIXME("NULL obj\n"); + return; + } + + ref = InterlockedDecrement( &header->ref ); + TRACE( "(%p) ref=%u\n", obj, ref ); + if (!ref) + { + if (header->type->release) header->type->release( obj ); + else FIXME( "no destructor\n" ); + } } static void ObReferenceObject( void *obj ) { - TRACE( "(%p): stub\n", obj ); + struct object_header *header = (struct object_header*)obj - 1; + LONG ref; + + if (!obj) + { + FIXME("NULL obj\n"); + return; + } + + ref = InterlockedIncrement( &header->ref ); + TRACE( "(%p) ref=%u\n", obj, ref ); } static NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret ) @@ -345,7 +364,7 @@ NTSTATUS WINAPI ObReferenceObjectByHandle( HANDLE handle, ACCESS_MASK access, } status = kernel_object_from_handle( handle, type, ptr ); - if (!status) reference_kernel_object( *ptr ); + if (!status) ObReferenceObject( *ptr ); return status; } @@ -387,7 +406,7 @@ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, if (irp->Flags & IRP_CLOSE_OPERATION) { - dereference_kernel_object( file ); + ObDereferenceObject( file ); irp->Tail.Overlay.OriginalFileObject = NULL; } @@ -430,7 +449,7 @@ static NTSTATUS dispatch_create( const irp_params_t *params, void *in_buff, ULON if (!(irp = IoAllocateIrp( device->StackSize, FALSE ))) { - dereference_kernel_object( file ); + ObDereferenceObject( file ); return STATUS_NO_MEMORY; } @@ -475,7 +494,7 @@ static NTSTATUS dispatch_close( const irp_params_t *params, void *in_buff, ULONG if (!(irp = IoAllocateIrp( device->StackSize, FALSE ))) { - dereference_kernel_object( file ); + ObDereferenceObject( file ); return STATUS_NO_MEMORY; } @@ -1251,7 +1270,7 @@ NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) status = driver->driver_obj.DriverInit( &driver->driver_obj, &driver->driver_extension.ServiceKeyName ); if (status) { - dereference_kernel_object( driver ); + ObDereferenceObject( driver ); return status; } @@ -1280,7 +1299,7 @@ void WINAPI IoDeleteDriver( DRIVER_OBJECT *driver_object ) wine_rb_remove_key( &wine_drivers, &driver_object->DriverName ); LeaveCriticalSection( &drivers_cs ); - dereference_kernel_object( driver_object ); + ObDereferenceObject( driver_object ); } @@ -1368,7 +1387,7 @@ void WINAPI IoDeleteDevice( DEVICE_OBJECT *device ) while (*prev && *prev != device) prev = &(*prev)->NextDevice; if (*prev) *prev = (*prev)->NextDevice; NtClose( device->Reserved ); - dereference_kernel_object( device ); + ObDereferenceObject( device ); } } @@ -2705,15 +2724,6 @@ NTSTATUS WINAPI ObReferenceObjectByPointer(void *obj, ACCESS_MASK access, /*********************************************************************** - * ObDereferenceObject (NTOSKRNL.EXE.@) - */ -void WINAPI ObDereferenceObject( void *obj ) -{ - TRACE( "(%p): stub\n", obj ); -} - - -/*********************************************************************** * ObfReferenceObject (NTOSKRNL.EXE.@) */ #ifdef DEFINE_FASTCALL1_ENTRYPOINT

1 0

Józef Kucia : tests: Add test for SV_RenderTargetArrayIndex in pixel shader.
by Alexandre Julliard Feb. 26, 2019

Feb. 26, 2019

Module: vkd3d Branch: master Commit: 9eebb38e5686fff01dfaa2f4d1b94343cb83c9bb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9eebb38e5686fff01dfaa2f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 26 12:27:53 2019 +0100 tests: Add test for SV_RenderTargetArrayIndex in pixel shader. 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> --- tests/d3d12.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 150 insertions(+), 4 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 7e74fbf..d8a13a7 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21633,7 +21633,6 @@ static void test_layered_rendering(void) D3D12_VERTEX_BUFFER_VIEW vbv; struct test_context context; ID3D12CommandQueue *queue; - ID3D12PipelineState *pso; ID3D12Device *device; ID3D12Resource *vb; HRESULT hr; @@ -21794,7 +21793,7 @@ static void test_layered_rendering(void) context.render_target_desc.Format, &vs, &ps, &input_layout); pso_desc.GS = gs; hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, - &IID_ID3D12PipelineState, (void **)&pso); + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); vb = create_upload_buffer(context.device, sizeof(vertices), vertices); @@ -21808,7 +21807,7 @@ static void test_layered_rendering(void) 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, pso); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); ID3D12GraphicsCommandList_DrawInstanced(command_list, 12, 1, 0, 0); @@ -21825,7 +21824,153 @@ static void test_layered_rendering(void) check_sub_resource_uint(context.render_target, 3, queue, command_list, 0xffffff00, 0); ID3D12Resource_Release(vb); - ID3D12PipelineState_Release(pso); + destroy_test_context(&context); +} + +static void test_ps_layer(void) +{ + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Device *device; + unsigned int i; + HRESULT hr; + + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const DWORD vs_code[] = + { +#if 0 + void main(in uint vertex_id : SV_VertexID, out uint layer : LAYER) + { + layer = vertex_id; + } +#endif + 0x43425844, 0xd2b4abd8, 0xf9adf7df, 0xed1b4eb0, 0x4bf54391, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000090, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000006, 0x00000001, 0x00000000, 0x00000101, 0x565f5653, 0x65747265, 0x00444978, + 0x4e47534f, 0x00000028, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x00000e01, 0x4559414c, 0xabab0052, 0x58454853, 0x00000040, 0x00010050, 0x00000010, + 0x0100086a, 0x04000060, 0x00101012, 0x00000000, 0x00000006, 0x03000065, 0x00102012, 0x00000000, + 0x05000036, 0x00102012, 0x00000000, 0x0010100a, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const DWORD gs_code[] = + { +#if 0 + struct gs_in + { + uint layer : LAYER; + }; + + struct gs_out + { + float4 position : SV_Position; + uint layer : SV_RenderTargetArrayIndex; + }; + + [maxvertexcount(3)] + void main(point gs_in vin[1], inout TriangleStream<gs_out> vout) + { + gs_out o; + + o.layer = vin[0].layer; + + o.position = float4(-1, 1, 0, 1); + vout.Append(o); + + o.position = float4(3, 1, 0, 1); + vout.Append(o); + + o.position = float4(-1, -3, 0, 1); + vout.Append(o); + } +#endif + 0x43425844, 0x2589d822, 0x7557587c, 0x7d7e9cc0, 0x6bad86aa, 0x00000001, 0x000001fc, 0x00000003, + 0x0000002c, 0x0000005c, 0x000000cc, 0x4e475349, 0x00000028, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000101, 0x4559414c, 0xabab0052, 0x3547534f, + 0x00000068, 0x00000002, 0x00000008, 0x00000000, 0x00000040, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000000, 0x0000004c, 0x00000000, 0x00000004, 0x00000001, 0x00000001, + 0x00000e01, 0x505f5653, 0x7469736f, 0x006e6f69, 0x525f5653, 0x65646e65, 0x72615472, 0x41746567, + 0x79617272, 0x65646e49, 0xabab0078, 0x58454853, 0x00000128, 0x00020050, 0x0000004a, 0x0100086a, + 0x0400005f, 0x00201012, 0x00000001, 0x00000000, 0x0100085d, 0x0300008f, 0x00110000, 0x00000000, + 0x0100285c, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x04000067, 0x00102012, 0x00000001, + 0x00000004, 0x0200005e, 0x00000003, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0xbf800000, + 0x3f800000, 0x00000000, 0x3f800000, 0x06000036, 0x00102012, 0x00000001, 0x0020100a, 0x00000000, + 0x00000000, 0x03000075, 0x00110000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, + 0x40400000, 0x3f800000, 0x00000000, 0x3f800000, 0x06000036, 0x00102012, 0x00000001, 0x0020100a, + 0x00000000, 0x00000000, 0x03000075, 0x00110000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0xbf800000, 0xc0400000, 0x00000000, 0x3f800000, 0x06000036, 0x00102012, 0x00000001, + 0x0020100a, 0x00000000, 0x00000000, 0x03000075, 0x00110000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE gs = {gs_code, sizeof(gs_code)}; + static const DWORD ps_code[] = + { +#if 0 + float4 main(float4 p : SV_Position, uint layer : SV_RenderTargetArrayIndex) : SV_Target0 + { + return layer / 255.0; + } +#endif + 0x43425844, 0x53474926, 0xbd247b84, 0x389660f4, 0x331cf598, 0x00000001, 0x00000140, 0x00000003, + 0x0000002c, 0x00000094, 0x000000c8, 0x4e475349, 0x00000060, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000004, + 0x00000001, 0x00000001, 0x00000101, 0x505f5653, 0x7469736f, 0x006e6f69, 0x525f5653, 0x65646e65, + 0x72615472, 0x41746567, 0x79617272, 0x65646e49, 0xabab0078, 0x4e47534f, 0x0000002c, 0x00000001, + 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, + 0x65677261, 0xabab0074, 0x58454853, 0x00000070, 0x00000050, 0x0000001c, 0x0100086a, 0x04000864, + 0x00101012, 0x00000001, 0x00000004, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, + 0x05000056, 0x00100012, 0x00000000, 0x0010100a, 0x00000001, 0x0a000038, 0x001020f2, 0x00000000, + 0x00100006, 0x00000000, 0x00004002, 0x3b808081, 0x3b808081, 0x3b808081, 0x3b808081, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const unsigned int expected_results[] = + { + 0x00000000, + 0x01010101, + 0x02020202, + 0x03030303, + 0x04040404, + 0x05050505, + }; + + memset(&desc, 0, sizeof(desc)); + desc.rt_array_size = 6; + 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, + context.render_target_desc.Format, &vs, &ps, NULL); + pso_desc.GS = gs; + pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_POINT; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + 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_POINTLIST); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 6, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + for (i = 0; i < ARRAY_SIZE(expected_results); ++i) + { + check_sub_resource_uint(context.render_target, i, queue, command_list, expected_results[i], 0); + reset_command_list(command_list, context.allocator); + } + destroy_test_context(&context); } @@ -25108,6 +25253,7 @@ START_TEST(d3d12) run_test(test_multithread_command_queue_exec); run_test(test_geometry_shader); run_test(test_layered_rendering); + run_test(test_ps_layer); run_test(test_nop_tessellation_shaders); run_test(test_quad_tessellation); run_test(test_tessellation_dcl_index_range);

1 0

Józef Kucia : vkd3d-shader: Index control point phase outputs by InvocationId.
by Alexandre Julliard Feb. 26, 2019

Feb. 26, 2019

Module: vkd3d Branch: master Commit: ff132543c169641b4a1fb57701ca67deaee83fcd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ff132543c169641b4a1fb57… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 26 12:27:57 2019 +0100 vkd3d-shader: Index control point phase outputs by InvocationId. 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 | 72 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 65 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0e6df47..34e274f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1754,6 +1754,7 @@ struct vkd3d_symbol_register_data unsigned int write_mask; unsigned int structure_stride; bool is_aggregate; /* An aggregate, i.e. a structure or an array. */ + bool is_dynamically_indexed; /* If member_idx is a variable ID instead of a constant. */ }; struct vkd3d_symbol_resource_data @@ -1832,6 +1833,7 @@ static void vkd3d_symbol_set_register_info(struct vkd3d_symbol *symbol, symbol->info.reg.write_mask = write_mask; symbol->info.reg.structure_stride = 0; symbol->info.reg.is_aggregate = false; + symbol->info.reg.is_dynamically_indexed = false; } static void vkd3d_symbol_make_resource(struct vkd3d_symbol *symbol, @@ -2505,6 +2507,7 @@ struct vkd3d_shader_register_info uint32_t member_idx; unsigned int structure_stride; bool is_aggregate; + bool is_dynamically_indexed; }; static bool vkd3d_dxbc_compiler_get_register_info(const struct vkd3d_dxbc_compiler *compiler, @@ -2525,6 +2528,7 @@ static bool vkd3d_dxbc_compiler_get_register_info(const struct vkd3d_dxbc_compil register_info->write_mask = VKD3DSP_WRITEMASK_ALL; register_info->structure_stride = 0; register_info->is_aggregate = false; + register_info->is_dynamically_indexed = false; return true; } @@ -2544,6 +2548,7 @@ static bool vkd3d_dxbc_compiler_get_register_info(const struct vkd3d_dxbc_compil register_info->write_mask = symbol->info.reg.write_mask; register_info->structure_stride = symbol->info.reg.structure_stride; register_info->is_aggregate = symbol->info.reg.is_aggregate; + register_info->is_dynamically_indexed = symbol->info.reg.is_dynamically_indexed; return true; } @@ -2577,8 +2582,17 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp if (reg->idx[1].rel_addr) FIXME("Relative addressing not implemented.\n"); - reg_idx.offset = register_info->member_idx; - indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg_idx); + if (register_info->is_dynamically_indexed) + { + indexes[index_count++] = vkd3d_spirv_build_op_load(builder, + vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_INT, 1), + register_info->member_idx, SpvMemoryAccessMaskNone); + } + else + { + reg_idx.offset = register_info->member_idx; + indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg_idx); + } } else { @@ -3889,6 +3903,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler struct rb_entry *entry = NULL; unsigned int signature_idx; bool use_private_variable; + unsigned int array_size; bool is_patch_constant; uint32_t id, var_id; @@ -3897,6 +3912,9 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler shader_signature = is_patch_constant ? compiler->patch_constant_signature : compiler->output_signature; + array_size = phase && phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE + ? compiler->output_control_point_count : 0; + if (!(signature_element = vkd3d_find_signature_element_for_reg(shader_signature, &signature_idx, reg->idx[0].offset, dst->write_mask))) { @@ -3931,15 +3949,15 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler { if (builtin) { - id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, storage_class, 0); + id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, storage_class, array_size); vkd3d_dxbc_compiler_emit_register_execution_mode(compiler, &dst->reg); if (component_idx) FIXME("Unhandled component index %u.\n", component_idx); } else { - id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, - storage_class, component_type, output_component_count); + id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, + storage_class, component_type, output_component_count, array_size); vkd3d_spirv_add_iface_variable(builder, id); if (is_dual_source_blending(compiler) && reg->idx[0].offset < 2) @@ -3987,6 +4005,19 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler { vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, use_private_variable ? VKD3D_TYPE_FLOAT : component_type, VKD3DSP_WRITEMASK_ALL); + reg_symbol.info.reg.is_aggregate = use_private_variable ? false : array_size; + if (!use_private_variable && phase && phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE) + { + struct vkd3d_shader_register r; + + memset(&r, 0, sizeof(r)); + r.type = VKD3DSPR_OUTPOINTID; + r.idx[0].offset = ~0u; + r.idx[1].offset = ~0u; + + reg_symbol.info.reg.member_idx = vkd3d_dxbc_compiler_get_register_id(compiler, &r); + reg_symbol.info.reg.is_dynamically_indexed = true; + } vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); @@ -4047,7 +4078,8 @@ static void vkd3d_dxbc_compiler_emit_shader_phase_output(struct vkd3d_dxbc_compi static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_signature_element *output, - const struct vkd3d_shader_output_info *output_info, uint32_t val_id, unsigned int write_mask) + const struct vkd3d_shader_output_info *output_info, + uint32_t output_index_id, uint32_t val_id, unsigned int write_mask) { unsigned int dst_write_mask, use_mask, uninit_mask, swizzle, mask; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; @@ -4084,6 +4116,13 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi } output_id = output_info->id; + if (output_index_id) + { + type_id = vkd3d_spirv_get_type_id(builder, + output_info->component_type, vkd3d_write_mask_component_count(dst_write_mask)); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassOutput, type_id); + output_id = vkd3d_spirv_build_op_access_chain1(builder, ptr_type_id, output_id, output_index_id); + } if (!output_info->array_element_mask) { @@ -4117,6 +4156,8 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ const struct vkd3d_shader_signature *signature = compiler->output_signature; uint32_t void_id, type_id, ptr_type_id, function_type_id, function_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_phase *phase; + uint32_t output_index_id = 0; unsigned int i, count; DWORD variable_idx; @@ -4124,6 +4165,8 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ STATIC_ASSERT(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_type_id)); STATIC_ASSERT(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(compiler->private_output_variable_write_mask)); + phase = vkd3d_dxbc_compiler_get_current_shader_phase(compiler); + function_id = compiler->epilogue_function_id; void_id = vkd3d_spirv_get_op_type_void(builder); @@ -4153,6 +4196,21 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ param_id[i] = vkd3d_spirv_build_op_load(builder, type_id, param_id[i], SpvMemoryAccessMaskNone); } + if (phase && phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE) + { + struct vkd3d_shader_register r; + uint32_t invocation_id; + + memset(&r, 0, sizeof(r)); + r.type = VKD3DSPR_OUTPOINTID; + r.idx[0].offset = ~0u; + r.idx[1].offset = ~0u; + + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_INT, 1); + invocation_id = vkd3d_dxbc_compiler_get_register_id(compiler, &r); + output_index_id = vkd3d_spirv_build_op_load(builder, type_id, invocation_id, SpvMemoryAccessMaskNone); + } + for (i = 0; i < signature->element_count; ++i) { variable_idx = vkd3d_dxbc_compiler_get_output_variable_index(compiler, @@ -4162,7 +4220,7 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ continue; vkd3d_dxbc_compiler_emit_store_shader_output(compiler, - &signature->elements[i], &compiler->output_info[i], + &signature->elements[i], &compiler->output_info[i], output_index_id, param_id[variable_idx], compiler->private_output_variable_write_mask[variable_idx]); }

1 0

Józef Kucia : vkd3d-shader: Introduce is_control_point_phase() helper.
by Alexandre Julliard Feb. 26, 2019

Feb. 26, 2019

Module: vkd3d Branch: master Commit: 0ffaf4a2b703b570c072b4b67ea16773ec1eefc1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0ffaf4a2b703b570c072b4b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 26 12:27:58 2019 +0100 vkd3d-shader: Introduce is_control_point_phase() helper. 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 | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 34e274f..de4c683 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1997,6 +1997,11 @@ struct vkd3d_dxbc_compiler size_t shader_phases_size; }; +static bool is_control_point_phase(const struct vkd3d_shader_phase *phase) +{ + return phase && phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE; +} + static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_compiler *compiler); struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, @@ -3912,8 +3917,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler shader_signature = is_patch_constant ? compiler->patch_constant_signature : compiler->output_signature; - array_size = phase && phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE - ? compiler->output_control_point_count : 0; + array_size = is_control_point_phase(phase) ? compiler->output_control_point_count : 0; if (!(signature_element = vkd3d_find_signature_element_for_reg(shader_signature, &signature_idx, reg->idx[0].offset, dst->write_mask))) @@ -3993,7 +3997,6 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler storage_class = SpvStorageClassPrivate; vkd3d_symbol_make_register(&reg_symbol, reg); - if (!use_private_variable) var_id = id; else if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) @@ -4006,7 +4009,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, use_private_variable ? VKD3D_TYPE_FLOAT : component_type, VKD3DSP_WRITEMASK_ALL); reg_symbol.info.reg.is_aggregate = use_private_variable ? false : array_size; - if (!use_private_variable && phase && phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE) + if (!use_private_variable && is_control_point_phase(phase)) { struct vkd3d_shader_register r; @@ -4196,7 +4199,7 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ param_id[i] = vkd3d_spirv_build_op_load(builder, type_id, param_id[i], SpvMemoryAccessMaskNone); } - if (phase && phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE) + if (is_control_point_phase(phase)) { struct vkd3d_shader_register r; uint32_t invocation_id; @@ -5227,7 +5230,7 @@ static void vkd3d_dxbc_compiler_leave_shader_phase(struct vkd3d_dxbc_compiler *c * in fork/join phases. We have to remove all output registers' symbols * when leaving the control point phase. */ - if (phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE) + if (is_control_point_phase(phase)) { memset(&reg, 0, sizeof(reg)); reg.type = VKD3DSPR_OUTPUT; @@ -5313,7 +5316,7 @@ static const struct vkd3d_shader_phase *vkd3d_dxbc_compiler_get_control_point_ph return NULL; phase = &compiler->shader_phases[0]; - if (phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE) + if (is_control_point_phase(phase)) return phase; return NULL; @@ -5438,7 +5441,7 @@ static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler for (i = 0; i < compiler->shader_phase_count; ++i) { phase = &compiler->shader_phases[i]; - if (phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE) + if (is_control_point_phase(phase)) continue; if (phase->instance_count)

1 0

Józef Kucia : tests: Add test for hull shader control point phase.
by Alexandre Julliard Feb. 26, 2019

Feb. 26, 2019

Module: vkd3d Branch: master Commit: 5bfd2b8ed4c515ef8372f605f9aa256c6e27ca03 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5bfd2b8ed4c515ef8372f60… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 26 12:27:59 2019 +0100 tests: Add test for hull shader control point phase. 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> --- tests/d3d12.c | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index d8a13a7..24db7a8 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -22909,6 +22909,156 @@ static void test_tessellation_dcl_index_range(void) destroy_test_context(&context); } +static void test_hull_shader_control_point_phase(void) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + HRESULT hr; + + static const DWORD vs_code[] = + { +#if 0 + void main() + { + } +#endif + 0x43425844, 0x590b08ae, 0x11d28adb, 0x825a5628, 0x34c0c208, 0x00000001, 0x00000064, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000010, 0x00010050, 0x00000004, 0x0100086a, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; +#if 0 + struct data + { + float4 position : SV_Position; + }; + + struct patch_constant_data + { + float edges[3] : SV_TessFactor; + float inside : SV_InsideTessFactor; + }; + + void patch_constant(out patch_constant_data output) + { + output.edges[0] = output.edges[1] = output.edges[2] = 1.0f; + output.inside = 1.0f; + } + + [domain("tri")] + [outputcontrolpoints(3)] + [partitioning("integer")] + [outputtopology("triangle_cw")] + [patchconstantfunc("patch_constant")] + data hs_main(uint i : SV_OutputControlPointID) + { + data output; + + if (i == 0) + output.position = float4(-1, 1, 0, 1); + else if (i == 1) + output.position = float4(3, 1, 0, 1); + else + output.position = float4(-1, -3, 0, 1); + + return output; + } + + [domain("tri")] + void ds_main(patch_constant_data input, + float3 tess_coord : SV_DomainLocation, + const OutputPatch<data, 3> patch, + out data output) + { + uint index = uint(tess_coord.y + 2 * tess_coord.z); + output.position = patch[index].position; + } +#endif + static const DWORD hs_code[] = + { + 0x43425844, 0x4204890e, 0x43f4f8e0, 0xbff7edfd, 0x0a48b715, 0x00000001, 0x0000028c, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x00000108, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x47534350, 0x0000008c, 0x00000004, + 0x00000008, 0x00000068, 0x00000000, 0x0000000d, 0x00000003, 0x00000000, 0x00000e01, 0x00000068, + 0x00000001, 0x0000000d, 0x00000003, 0x00000001, 0x00000e01, 0x00000068, 0x00000002, 0x0000000d, + 0x00000003, 0x00000002, 0x00000e01, 0x00000076, 0x00000000, 0x0000000e, 0x00000003, 0x00000003, + 0x00000e01, 0x545f5653, 0x46737365, 0x6f746361, 0x56530072, 0x736e495f, 0x54656469, 0x46737365, + 0x6f746361, 0xabab0072, 0x58454853, 0x0000017c, 0x00030050, 0x0000005f, 0x01000071, 0x01000893, + 0x01001894, 0x01001095, 0x01000896, 0x01001897, 0x0100086a, 0x01000072, 0x0200005f, 0x00016000, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x06000020, 0x00100012, 0x00000000, + 0x00016001, 0x00004001, 0x00000001, 0x0f000037, 0x001000f2, 0x00000000, 0x00100006, 0x00000000, + 0x00004002, 0x40400000, 0x3f800000, 0x00000000, 0x3f800000, 0x00004002, 0xbf800000, 0xc0400000, + 0x00000000, 0x3f800000, 0x0b000037, 0x001020f2, 0x00000000, 0x00016001, 0x00100e46, 0x00000000, + 0x00004002, 0xbf800000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000073, 0x02000099, + 0x00000003, 0x0200005f, 0x00017000, 0x04000067, 0x00102012, 0x00000000, 0x00000011, 0x04000067, + 0x00102012, 0x00000001, 0x00000012, 0x04000067, 0x00102012, 0x00000002, 0x00000013, 0x02000068, + 0x00000001, 0x0400005b, 0x00102012, 0x00000000, 0x00000003, 0x04000036, 0x00100012, 0x00000000, + 0x0001700a, 0x06000036, 0x00902012, 0x0010000a, 0x00000000, 0x00004001, 0x3f800000, 0x0100003e, + 0x01000073, 0x04000067, 0x00102012, 0x00000003, 0x00000014, 0x05000036, 0x00102012, 0x00000003, + 0x00004001, 0x3f800000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE hs = {hs_code, sizeof(hs_code)}; + static const DWORD ds_code[] = + { + 0x43425844, 0x33c6120a, 0x2d46da82, 0x2c17dddf, 0x252ae7e0, 0x00000001, 0x000001c8, 0x00000004, + 0x00000030, 0x00000064, 0x000000f8, 0x0000012c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f, + 0x006e6f69, 0x47534350, 0x0000008c, 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x0000000d, + 0x00000003, 0x00000000, 0x00000001, 0x00000068, 0x00000001, 0x0000000d, 0x00000003, 0x00000001, + 0x00000001, 0x00000068, 0x00000002, 0x0000000d, 0x00000003, 0x00000002, 0x00000001, 0x00000076, + 0x00000000, 0x0000000e, 0x00000003, 0x00000003, 0x00000001, 0x545f5653, 0x46737365, 0x6f746361, + 0x56530072, 0x736e495f, 0x54656469, 0x46737365, 0x6f746361, 0xabab0072, 0x4e47534f, 0x0000002c, + 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, + 0x505f5653, 0x7469736f, 0x006e6f69, 0x58454853, 0x00000094, 0x00040050, 0x00000025, 0x01001893, + 0x01001095, 0x0100086a, 0x0200005f, 0x0001c062, 0x0400005f, 0x002190f2, 0x00000003, 0x00000000, + 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x02000068, 0x00000001, 0x07000032, 0x00100012, + 0x00000000, 0x0001c02a, 0x00004001, 0x40000000, 0x0001c01a, 0x0500001c, 0x00100012, 0x00000000, + 0x0010000a, 0x00000000, 0x07000036, 0x001020f2, 0x00000000, 0x00a19e46, 0x0010000a, 0x00000000, + 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ds = {ds_code, sizeof(ds_code)}; + + memset(&desc, 0, sizeof(desc)); + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, NULL, NULL, NULL); + pso_desc.VS = vs; + pso_desc.HS = hs; + pso_desc.DS = ds; + pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + destroy_test_context(&context); +} + static void test_render_a8(void) { static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; @@ -25257,6 +25407,7 @@ START_TEST(d3d12) run_test(test_nop_tessellation_shaders); run_test(test_quad_tessellation); run_test(test_tessellation_dcl_index_range); + run_test(test_hull_shader_control_point_phase); run_test(test_render_a8); run_test(test_cpu_descriptors_lifetime); run_test(test_clip_distance);

1 0

Józef Kucia : vkd3d-shader: Add more advanced helper for vector shuffle.
by Alexandre Julliard Feb. 26, 2019

Feb. 26, 2019

Module: vkd3d Branch: master Commit: bc441fd6c6535a045914236969ec111ac886157d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bc441fd6c6535a045914236… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 26 12:27:55 2019 +0100 vkd3d-shader: Add more advanced helper for vector shuffle. 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 | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a925d68..9aee692 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2669,22 +2669,22 @@ static uint32_t vkd3d_dxbc_compiler_emit_swizzle(struct vkd3d_dxbc_compiler *com } static uint32_t vkd3d_dxbc_compiler_emit_vector_shuffle(struct vkd3d_dxbc_compiler *compiler, - uint32_t vector1_id, uint32_t vector2_id, uint32_t write_mask, + uint32_t vector1_id, uint32_t vector2_id, unsigned int swizzle, unsigned int write_mask, enum vkd3d_component_type component_type, unsigned int component_count) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t components[VKD3D_VEC4_SIZE]; - unsigned int i, component_idx; uint32_t type_id; + unsigned int i; assert(component_count <= ARRAY_SIZE(components)); - for (i = 0, component_idx = 0; i < component_count; ++i) + for (i = 0; i < component_count; ++i) { if (write_mask & (VKD3DSP_WRITEMASK_0 << i)) - components[i] = VKD3D_VEC4_SIZE + component_idx++; + components[i] = vkd3d_swizzle_get_component(swizzle, i); else - components[i] = i; + components[i] = VKD3D_VEC4_SIZE + vkd3d_swizzle_get_component(swizzle, i); } type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count); @@ -2926,6 +2926,8 @@ static void vkd3d_dxbc_compiler_emit_store(struct vkd3d_dxbc_compiler *compiler, { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; unsigned int component_count, dst_component_count; + uint32_t components[VKD3D_VEC4_SIZE]; + unsigned int i, component_idx; uint32_t type_id, dst_val_id; assert(write_mask); @@ -2944,8 +2946,18 @@ static void vkd3d_dxbc_compiler_emit_store(struct vkd3d_dxbc_compiler *compiler, type_id = vkd3d_spirv_get_type_id(builder, component_type, dst_component_count); dst_val_id = vkd3d_spirv_build_op_load(builder, type_id, dst_id, SpvMemoryAccessMaskNone); - val_id = vkd3d_dxbc_compiler_emit_vector_shuffle(compiler, - dst_val_id, val_id, write_mask, component_type, dst_component_count); + assert(component_count <= ARRAY_SIZE(components)); + + for (i = 0, component_idx = 0; i < dst_component_count; ++i) + { + if (write_mask & (VKD3DSP_WRITEMASK_0 << i)) + components[i] = VKD3D_VEC4_SIZE + component_idx++; + else + components[i] = i; + } + + val_id = vkd3d_spirv_build_op_vector_shuffle(builder, + type_id, dst_val_id, val_id, components, dst_component_count); } vkd3d_spirv_build_op_store(builder, dst_id, val_id, SpvMemoryAccessMaskNone); @@ -4039,23 +4051,18 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi uint32_t type_id, zero_id, ptr_type_id, chain_id, object_id; uint32_t write_mask, use_mask, uninit_mask, swizzle, mask; uint32_t output_id, indexes[1]; - unsigned int component_count; unsigned int i, index; write_mask = output->mask & 0xff; use_mask = (output->mask >> 8) & 0xff; - swizzle = get_shader_output_swizzle(compiler, output->register_index); - val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, - val_id, VKD3DSP_WRITEMASK_ALL, VKD3D_TYPE_FLOAT, swizzle, write_mask); - - component_count = vkd3d_write_mask_component_count(write_mask); if (output_info->component_type != VKD3D_TYPE_FLOAT) { - type_id = vkd3d_spirv_get_type_id(builder, output_info->component_type, component_count); + type_id = vkd3d_spirv_get_type_id(builder, output_info->component_type, VKD3D_VEC4_SIZE); val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); } + swizzle = get_shader_output_swizzle(compiler, output->register_index); uninit_mask = write_mask & use_mask; if (uninit_mask) { @@ -4063,7 +4070,13 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi zero_id = vkd3d_dxbc_compiler_get_constant_vector(compiler, output_info->component_type, VKD3D_VEC4_SIZE, 0); val_id = vkd3d_dxbc_compiler_emit_vector_shuffle(compiler, - val_id, zero_id, uninit_mask, output_info->component_type, component_count); + zero_id, val_id, swizzle, uninit_mask, output_info->component_type, + vkd3d_write_mask_component_count(write_mask)); + } + else + { + val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, + val_id, VKD3DSP_WRITEMASK_ALL, output_info->component_type, swizzle, write_mask); } output_id = output_info->id;

1 0

Józef Kucia : vkd3d-shader: Handle partial shader output updates in epilogue functions.
by Alexandre Julliard Feb. 26, 2019

Feb. 26, 2019

Module: vkd3d Branch: master Commit: 0328118947c8d717604b02264a58e3bc5bfa771e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0328118947c8d717604b022… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 26 12:27:56 2019 +0100 vkd3d-shader: Handle partial shader output updates in epilogue functions. Fork and join phases quite often write only a few components of an output variable. 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, 20 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9aee692..0e6df47 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1980,6 +1980,7 @@ struct vkd3d_dxbc_compiler uint32_t array_element_mask; } *output_info; uint32_t private_output_variable[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ + uint32_t private_output_variable_write_mask[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ uint32_t epilogue_function_id; uint32_t dummy_sampler_id; @@ -3998,6 +3999,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler { unsigned int idx = vkd3d_dxbc_compiler_get_output_variable_index(compiler, reg->idx[0].offset); compiler->private_output_variable[idx] = var_id; + compiler->private_output_variable_write_mask[idx] |= dst->write_mask; if (!compiler->epilogue_function_id) compiler->epilogue_function_id = vkd3d_spirv_alloc_id(builder); } @@ -4045,15 +4047,16 @@ static void vkd3d_dxbc_compiler_emit_shader_phase_output(struct vkd3d_dxbc_compi static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_signature_element *output, - const struct vkd3d_shader_output_info *output_info, uint32_t val_id) + const struct vkd3d_shader_output_info *output_info, uint32_t val_id, unsigned int write_mask) { + unsigned int dst_write_mask, use_mask, uninit_mask, swizzle, mask; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, zero_id, ptr_type_id, chain_id, object_id; - uint32_t write_mask, use_mask, uninit_mask, swizzle, mask; - uint32_t output_id, indexes[1]; unsigned int i, index; + uint32_t output_id; - write_mask = output->mask & 0xff; + dst_write_mask = output->mask & 0xff; + write_mask &= dst_write_mask; use_mask = (output->mask >> 8) & 0xff; if (output_info->component_type != VKD3D_TYPE_FLOAT) @@ -4063,10 +4066,11 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi } swizzle = get_shader_output_swizzle(compiler, output->register_index); - uninit_mask = write_mask & use_mask; + uninit_mask = dst_write_mask & use_mask; if (uninit_mask) { /* Set values to 0 for not initialized shader output components. */ + write_mask |= uninit_mask; zero_id = vkd3d_dxbc_compiler_get_constant_vector(compiler, output_info->component_type, VKD3D_VEC4_SIZE, 0); val_id = vkd3d_dxbc_compiler_emit_vector_shuffle(compiler, @@ -4083,7 +4087,8 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi if (!output_info->array_element_mask) { - vkd3d_spirv_build_op_store(builder, output_id, val_id, SpvMemoryAccessMaskNone); + vkd3d_dxbc_compiler_emit_store(compiler, + output_id, dst_write_mask, output_info->component_type, SpvStorageClassOutput, write_mask, val_id); return; } @@ -4096,12 +4101,13 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi if (!(write_mask & (VKD3DSP_WRITEMASK_0 << i))) continue; - indexes[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, index++); - chain_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, - output_id, indexes, ARRAY_SIZE(indexes)); + chain_id = vkd3d_spirv_build_op_access_chain1(builder, + ptr_type_id, output_id, vkd3d_dxbc_compiler_get_constant_uint(compiler, index)); object_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, val_id, write_mask, output_info->component_type, VKD3D_NO_SWIZZLE, VKD3DSP_WRITEMASK_0 << i); - vkd3d_spirv_build_op_store(builder, chain_id, object_id, SpvMemoryAccessMaskNone); + vkd3d_dxbc_compiler_emit_store(compiler, chain_id, VKD3DSP_WRITEMASK_0 << index, + output_info->component_type, SpvStorageClassOutput, VKD3DSP_WRITEMASK_0 << i, object_id); + ++index; } } @@ -4116,6 +4122,7 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ STATIC_ASSERT(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_id)); STATIC_ASSERT(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_type_id)); + STATIC_ASSERT(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(compiler->private_output_variable_write_mask)); function_id = compiler->epilogue_function_id; @@ -4155,7 +4162,8 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ continue; vkd3d_dxbc_compiler_emit_store_shader_output(compiler, - &signature->elements[i], &compiler->output_info[i], param_id[variable_idx]); + &signature->elements[i], &compiler->output_info[i], + param_id[variable_idx], compiler->private_output_variable_write_mask[variable_idx]); } vkd3d_spirv_build_op_return(&compiler->spirv_builder); @@ -4163,6 +4171,7 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ memset(compiler->output_info, 0, signature->element_count * sizeof(*compiler->output_info)); memset(compiler->private_output_variable, 0, sizeof(compiler->private_output_variable)); + memset(compiler->private_output_variable_write_mask, 0, sizeof(compiler->private_output_variable_write_mask)); compiler->epilogue_function_id = 0; }

1 0

Józef Kucia : vkd3d-shader: Remove output register symbols while leaving control point phase.
by Alexandre Julliard Feb. 26, 2019

Feb. 26, 2019

Module: vkd3d Branch: master Commit: 6c70edf511c17ab6ee538d9cf3852868a90dea7f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6c70edf511c17ab6ee538d9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 26 12:27:54 2019 +0100 vkd3d-shader: Remove output register symbols while leaving control point phase. 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 | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e169aa0..a925d68 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5124,9 +5124,12 @@ static void vkd3d_dxbc_compiler_emit_dcl_thread_group(struct vkd3d_dxbc_compiler static void vkd3d_dxbc_compiler_leave_shader_phase(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_phase *phase) { + const struct vkd3d_shader_signature *signature = compiler->output_signature; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; struct vkd3d_shader_register reg; struct vkd3d_symbol reg_symbol; + struct rb_entry *entry; + unsigned int i; vkd3d_spirv_build_op_function_end(builder); @@ -5139,12 +5142,41 @@ static void vkd3d_dxbc_compiler_leave_shader_phase(struct vkd3d_dxbc_compiler *c compiler->temp_id = 0; compiler->temp_count = 0; + /* + * Output regsiters have a different purpose in the control point phase and + * in fork/join phases. We have to remove all output registers' symbols + * when leaving the control point phase. + */ + if (phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE) + { + memset(&reg, 0, sizeof(reg)); + reg.type = VKD3DSPR_OUTPUT; + reg.idx[1].offset = ~0u; + + for (i = 0; i < signature->element_count; ++i) + { + const struct vkd3d_shader_signature_element *e = &signature->elements[i]; + + reg.idx[0].offset = e->register_index; + vkd3d_symbol_make_register(&reg_symbol, &reg); + if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) + { + rb_remove(&compiler->symbol_table, entry); + vkd3d_symbol_free(entry, NULL); + } + } + } + if (phase->instance_count) { reg.type = phase->type == VKD3DSIH_HS_FORK_PHASE ? VKD3DSPR_FORKINSTID : VKD3DSPR_JOININSTID; reg.idx[0].offset = ~0u; vkd3d_symbol_make_register(&reg_symbol, &reg); - rb_remove_key(&compiler->symbol_table, &reg_symbol); + if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) + { + rb_remove(&compiler->symbol_table, entry); + vkd3d_symbol_free(entry, NULL); + } } }

1 0