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

Alexandre Julliard : netstat: Build with msvcrt.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: wine Branch: master Commit: b13ce7597bba40cf3eabfe9fadff75d6b6db37a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b13ce7597bba40cf3eabfe9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 11:54:02 2019 +0200 netstat: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/netstat/Makefile.in | 3 ++- programs/netstat/netstat.c | 39 ++++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/programs/netstat/Makefile.in b/programs/netstat/Makefile.in index 78389db..7b877a7 100644 --- a/programs/netstat/Makefile.in +++ b/programs/netstat/Makefile.in @@ -1,7 +1,8 @@ MODULE = netstat.exe -APPMODE = -mconsole -municode IMPORTS = iphlpapi user32 ws2_32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = netstat.c RC_SRCS = netstat.rc diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index afa211d..b332020 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -17,10 +17,10 @@ */ #define NONAMELESSUNION +#include <stdio.h> #include "netstat.h" #include <winsock2.h> #include <iphlpapi.h> -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(netstat); @@ -146,7 +146,7 @@ static WCHAR *NETSTAT_load_message(UINT id) { if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); - strcpyW(msg, failedW); + lstrcpyW(msg, failedW); } return msg; } @@ -154,7 +154,7 @@ static WCHAR *NETSTAT_load_message(UINT id) { static WCHAR *NETSTAT_port_name(UINT port, WCHAR name[]) { /* FIXME: can we get the name? */ - sprintfW(name, fmtport, htons((WORD)port)); + swprintf(name, 32, fmtport, htons((WORD)port)); return name; } @@ -164,7 +164,8 @@ static WCHAR *NETSTAT_host_name(UINT ip, WCHAR name[]) /* FIXME: can we get the name? */ nip = htonl(ip); - sprintfW(name, fmtip, (nip >> 24) & 0xFF, (nip >> 16) & 0xFF, (nip >> 8) & 0xFF, (nip) & 0xFF); + swprintf(name, MAX_HOSTNAME_LEN, fmtip, + (nip >> 24) & 0xFF, (nip >> 16) & 0xFF, (nip >> 8) & 0xFF, (nip) & 0xFF); return name; } @@ -173,9 +174,9 @@ static void NETSTAT_conn_header(void) WCHAR local[22], remote[22], state[22]; NETSTAT_wprintf(fmtnn, NETSTAT_load_message(IDS_TCP_ACTIVE_CONN)); NETSTAT_wprintf(fmtn); - strcpyW(local, NETSTAT_load_message(IDS_TCP_LOCAL_ADDR)); - strcpyW(remote, NETSTAT_load_message(IDS_TCP_REMOTE_ADDR)); - strcpyW(state, NETSTAT_load_message(IDS_TCP_STATE)); + lstrcpyW(local, NETSTAT_load_message(IDS_TCP_LOCAL_ADDR)); + lstrcpyW(remote, NETSTAT_load_message(IDS_TCP_REMOTE_ADDR)); + lstrcpyW(state, NETSTAT_load_message(IDS_TCP_STATE)); NETSTAT_wprintf(fmttcpout, NETSTAT_load_message(IDS_TCP_PROTO), local, remote, state); } @@ -199,7 +200,7 @@ static void NETSTAT_eth_stats(void) NETSTAT_wprintf(NETSTAT_load_message(IDS_ETH_STAT)); NETSTAT_wprintf(fmtn); NETSTAT_wprintf(fmtn); - strcpyW(recv, NETSTAT_load_message(IDS_ETH_RECV)); + lstrcpyW(recv, NETSTAT_load_message(IDS_ETH_RECV)); NETSTAT_wprintf(fmtethheader, recv, NETSTAT_load_message(IDS_ETH_SENT)); octets[0] = octets[1] = 0; @@ -264,8 +265,8 @@ static void NETSTAT_tcp_table(void) NETSTAT_host_name(table->table[i].dwRemoteAddr, RemoteIp); NETSTAT_port_name(table->table[i].dwRemotePort, RemotePort); - sprintfW(Host, fmtcolon, HostIp, HostPort); - sprintfW(Remote, fmtcolon, RemoteIp, RemotePort); + swprintf(Host, ARRAY_SIZE(Host), fmtcolon, HostIp, HostPort); + swprintf(Remote, ARRAY_SIZE(Remote), fmtcolon, RemoteIp, RemotePort); NETSTAT_wprintf(fmttcpout, tcpW, Host, Remote, tcpstatesW[table->table[i].u.dwState]); } } @@ -313,7 +314,7 @@ static void NETSTAT_udp_table(void) NETSTAT_host_name(table->table[i].dwLocalAddr, HostIp); NETSTAT_port_name(table->table[i].dwLocalPort, HostPort); - sprintfW(Host, fmtcolon, HostIp, HostPort); + swprintf(Host, ARRAY_SIZE(Host), fmtcolon, HostIp, HostPort); NETSTAT_wprintf(fmtudpout, udpW, Host); } HeapFree(GetProcessHeap(), 0, table); @@ -336,14 +337,14 @@ static void NETSTAT_udp_stats(void) static NETSTATPROTOCOLS NETSTAT_get_protocol(WCHAR name[]) { - if (!strcmpiW(name, ipW)) return PROT_IP; - if (!strcmpiW(name, ipv6W)) return PROT_IPV6; - if (!strcmpiW(name, icmpW)) return PROT_ICMP; - if (!strcmpiW(name, icmpv6W)) return PROT_ICMPV6; - if (!strcmpiW(name, tcpW)) return PROT_TCP; - if (!strcmpiW(name, tcpv6W)) return PROT_TCPV6; - if (!strcmpiW(name, udpW)) return PROT_UDP; - if (!strcmpiW(name, udpv6W)) return PROT_UDPV6; + if (!wcsicmp(name, ipW)) return PROT_IP; + if (!wcsicmp(name, ipv6W)) return PROT_IPV6; + if (!wcsicmp(name, icmpW)) return PROT_ICMP; + if (!wcsicmp(name, icmpv6W)) return PROT_ICMPV6; + if (!wcsicmp(name, tcpW)) return PROT_TCP; + if (!wcsicmp(name, tcpv6W)) return PROT_TCPV6; + if (!wcsicmp(name, udpW)) return PROT_UDP; + if (!wcsicmp(name, udpv6W)) return PROT_UDPV6; return PROT_UNKNOWN; }

1 0

Józef Kucia : wined3d: Implement GPU description registry override for Vulkan adapter.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: wine Branch: master Commit: 9f75b8421961fc67ec75df053f4568b6f47c66c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f75b8421961fc67ec75df05… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 30 13:06:37 2019 +0200 wined3d: Implement GPU description registry override for Vulkan adapter. 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> --- dlls/wined3d/adapter_gl.c | 25 ++++++------------------- dlls/wined3d/adapter_vk.c | 15 ++++++++++----- dlls/wined3d/directx.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 45 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 0f554e7..cedd012 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -991,41 +991,28 @@ static void quirk_broken_viewport_subpixel_bits(struct wined3d_gl_info *gl_info) static const struct wined3d_gpu_description *query_gpu_description(const struct wined3d_gl_info *gl_info, UINT64 *vram_bytes) { - const struct wined3d_gpu_description *gpu_description; + const struct wined3d_gpu_description *gpu_description = NULL, *gpu_description_override; enum wined3d_pci_vendor vendor = PCI_VENDOR_NONE; enum wined3d_pci_device device = PCI_DEVICE_NONE; - static unsigned int once; + GLuint value; if (gl_info->supported[WGL_WINE_QUERY_RENDERER]) { - GLuint value; - if (GL_EXTCALL(wglQueryCurrentRendererIntegerWINE(WGL_RENDERER_VENDOR_ID_WINE, &value))) vendor = value; if (GL_EXTCALL(wglQueryCurrentRendererIntegerWINE(WGL_RENDERER_DEVICE_ID_WINE, &value))) device = value; if (GL_EXTCALL(wglQueryCurrentRendererIntegerWINE(WGL_RENDERER_VIDEO_MEMORY_WINE, &value))) *vram_bytes = (UINT64)value * 1024 * 1024; + TRACE("Card reports vendor PCI ID 0x%04x, device PCI ID 0x%04x, 0x%s bytes of video memory.\n", vendor, device, wine_dbgstr_longlong(*vram_bytes)); - } - if (wined3d_settings.pci_vendor_id != PCI_VENDOR_NONE) - { - vendor = wined3d_settings.pci_vendor_id; - TRACE("Overriding vendor PCI ID with 0x%04x.\n", vendor); - } - - if (wined3d_settings.pci_device_id != PCI_DEVICE_NONE) - { - device = wined3d_settings.pci_device_id; - TRACE("Overriding device PCI ID with 0x%04x.\n", device); + gpu_description = wined3d_get_gpu_description(vendor, device); } - if (!(gpu_description = wined3d_get_gpu_description(vendor, device)) - && (wined3d_settings.pci_vendor_id != PCI_VENDOR_NONE - || wined3d_settings.pci_device_id != PCI_DEVICE_NONE) && !once++) - ERR_(winediag)("Invalid GPU override %04x:%04x specified, ignoring.\n", vendor, device); + if ((gpu_description_override = wined3d_get_user_override_gpu_description(vendor, device))) + gpu_description = gpu_description_override; return gpu_description; } diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 464f791..3709c94 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -627,13 +627,18 @@ const struct wined3d_gpu_description *get_vulkan_gpu_description(const VkPhysica TRACE("Driver version: %#x.\n", properties->driverVersion); TRACE("API version: %s.\n", debug_vk_version(properties->apiVersion)); - if ((description = wined3d_get_gpu_description(properties->vendorID, properties->deviceID))) - return description; + if (!(description = wined3d_get_user_override_gpu_description(properties->vendorID, properties->deviceID))) + description = wined3d_get_gpu_description(properties->vendorID, properties->deviceID); - FIXME("Failed to retrieve GPU description for device %s %04x:%04x.\n", - debugstr_a(properties->deviceName), properties->vendorID, properties->deviceID); + if (!description) + { + FIXME("Failed to retrieve GPU description for device %s %04x:%04x.\n", + debugstr_a(properties->deviceName), properties->vendorID, properties->deviceID); + + description = wined3d_get_gpu_description(HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA); + } - return wined3d_get_gpu_description(HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA); + return description; } static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index cacd9ac..a1c0b88 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -28,6 +28,7 @@ #include "winternl.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); +WINE_DECLARE_DEBUG_CHANNEL(winediag); #define DEFAULT_REFRESH_RATE 0 @@ -501,6 +502,32 @@ const struct wined3d_gpu_description *wined3d_get_gpu_description(enum wined3d_p return NULL; } +const struct wined3d_gpu_description *wined3d_get_user_override_gpu_description(enum wined3d_pci_vendor vendor, + enum wined3d_pci_device device) +{ + const struct wined3d_gpu_description *gpu_desc; + static unsigned int once; + + if (wined3d_settings.pci_vendor_id == PCI_VENDOR_NONE && wined3d_settings.pci_device_id == PCI_DEVICE_NONE) + return NULL; + + if (wined3d_settings.pci_vendor_id != PCI_VENDOR_NONE) + { + vendor = wined3d_settings.pci_vendor_id; + TRACE("Overriding vendor PCI ID with 0x%04x.\n", vendor); + } + if (wined3d_settings.pci_device_id != PCI_DEVICE_NONE) + { + device = wined3d_settings.pci_device_id; + TRACE("Overriding device PCI ID with 0x%04x.\n", device); + } + + if (!(gpu_desc = wined3d_get_gpu_description(vendor, device)) && !once++) + ERR_(winediag)("Invalid GPU override %04x:%04x specified, ignoring.\n", vendor, device); + + return gpu_desc; +} + void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, const struct wined3d_gpu_description *gpu_desc, UINT64 vram_bytes) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cf46f80..8e0aef5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2670,6 +2670,8 @@ struct wined3d_gpu_description const struct wined3d_gpu_description *wined3d_get_gpu_description(enum wined3d_pci_vendor vendor, enum wined3d_pci_device device) DECLSPEC_HIDDEN; +const struct wined3d_gpu_description *wined3d_get_user_override_gpu_description(enum wined3d_pci_vendor vendor, + enum wined3d_pci_device device) DECLSPEC_HIDDEN; enum wined3d_pci_device wined3d_gpu_from_feature_level(enum wined3d_pci_vendor *vendor, enum wined3d_feature_level feature_level) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : mfplat: Copy attributes when cloning presentation descriptor.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: wine Branch: master Commit: dda9037c37ead73bbdbc955b0b9cdb7afb06f913 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dda9037c37ead73bbdbc955b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 30 13:33:24 2019 +0300 mfplat: Copy attributes when cloning presentation descriptor. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 3 ++- dlls/mfplat/tests/mfplat.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index aaf0714..e522e90 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -1616,7 +1616,8 @@ static HRESULT WINAPI presentation_descriptor_Clone(IMFPresentationDescriptor *i object->descriptors[i] = presentation_desc->descriptors[i]; IMFStreamDescriptor_AddRef(object->descriptors[i].descriptor); } - /* FIXME: copy attributes */ + + attributes_CopyAllItems(&presentation_desc->attributes, (IMFAttributes *)&object->IMFPresentationDescriptor_iface); LeaveCriticalSection(&presentation_desc->cs); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 541b236..b349c51 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -2289,6 +2289,7 @@ static void test_presentation_descriptor(void) IMFMediaType *media_type; unsigned int i; BOOL selected; + UINT64 value; DWORD count; HRESULT hr; @@ -2330,14 +2331,24 @@ static void test_presentation_descriptor(void) ok(!!selected, "Unexpected selected state.\n"); IMFStreamDescriptor_Release(stream_desc2); + hr = IMFPresentationDescriptor_SetUINT64(pd, &MF_PD_TOTAL_FILE_SIZE, 1); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFPresentationDescriptor_Clone(pd, &pd2); ok(hr == S_OK, "Failed to clone, hr %#x.\n", hr); hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd2, 0, &selected, &stream_desc2); ok(hr == S_OK, "Failed to get stream descriptor, hr %#x.\n", hr); ok(!!selected, "Unexpected selected state.\n"); + ok(stream_desc2 == stream_desc[0], "Unexpected stream descriptor.\n"); IMFStreamDescriptor_Release(stream_desc2); + value = 0; + hr = IMFPresentationDescriptor_GetUINT64(pd2, &MF_PD_TOTAL_FILE_SIZE, &value); + ok(hr == S_OK, "Failed to get attribute, hr %#x.\n", hr); + ok(value == 1, "Unexpected attribute value.\n"); + + IMFPresentationDescriptor_Release(pd2); IMFPresentationDescriptor_Release(pd); for (i = 0; i < ARRAY_SIZE(stream_desc); ++i)

1 0

Nikolay Sivov : mfreadwrite: Wake waiting threads on stream states changes.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: wine Branch: master Commit: 10bbe1111b1abeafeab47b90c7b33bdf6de22cf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10bbe1111b1abeafeab47b90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 30 13:15:42 2019 +0300 mfreadwrite: Wake waiting threads on stream states changes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index aeb86db..5ec5c91 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -418,6 +418,9 @@ static HRESULT source_reader_media_stream_state_handler(struct source_reader *re } LeaveCriticalSection(&reader->streams[i].cs); + + WakeAllConditionVariable(&reader->streams[i].sample_event); + break; } }

1 0

Józef Kucia : vkd3d-shader: Add support for parsing Shader Model 5.1 bytecode.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: vkd3d Branch: master Commit: c77f02ca01357315399a7b04097720a806fe106d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c77f02ca01357315399a7b0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 29 11:38:15 2019 +0200 vkd3d-shader: Add support for parsing Shader Model 5.1 bytecode. Translation to SPIR-V isn't implemented yet. 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/dxbc.c | 100 +++++++++++++++++++++++++++---- libs/vkd3d-shader/spirv.c | 54 +++++++++++++---- libs/vkd3d-shader/trace.c | 35 +++++++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 27 ++++++++- 4 files changed, 186 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=c77f02ca01357315399…

1 0

Józef Kucia : vkd3d-shader: Translate lod shader instructions.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: vkd3d Branch: master Commit: 3963316c503391c3c099c1a98385244ef0c2f1e6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3963316c503391c3c099c1a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 29 11:38:17 2019 +0200 vkd3d-shader: Translate lod shader instructions. 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 | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 3d81952..d0304e0 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1530,6 +1530,13 @@ static uint32_t vkd3d_spirv_build_op_image_query_samples(struct vkd3d_spirv_buil SpvOpImageQuerySamples, result_type, image_id); } +static uint32_t vkd3d_spirv_build_op_image_query_lod(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t image_id, uint32_t coordinate_id) +{ + return vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, + SpvOpImageQueryLod, result_type, image_id, coordinate_id); +} + static void vkd3d_spirv_build_op_emit_vertex(struct vkd3d_spirv_builder *builder) { return vkd3d_spirv_build_op(&builder->function_stream, SpvOpEmitVertex); @@ -6966,6 +6973,32 @@ static void vkd3d_dxbc_compiler_emit_ld(struct vkd3d_dxbc_compiler *compiler, dst, val_id, image.sampled_type, src[1].swizzle); } +static void vkd3d_dxbc_compiler_emit_lod(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_dst_param *dst = instruction->dst; + const struct vkd3d_shader_src_param *src = instruction->src; + const struct vkd3d_shader_src_param *resource, *sampler; + uint32_t type_id, coordinate_id, val_id; + struct vkd3d_shader_image image; + + vkd3d_spirv_enable_capability(builder, SpvCapabilityImageQuery); + + resource = &src[1]; + sampler = &src[2]; + vkd3d_dxbc_compiler_prepare_image(compiler, &image, + &resource->reg, &sampler->reg, VKD3D_IMAGE_FLAG_SAMPLED); + + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 2); + coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], VKD3DSP_WRITEMASK_ALL); + val_id = vkd3d_spirv_build_op_image_query_lod(builder, + type_id, image.sampled_image_id, coordinate_id); + + vkd3d_dxbc_compiler_emit_store_dst_swizzled(compiler, + dst, val_id, image.sampled_type, resource->swizzle); +} + static void vkd3d_dxbc_compiler_emit_sample(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { @@ -8258,6 +8291,9 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_LD: vkd3d_dxbc_compiler_emit_ld(compiler, instruction); break; + case VKD3DSIH_LOD: + vkd3d_dxbc_compiler_emit_lod(compiler, instruction); + break; case VKD3DSIH_SAMPLE: case VKD3DSIH_SAMPLE_B: case VKD3DSIH_SAMPLE_GRAD:

1 0

Józef Kucia : vkd3d: Pass d3d12_resource to vk_barrier_parameters_from_d3d12_resource_state().
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: vkd3d Branch: master Commit: 5ed83a251d1fb77eedd8ea5aac45e222ad92e0ea URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5ed83a251d1fb77eedd8ea5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 29 11:38:18 2019 +0200 vkd3d: Pass d3d12_resource to vk_barrier_parameters_from_d3d12_resource_state(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index f3271eb..c609270 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1610,9 +1610,10 @@ static void d3d12_command_list_invalidate_bindings(struct d3d12_command_list *li } static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, - bool is_swapchain_image, D3D12_RESOURCE_STATES present_state, VkQueueFlags vk_queue_flags, + const struct d3d12_resource *resource, VkQueueFlags vk_queue_flags, VkAccessFlags *access_mask, VkPipelineStageFlags *stage_flags, VkImageLayout *image_layout) { + bool is_swapchain_image = resource && (resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION); VkPipelineStageFlags queue_shader_stages = 0; if (vk_queue_flags & VK_QUEUE_GRAPHICS_BIT) @@ -1637,26 +1638,26 @@ static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, * state when GPU finishes execution of a command list. */ if (is_swapchain_image) { - if (present_state == D3D12_RESOURCE_STATE_PRESENT) + if (resource->present_state == D3D12_RESOURCE_STATE_PRESENT) { *access_mask = VK_ACCESS_MEMORY_READ_BIT; *stage_flags = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; if (image_layout) *image_layout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR; + return true; } - else + else if (resource->present_state != D3D12_RESOURCE_STATE_COMMON) { - vk_barrier_parameters_from_d3d12_resource_state(present_state, - false, 0, vk_queue_flags, access_mask, stage_flags, image_layout); + vk_barrier_parameters_from_d3d12_resource_state(resource->present_state, + resource, vk_queue_flags, access_mask, stage_flags, image_layout); + return true; } } - else - { - *access_mask = VK_ACCESS_HOST_READ_BIT | VK_ACCESS_HOST_WRITE_BIT; - *stage_flags = VK_PIPELINE_STAGE_HOST_BIT; - if (image_layout) - *image_layout = VK_IMAGE_LAYOUT_GENERAL; - } + + *access_mask = VK_ACCESS_HOST_READ_BIT | VK_ACCESS_HOST_WRITE_BIT; + *stage_flags = VK_PIPELINE_STAGE_HOST_BIT; + if (image_layout) + *image_layout = VK_IMAGE_LAYOUT_GENERAL; return true; /* Handle write states. */ @@ -1827,8 +1828,7 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 VK_IMAGE_LAYOUT_PREINITIALIZED : VK_IMAGE_LAYOUT_UNDEFINED; if (!vk_barrier_parameters_from_d3d12_resource_state(resource->initial_state, - resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION, resource->present_state, - list->vk_queue_flags, &barrier.dstAccessMask, &dst_stage_mask, &barrier.newLayout)) + resource, list->vk_queue_flags, &barrier.dstAccessMask, &dst_stage_mask, &barrier.newLayout)) { FIXME("Unhandled state %#x.\n", resource->initial_state); return; @@ -3439,15 +3439,13 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC sub_resource_idx = transition->Subresource; if (!vk_barrier_parameters_from_d3d12_resource_state(transition->StateBefore, - resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION, resource->present_state, - list->vk_queue_flags, &src_access_mask, &src_stage_mask, &layout_before)) + resource, list->vk_queue_flags, &src_access_mask, &src_stage_mask, &layout_before)) { FIXME("Unhandled state %#x.\n", transition->StateBefore); continue; } if (!vk_barrier_parameters_from_d3d12_resource_state(transition->StateAfter, - resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION, resource->present_state, - list->vk_queue_flags, &dst_access_mask, &dst_stage_mask, &layout_after)) + resource, list->vk_queue_flags, &dst_access_mask, &dst_stage_mask, &layout_after)) { FIXME("Unhandled state %#x.\n", transition->StateAfter); continue; @@ -3467,9 +3465,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC resource = unsafe_impl_from_ID3D12Resource(uav->pResource); vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, - resource && (resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION), - resource ? resource->present_state : 0, list->vk_queue_flags, - &access_mask, &stage_mask, &image_layout); + resource, list->vk_queue_flags, &access_mask, &stage_mask, &image_layout); src_access_mask = dst_access_mask = access_mask; src_stage_mask = dst_stage_mask = stage_mask; layout_before = layout_after = image_layout;

1 0

Józef Kucia : vkd3d-shader: Simplify resource declaration handling in SPIR-V generator.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: vkd3d Branch: master Commit: ee3994a1cd2419244c1f0282c55920236a9b8276 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ee3994a1cd2419244c1f028… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 29 11:38:16 2019 +0200 vkd3d-shader: Simplify resource declaration handling in SPIR-V generator. 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 | 54 +++++------------------------------------------ 1 file changed, 5 insertions(+), 49 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index dfdc7eb..3d81952 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4989,6 +4989,8 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource(struct vkd3d_dxbc_compiler *co if (semantic->register_space) FIXME("Unhandled register space %u.\n", semantic->register_space); + if (instruction->flags) + FIXME("Unhandled UAV flags %#x.\n", instruction->flags); vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &semantic->reg.reg, semantic->resource_type, semantic->resource_data_type, 0, false); @@ -5001,18 +5003,6 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource_raw(struct vkd3d_dxbc_compiler if (resource->register_space) FIXME("Unhandled register space %u.\n", resource->register_space); - - vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &resource->dst.reg, - VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_DATA_UINT, 0, true); -} - -static void vkd3d_dxbc_compiler_emit_dcl_uav_raw(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_instruction *instruction) -{ - const struct vkd3d_shader_raw_resource *resource = &instruction->declaration.raw_resource; - - if (resource->register_space) - FIXME("Unhandled register space %u.\n", resource->register_space); if (instruction->flags) FIXME("Unhandled UAV flags %#x.\n", instruction->flags); @@ -5029,20 +5019,6 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource_structured(struct vkd3d_dxbc_c if (resource->register_space) FIXME("Unhandled register space %u.\n", resource->register_space); - - vkd3d_dxbc_compiler_emit_resource_declaration(compiler, reg, - VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_DATA_UINT, stride / 4, false); -} - -static void vkd3d_dxbc_compiler_emit_dcl_uav_structured(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_instruction *instruction) -{ - const struct vkd3d_shader_structured_resource *resource = &instruction->declaration.structured_resource; - const struct vkd3d_shader_register *reg = &resource->reg.reg; - unsigned int stride = resource->byte_stride; - - if (resource->register_space) - FIXME("Unhandled register space %u.\n", resource->register_space); if (instruction->flags) FIXME("Unhandled UAV flags %#x.\n", instruction->flags); @@ -5050,20 +5026,6 @@ static void vkd3d_dxbc_compiler_emit_dcl_uav_structured(struct vkd3d_dxbc_compil VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_DATA_UINT, stride / 4, false); } -static void vkd3d_dxbc_compiler_emit_dcl_uav_typed(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_instruction *instruction) -{ - const struct vkd3d_shader_semantic *semantic = &instruction->declaration.semantic; - - if (semantic->register_space) - FIXME("Unhandled register space %u.\n", semantic->register_space); - if (instruction->flags) - FIXME("Unhandled UAV flags %#x.\n", instruction->flags); - - vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &semantic->reg.reg, - semantic->resource_type, semantic->resource_data_type, 0, false); -} - static void vkd3d_dxbc_compiler_emit_workgroup_memory(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, unsigned int size, unsigned int structure_stride) { @@ -8088,22 +8050,16 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, vkd3d_dxbc_compiler_emit_dcl_sampler(compiler, instruction); break; case VKD3DSIH_DCL: + case VKD3DSIH_DCL_UAV_TYPED: vkd3d_dxbc_compiler_emit_dcl_resource(compiler, instruction); break; case VKD3DSIH_DCL_RESOURCE_RAW: - vkd3d_dxbc_compiler_emit_dcl_resource_raw(compiler, instruction); - break; case VKD3DSIH_DCL_UAV_RAW: - vkd3d_dxbc_compiler_emit_dcl_uav_raw(compiler, instruction); + vkd3d_dxbc_compiler_emit_dcl_resource_raw(compiler, instruction); break; case VKD3DSIH_DCL_RESOURCE_STRUCTURED: - vkd3d_dxbc_compiler_emit_dcl_resource_structured(compiler, instruction); - break; case VKD3DSIH_DCL_UAV_STRUCTURED: - vkd3d_dxbc_compiler_emit_dcl_uav_structured(compiler, instruction); - break; - case VKD3DSIH_DCL_UAV_TYPED: - vkd3d_dxbc_compiler_emit_dcl_uav_typed(compiler, instruction); + vkd3d_dxbc_compiler_emit_dcl_resource_structured(compiler, instruction); break; case VKD3DSIH_DCL_TGSM_RAW: vkd3d_dxbc_compiler_emit_dcl_tgsm_raw(compiler, instruction);

1 0

Józef Kucia : vkd3d-shader: Improve ID assignment for specialization constants.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: vkd3d Branch: master Commit: 9046233492541cbe5541583884cd370bea69f859 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9046233492541cbe5541583… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 29 11:38:12 2019 +0200 vkd3d-shader: Improve ID assignment for specialization constants. Allows using 0 as SpecId. 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 | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 22e02f9..86d5be8 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2565,20 +2565,20 @@ static const struct vkd3d_spec_constant_info *get_spec_constant_info(enum vkd3d_ static uint32_t vkd3d_dxbc_compiler_alloc_spec_constant_id(struct vkd3d_dxbc_compiler *compiler) { - if (!compiler->current_spec_constant_id && compiler->compile_args) + if (!compiler->current_spec_constant_id) { const struct vkd3d_shader_compile_arguments *compile_args = compiler->compile_args; - unsigned int i, id; + unsigned int i, id = 0; - for (i = 0, id = 0; i < compile_args->parameter_count; ++i) + for (i = 0; compiler->compile_args && i < compile_args->parameter_count; ++i) { const struct vkd3d_shader_parameter *current = &compile_args->parameters[i]; if (current->type == VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT) - id = max(current->u.specialization_constant.id, id); + id = max(current->u.specialization_constant.id + 1, id); } - compiler->current_spec_constant_id = id + 1; + compiler->current_spec_constant_id = id; } return compiler->current_spec_constant_id++; @@ -2623,9 +2623,6 @@ static uint32_t vkd3d_dxbc_compiler_get_spec_constant(struct vkd3d_dxbc_compiler return compiler->spec_constants[i].id; } - if (!spec_id) - spec_id = vkd3d_dxbc_compiler_alloc_spec_constant_id(compiler); - return vkd3d_dxbc_compiler_emit_spec_constant(compiler, name, spec_id); } @@ -2633,7 +2630,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_uint_shader_parameter(struct vkd3d_dxbc enum vkd3d_shader_parameter_name name) { const struct vkd3d_shader_parameter *parameter; - uint32_t spec_constant_id = 0; if (!(parameter = vkd3d_dxbc_compiler_get_shader_parameter(compiler, name))) { @@ -2643,14 +2639,14 @@ static uint32_t vkd3d_dxbc_compiler_emit_uint_shader_parameter(struct vkd3d_dxbc if (parameter->type == VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT) return vkd3d_dxbc_compiler_get_constant_uint(compiler, parameter->u.immediate_constant.u.u32); - if (parameter->type == VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT) - spec_constant_id = parameter->u.specialization_constant.id; - else - FIXME("Unhandled parameter type %#x.\n", parameter->type); + return vkd3d_dxbc_compiler_get_spec_constant(compiler, name, parameter->u.specialization_constant.id); + + FIXME("Unhandled parameter type %#x.\n", parameter->type); default_parameter: - return vkd3d_dxbc_compiler_get_spec_constant(compiler, name, spec_constant_id); + return vkd3d_dxbc_compiler_get_spec_constant(compiler, + name, vkd3d_dxbc_compiler_alloc_spec_constant_id(compiler)); } static uint32_t vkd3d_dxbc_compiler_emit_construct_vector(struct vkd3d_dxbc_compiler *compiler,

1 0

Józef Kucia : vkd3d: Simplify d3d12_pipeline_state_is_render_pass_compatible().
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: vkd3d Branch: master Commit: 242e52ac59fab191a6851e715c88a5f7d8cf8bd4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=242e52ac59fab191a6851e7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 29 11:38:14 2019 +0200 vkd3d: Simplify d3d12_pipeline_state_is_render_pass_compatible(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 91 +++++++--------------------------------------- libs/vkd3d/vkd3d_private.h | 4 +- 2 files changed, 14 insertions(+), 81 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index b23101e..6a7b6e5 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2027,7 +2027,6 @@ bool d3d12_pipeline_state_is_render_pass_compatible(const struct d3d12_pipeline_ { const struct d3d12_graphics_pipeline_state *a = &state_a->u.graphics; const struct d3d12_graphics_pipeline_state *b = &state_b->u.graphics; - unsigned int i; if (!state_a != !state_b) return false; @@ -2038,18 +2037,7 @@ bool d3d12_pipeline_state_is_render_pass_compatible(const struct d3d12_pipeline_ || state_b->vk_bind_point != VK_PIPELINE_BIND_POINT_GRAPHICS) return false; - if (a->rt_idx != b->rt_idx) - return false; - if (a->attachment_count != b->attachment_count) - return false; - - for (i = 0; i < a->attachment_count; ++i) - { - if (a->attachments[i].format != b->attachments[i].format) - return false; - } - - return true; + return a->render_pass == b->render_pass; } STATIC_ASSERT(sizeof(struct vkd3d_shader_transform_feedback_element) == sizeof(D3D12_SO_DECLARATION_ENTRY)); @@ -2140,11 +2128,11 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s WARN("Ignoring sample quality %u.\n", desc->SampleDesc.Quality); rt_count = desc->NumRenderTargets; - if (rt_count > ARRAY_SIZE(graphics->attachments) - 1) + if (rt_count > ARRAY_SIZE(graphics->blend_attachments)) { FIXME("NumRenderTargets %zu > %zu, ignoring extra formats.\n", - rt_count, ARRAY_SIZE(graphics->attachments) - 1); - rt_count = ARRAY_SIZE(graphics->attachments) - 1; + rt_count, ARRAY_SIZE(graphics->blend_attachments)); + rt_count = ARRAY_SIZE(graphics->blend_attachments); } if (desc->DSVFormat == DXGI_FORMAT_UNKNOWN @@ -2156,7 +2144,6 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s && (desc->DepthStencilState.DepthEnable || desc->DepthStencilState.StencilEnable)) { const D3D12_DEPTH_STENCIL_DESC *ds_desc = &desc->DepthStencilState; - VkImageLayout depth_layout; if (!(format = vkd3d_get_format(desc->DSVFormat, true))) { @@ -2168,51 +2155,12 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s if (!(format->vk_aspect_mask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT))) FIXME("Format %#x is not depth/stencil format.\n", format->dxgi_format); - if ((ds_desc->DepthEnable && ds_desc->DepthWriteMask) - || (ds_desc->StencilEnable && ds_desc->StencilWriteMask)) - { - depth_layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; - render_pass_key.depth_stencil_write = true; - } - else - { - depth_layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL; - render_pass_key.depth_stencil_write = false; - } - - graphics->attachments[0].flags = 0; - graphics->attachments[0].format = format->vk_format; - graphics->attachments[0].samples = sample_count; render_pass_key.depth_enable = desc->DepthStencilState.DepthEnable; - if (desc->DepthStencilState.DepthEnable) - { - graphics->attachments[0].loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; - graphics->attachments[0].storeOp = VK_ATTACHMENT_STORE_OP_STORE; - } - else - { - graphics->attachments[0].loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; - graphics->attachments[0].storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; - } render_pass_key.stencil_enable = desc->DepthStencilState.StencilEnable; - if (desc->DepthStencilState.StencilEnable) - { - graphics->attachments[0].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_LOAD; - graphics->attachments[0].stencilStoreOp = VK_ATTACHMENT_STORE_OP_STORE; - } - else - { - graphics->attachments[0].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; - graphics->attachments[0].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; - } - graphics->attachments[0].initialLayout = depth_layout; - graphics->attachments[0].finalLayout = depth_layout; - - graphics->attachment_references[0].attachment = 0; - graphics->attachment_references[0].layout = depth_layout; - ++graphics->rt_idx; - + render_pass_key.depth_stencil_write = (ds_desc->DepthEnable && ds_desc->DepthWriteMask) + || (ds_desc->StencilEnable && ds_desc->StencilWriteMask); render_pass_key.vk_formats[0] = format->vk_format; + ++graphics->rt_idx; if (!desc->PS.pShaderBytecode) { @@ -2258,31 +2206,12 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s ps_output_swizzle[i] = vkd3d_get_rt_format_swizzle(format); - graphics->attachments[idx].flags = 0; - graphics->attachments[idx].format = format->vk_format; - graphics->attachments[idx].samples = sample_count; - graphics->attachments[idx].loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; - graphics->attachments[idx].storeOp = VK_ATTACHMENT_STORE_OP_STORE; - graphics->attachments[idx].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; - graphics->attachments[idx].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; - graphics->attachments[idx].initialLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - graphics->attachments[idx].finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - - graphics->attachment_references[idx].attachment = idx; - graphics->attachment_references[idx].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - render_pass_key.vk_formats[idx] = format->vk_format; blend_attachment_from_d3d12(&graphics->blend_attachments[i], rt_desc); } graphics->attachment_count = graphics->rt_idx + rt_count; - render_pass_key.attachment_count = graphics->rt_idx + rt_count; - render_pass_key.padding = 0; - render_pass_key.sample_count = sample_count; - for (i = render_pass_key.attachment_count; i < ARRAY_SIZE(render_pass_key.vk_formats); ++i) - render_pass_key.vk_formats[i] = VK_FORMAT_UNDEFINED; - ps_shader_parameters[0].name = VKD3D_SHADER_PARAMETER_NAME_RASTERIZER_SAMPLE_COUNT; ps_shader_parameters[0].type = VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT; ps_shader_parameters[0].data_type = VKD3D_SHADER_PARAMETER_DATA_TYPE_UINT32; @@ -2540,6 +2469,12 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } + render_pass_key.attachment_count = graphics->attachment_count; + render_pass_key.padding = 0; + render_pass_key.sample_count = sample_count; + for (i = render_pass_key.attachment_count; i < ARRAY_SIZE(render_pass_key.vk_formats); ++i) + render_pass_key.vk_formats[i] = VK_FORMAT_UNDEFINED; + if (FAILED(hr = vkd3d_render_pass_cache_find(&device->render_pass_cache, device, &render_pass_key, &graphics->render_pass))) goto fail; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 950be6e..be82851 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -660,10 +660,8 @@ struct d3d12_graphics_pipeline_state size_t instance_divisor_count; size_t attribute_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; + unsigned int attachment_count, rt_idx; VkRenderPass render_pass; D3D12_INDEX_BUFFER_STRIP_CUT_VALUE index_buffer_strip_cut_value;

1 0