wine-commits April 2019

wine-commits@winehq.org

1 participants
803 discussions

Alexandre Julliard : iexplore: Build with msvcrt.
by Alexandre Julliard 30 Apr '19

30 Apr '19

Module: wine Branch: master Commit: d47770e5031c2baaf111950fc321dd6a57c57263 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d47770e5031c2baaf111950f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:49:15 2019 +0200 iexplore: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/iexplore/Makefile.in | 3 ++- programs/iexplore/main.c | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/iexplore/Makefile.in b/programs/iexplore/Makefile.in index 7e74867..b965b5b 100644 --- a/programs/iexplore/Makefile.in +++ b/programs/iexplore/Makefile.in @@ -1,8 +1,9 @@ MODULE = iexplore.exe -APPMODE = -mwindows -municode -Wl,--large-address-aware IMPORTS = ieframe DELAYIMPORTS = advpack version user32 +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin -Wl,--large-address-aware + C_SRCS = \ main.c diff --git a/programs/iexplore/main.c b/programs/iexplore/main.c index b881443..01ad9d0 100644 --- a/programs/iexplore/main.c +++ b/programs/iexplore/main.c @@ -23,7 +23,6 @@ #include <ole2.h> #include <rpcproxy.h> -#include "wine/unicode.h" #include "wine/debug.h" extern DWORD WINAPI IEWinMain(const WCHAR*, int); @@ -57,7 +56,7 @@ static BOOL check_native_ie(void) if (VerQueryValueW(buf, translationW, (void **)&translation, &bytes)) { wsprintfW(file_desc_strW, file_desc_fmtW, translation[0], translation[1]); - ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !strstrW(file_desc, wineW); + ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !wcsstr(file_desc, wineW); } HeapFree(GetProcessHeap(), 0, buf); @@ -83,9 +82,9 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE prev, WCHAR *cmdline, int sho static const WCHAR unregserverW[] = {'u','n','r','e','g','s','e','r','v','e','r',0}; if(*cmdline == '-' || *cmdline == '/') { - if(!strcmpiW(cmdline+1, regserverW)) + if(!wcsicmp(cmdline+1, regserverW)) return register_iexplore(TRUE); - if(!strcmpiW(cmdline+1, unregserverW)) + if(!wcsicmp(cmdline+1, unregserverW)) return register_iexplore(FALSE); }

1 0

Alexandre Julliard : icinfo: Build with msvcrt.
by Alexandre Julliard 30 Apr '19

30 Apr '19

Module: wine Branch: master Commit: 30ab4fe8ca331b8521daef2707428978508b07cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=30ab4fe8ca331b8521daef27… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:48:09 2019 +0200 icinfo: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/icinfo/Makefile.in | 3 ++- programs/icinfo/icinfo.c | 17 ++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/icinfo/Makefile.in b/programs/icinfo/Makefile.in index fb642f0..a5de949 100644 --- a/programs/icinfo/Makefile.in +++ b/programs/icinfo/Makefile.in @@ -1,5 +1,6 @@ MODULE = icinfo.exe -APPMODE = -mconsole -municode IMPORTS = msvfw32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = icinfo.c diff --git a/programs/icinfo/icinfo.c b/programs/icinfo/icinfo.c index 1059183..489e646 100644 --- a/programs/icinfo/icinfo.c +++ b/programs/icinfo/icinfo.c @@ -18,28 +18,27 @@ #include <stdio.h> #include <string.h> -#include <wine/unicode.h> #include "windows.h" #include "mmsystem.h" #include "vfw.h" -static int mywprintf(const WCHAR *format, ...) +static int WINAPIV mywprintf(const WCHAR *format, ...) { static char output_bufA[65536]; static WCHAR output_bufW[sizeof(output_bufA)]; - va_list parms; + __ms_va_list parms; DWORD nOut; BOOL res = FALSE; HANDLE hout = GetStdHandle(STD_OUTPUT_HANDLE); - va_start(parms, format); - vsnprintfW(output_bufW, ARRAY_SIZE(output_bufW), format, parms); - va_end(parms); + __ms_va_start(parms, format); + vswprintf(output_bufW, ARRAY_SIZE(output_bufW), format, parms); + __ms_va_end(parms); /* Try to write as unicode whenever we think it's a console */ if (((DWORD_PTR)hout & 3) == 3) { - res = WriteConsoleW(hout, output_bufW, strlenW(output_bufW), &nOut, NULL); + res = WriteConsoleW(hout, output_bufW, lstrlenW(output_bufW), &nOut, NULL); } else { @@ -82,9 +81,9 @@ int wmain(int argc, WCHAR* argv[]) static const WCHAR unk_opt_fmt[] = {'U','n','k','n','o','w','n',' ','o','p','t','i','o','n',':',' ','%','s','\n',0}; for (i = 1; i < argc; i++) { - if (!strcmpW(argv[i], about)) + if (!lstrcmpW(argv[i], about)) doabout = 1; - else if (!strcmpW(argv[i], configure)) + else if (!lstrcmpW(argv[i], configure)) doconfigure = 1; else { mywprintf(unk_opt_fmt, argv[i]);

1 0

Alexandre Julliard : hostname: Build with msvcrt.
by Alexandre Julliard 30 Apr '19

30 Apr '19

Module: wine Branch: master Commit: fdc124c1c6c92e7b85e53557cd00869bee96c8e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdc124c1c6c92e7b85e53557… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:47:53 2019 +0200 hostname: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/hostname/Makefile.in | 3 ++- programs/hostname/hostname.c | 25 ++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/programs/hostname/Makefile.in b/programs/hostname/Makefile.in index e1a2487..0e8341a 100644 --- a/programs/hostname/Makefile.in +++ b/programs/hostname/Makefile.in @@ -1,7 +1,8 @@ MODULE = hostname.exe -APPMODE = -mconsole -municode DELAYIMPORTS = user32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = hostname.c RC_SRCS = hostname.rc diff --git a/programs/hostname/hostname.c b/programs/hostname/hostname.c index e3abc16..627d182 100644 --- a/programs/hostname/hostname.c +++ b/programs/hostname/hostname.c @@ -20,23 +20,22 @@ */ #include <stdarg.h> +#include <stdio.h> #include <windef.h> #include <winbase.h> #include <wincon.h> #include <winnls.h> #include <winuser.h> -#include <wine/unicode.h> - #include "hostname.h" -static int hostname_vprintfW(const WCHAR *msg, va_list va_args) +static int hostname_vprintfW(const WCHAR *msg, __ms_va_list va_args) { int wlen; DWORD count, ret; WCHAR msg_buffer[8192]; - wlen = vsprintfW(msg_buffer, msg, va_args); + wlen = vswprintf(msg_buffer, ARRAY_SIZE(msg_buffer), msg, va_args); ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL); if (!ret) @@ -63,29 +62,29 @@ static int hostname_vprintfW(const WCHAR *msg, va_list va_args) return count; } -static int hostname_printfW(const WCHAR *msg, ...) +static int WINAPIV hostname_printfW(const WCHAR *msg, ...) { - va_list va_args; + __ms_va_list va_args; int len; - va_start(va_args, msg); + __ms_va_start(va_args, msg); len = hostname_vprintfW(msg, va_args); - va_end(va_args); + __ms_va_end(va_args); return len; } -static int hostname_message_printfW(int msg, ...) +static int WINAPIV hostname_message_printfW(int msg, ...) { - va_list va_args; + __ms_va_list va_args; WCHAR msg_buffer[8192]; int len; LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); - va_start(va_args, msg); + __ms_va_start(va_args, msg); len = hostname_vprintfW(msg_buffer, va_args); - va_end(va_args); + __ms_va_end(va_args); return len; } @@ -127,7 +126,7 @@ int wmain(int argc, WCHAR *argv[]) unsigned int i; - if (!strncmpW(argv[1], slashHelpW, ARRAY_SIZE(slashHelpW) - 1)) + if (!wcsncmp(argv[1], slashHelpW, ARRAY_SIZE(slashHelpW) - 1)) { hostname_message(STRING_USAGE); return 1;

1 0

Alexandre Julliard : hh: Build with msvcrt.
by Alexandre Julliard 30 Apr '19

30 Apr '19

Module: wine Branch: master Commit: cc47be73c9cd7f8625e67036cfa5faacf71867d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc47be73c9cd7f8625e67036… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:47:21 2019 +0200 hh: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/hh/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/hh/Makefile.in b/programs/hh/Makefile.in index 4ab60b2..7d90409 100644 --- a/programs/hh/Makefile.in +++ b/programs/hh/Makefile.in @@ -1,5 +1,6 @@ MODULE = hh.exe -APPMODE = -mwindows + +EXTRADLLFLAGS = -mwindows -mno-cygwin C_SRCS = \ main.c

1 0

Józef Kucia : vkd3d: Pass d3d12_resource to vk_barrier_parameters_from_d3d12_resource_state().
by Alexandre Julliard 30 Apr '19

30 Apr '19

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: Translate lod shader instructions.
by Alexandre Julliard 30 Apr '19

30 Apr '19

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-shader: Simplify resource declaration handling in SPIR-V generator.
by Alexandre Julliard 30 Apr '19

30 Apr '19

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: Add support for parsing Shader Model 5.1 bytecode.
by Alexandre Julliard 30 Apr '19

30 Apr '19

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: Simplify d3d12_pipeline_state_is_render_pass_compatible().
by Alexandre Julliard 30 Apr '19

30 Apr '19

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

Józef Kucia : vkd3d: Share Vulkan render pass objects between D3D12 pipeline states.
by Alexandre Julliard 30 Apr '19

30 Apr '19

Module: vkd3d Branch: master Commit: 5da59641b038dbe1cf5f2ea4fdb15d051e6f70d7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5da59641b038dbe1cf5f2ea… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 29 11:38:13 2019 +0200 vkd3d: Share Vulkan render pass objects between D3D12 pipeline states. For example, World of Warcraft creates 28 render passes for pipeline state objects instead of 600+ render passes. Other games appears to use similarly low number of render passes, e.g. 8, 17, 26, 60. 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/device.c | 6 +- libs/vkd3d/state.c | 260 ++++++++++++++++++++++++++++++++++++++------- libs/vkd3d/vkd3d_private.h | 30 +++++- 3 files changed, 254 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=5da59641b038dbe1cf5…

1 0

← Newer
1
2
3
4
5
6
7
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2019