May 2018 - Wine-commits - list.winehq.org

Alex Henrie : include: Add wmemmove to wchar.h.
by Alexandre Julliard 29 May '18

29 May '18

Module: wine Branch: master Commit: b583a636c15b7d377967ed05acf8c7473e916062 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b583a636c15b7d377967ed05… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 28 15:49:56 2018 -0600 include: Add wmemmove to wchar.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/wchar.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 4a6b788..2114c43 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -501,6 +501,11 @@ static inline wchar_t* __cdecl wmemcpy(wchar_t *dst, const wchar_t *src, size_t return memcpy(dst, src, n * sizeof(wchar_t)); } +static inline wchar_t* __cdecl wmemmove(wchar_t *dst, const wchar_t *src, size_t n) +{ + return memmove(dst, src, n * sizeof(wchar_t)); +} + #ifdef __cplusplus } #endif

1 0

Alex Henrie : include: Add wmemset to wchar.h.
by Alexandre Julliard 29 May '18

29 May '18

Module: wine Branch: master Commit: ae023be3eeb98fbeee4130972fdfbd1866b8e495 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae023be3eeb98fbeee413097… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 28 15:49:57 2018 -0600 include: Add wmemset to wchar.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/wchar.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 2114c43..ce5423e 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -506,6 +506,14 @@ static inline wchar_t* __cdecl wmemmove(wchar_t *dst, const wchar_t *src, size_t return memmove(dst, src, n * sizeof(wchar_t)); } +static inline wchar_t* __cdecl wmemset(wchar_t *s, wchar_t c, size_t n) +{ + size_t i; + for (i = 0; i < n; i++) + s[i] = c; + return s; +} + #ifdef __cplusplus } #endif

1 0

Michael Stefaniuc : advapi32/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 29 May '18

29 May '18

Module: wine Branch: master Commit: 0f2f4e7ff827b358238eea7c2dca4b8a1872e7b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f2f4e7ff827b358238eea7c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue May 29 01:05:20 2018 +0200 advapi32/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/lsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 861fea0..451bee9 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -120,7 +120,7 @@ static void test_lsa(void) UINT len; guidstrW[0] = '\0'; ConvertSidToStringSidA(dns_domain_info->Sid, &strsid); - StringFromGUID2(&dns_domain_info->DomainGuid, guidstrW, sizeof(guidstrW)/sizeof(WCHAR)); + StringFromGUID2(&dns_domain_info->DomainGuid, guidstrW, ARRAY_SIZE(guidstrW)); len = WideCharToMultiByte( CP_ACP, 0, guidstrW, -1, NULL, 0, NULL, NULL ); guidstr = LocalAlloc( 0, len ); WideCharToMultiByte( CP_ACP, 0, guidstrW, -1, guidstr, len, NULL, NULL );

1 0

Józef Kucia : libs/vkd3d-shader: Import shader tracing from wined3d.
by Alexandre Julliard 29 May '18

29 May '18

Module: vkd3d Branch: master Commit: a5808cfdd79616a96bf932a872a12644836c468d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a5808cfdd79616a96bf932a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 29 12:50:32 2018 +0200 libs/vkd3d-shader: Import shader tracing from wined3d. 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> --- Makefile.am | 1 + libs/vkd3d-shader/dxbc.c | 8 +- libs/vkd3d-shader/spirv.c | 6 +- libs/vkd3d-shader/trace.c | 1606 ++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_main.c | 3 + libs/vkd3d-shader/vkd3d_shader_private.h | 10 +- 6 files changed, 1627 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=a5808cfdd79616a96bf…

1 0

Józef Kucia : libs/vkd3d: Use VK_COMPONENT_SWIZZLE_IDENTITY in vkd3d_set_view_swizzle_for_format().
by Alexandre Julliard 29 May '18

29 May '18

Module: vkd3d Branch: master Commit: 265ce370141f8e001c3dee251f74220771b3420a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=265ce370141f8e001c3dee2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 29 12:50:33 2018 +0200 libs/vkd3d: Use VK_COMPONENT_SWIZZLE_IDENTITY in vkd3d_set_view_swizzle_for_format(). 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/resource.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index e37b03b..acd3bad 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -999,6 +999,11 @@ static bool vkd3d_create_buffer_view(struct d3d12_device *device, static void vkd3d_set_view_swizzle_for_format(VkComponentMapping *components, const struct vkd3d_format *format, bool allowed_swizzle) { + components->r = VK_COMPONENT_SWIZZLE_IDENTITY; + components->g = VK_COMPONENT_SWIZZLE_IDENTITY; + components->b = VK_COMPONENT_SWIZZLE_IDENTITY; + components->a = VK_COMPONENT_SWIZZLE_IDENTITY; + if (format->vk_aspect_mask == VK_IMAGE_ASPECT_STENCIL_BIT) { if (allowed_swizzle) @@ -1007,7 +1012,6 @@ static void vkd3d_set_view_swizzle_for_format(VkComponentMapping *components, components->g = VK_COMPONENT_SWIZZLE_R; components->b = VK_COMPONENT_SWIZZLE_ZERO; components->a = VK_COMPONENT_SWIZZLE_ZERO; - return; } else { @@ -1024,18 +1028,12 @@ static void vkd3d_set_view_swizzle_for_format(VkComponentMapping *components, components->g = VK_COMPONENT_SWIZZLE_ZERO; components->b = VK_COMPONENT_SWIZZLE_ZERO; components->a = VK_COMPONENT_SWIZZLE_R; - return; } else { FIXME("Alpha swizzle is not supported.\n"); } } - - components->r = VK_COMPONENT_SWIZZLE_R; - components->g = VK_COMPONENT_SWIZZLE_G; - components->b = VK_COMPONENT_SWIZZLE_B; - components->a = VK_COMPONENT_SWIZZLE_A; } static VkResult vkd3d_create_texture_view(struct d3d12_device *device,

1 0

Józef Kucia : build: Do not drop AM_CFLAGS when adding per-target CFLAGS.
by Alexandre Julliard 29 May '18

29 May '18

Module: vkd3d Branch: master Commit: 9974237f35919989ad20c3d3307ddc3701943249 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9974237f35919989ad20c3d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 29 12:50:28 2018 +0200 build: Do not drop AM_CFLAGS when adding per-target CFLAGS. 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> --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 494e378..52b3585 100644 --- a/Makefile.am +++ b/Makefile.am @@ -71,7 +71,7 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/vkd3d_shader.map \ libs/vkd3d-shader/vkd3d_shader_main.c \ libs/vkd3d-shader/vkd3d_shader_private.h -libvkd3d_shader_la_CFLAGS = @SPIRV_TOOLS_CFLAGS@ +libvkd3d_shader_la_CFLAGS = $(AM_CFLAGS) @SPIRV_TOOLS_CFLAGS@ libvkd3d_shader_la_LIBADD = @SPIRV_TOOLS_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_shader_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map @@ -130,7 +130,7 @@ tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@ -DEMOS_CFLAGS = @XCB_CFLAGS@ +DEMOS_CFLAGS = $(AM_CFLAGS) @XCB_CFLAGS@ noinst_PROGRAMS += $(vkd3d_demos) EXTRA_DIST += $(vkd3d_test_headers) $(vkd3d_demos_headers)

1 0

Józef Kucia : libs/vkd3d-shader: Implement SV_RenderTargetArrayIndex.
by Alexandre Julliard 29 May '18

29 May '18

Module: vkd3d Branch: master Commit: b59ad01dd233223203465708507bc7d9fb90c12f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b59ad01dd23322320346570… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 29 12:50:29 2018 +0200 libs/vkd3d-shader: Implement SV_RenderTargetArrayIndex. 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 | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f4c9421..a59fdb6 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2779,33 +2779,9 @@ static uint32_t vkd3d_spirv_front_facing_fixup(struct vkd3d_dxbc_compiler *compi return vkd3d_dxbc_compiler_emit_bool_to_int(compiler, 1, front_facing_id); } -/* The Vulkan spec says: - * - * "The variable decorated with GlobalInvocationId must be declared as a - * three-component vector of 32-bit integers." - * - * "The variable decorated with LocalInvocationId must be declared as a - * three-component vector of 32-bit integers." - * - * "The variable decorated with WorkgroupId must be declared as a - * three-component vector of 32-bit integers." - * - * "The variable decorated with FragCoord must be declared as a - * four-component vector of 32-bit floating-point values." - * - * "The variable decorated with FragDepth must be declared as a scalar 32-bit - * floating-point value." - * - * "Any variable decorated with Position must be declared as a four-component - * vector of 32-bit floating-point values." - * - * "The variable decorated with VertexIndex must be declared as a scalar - * 32-bit integer." - * - * "The variable decorated with InstanceIndex must be declared as a scalar - * 32-bit integer." - * - * "The variable decorated with FrontFacing must be declared as a boolean." +/* + * The following table is based on the "14.6. Built-In Variables" section from + * the Vulkan spec. */ static const struct vkd3d_spirv_builtin { @@ -2835,6 +2811,8 @@ vkd3d_spirv_builtin_table[] = {VKD3D_SIV_VERTEX_ID, ~0u, VKD3D_TYPE_INT, 1, SpvBuiltInVertexIndex}, {VKD3D_SIV_INSTANCE_ID, ~0u, VKD3D_TYPE_INT, 1, SpvBuiltInInstanceIndex, vkd3d_spirv_instance_id_fixup}, + {VKD3D_SIV_RENDER_TARGET_ARRAY_INDEX, ~0u, VKD3D_TYPE_INT, 1, SpvBuiltInLayer}, + {VKD3D_SIV_IS_FRONT_FACE, ~0u, VKD3D_TYPE_BOOL, 1, SpvBuiltInFrontFacing, vkd3d_spirv_front_facing_fixup}, };

1 0

Józef Kucia : libs/vkd3d-shader: Parse precise flags.
by Alexandre Julliard 29 May '18

29 May '18

Module: vkd3d Branch: master Commit: 3ddb29c16a0e011963d71de054c686f193e9ced2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3ddb29c16a0e011963d71de… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 29 12:50:30 2018 +0200 libs/vkd3d-shader: Parse precise flags. 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 | 7 ++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 8 ++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 87b2d71..c8e5b08 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -56,6 +56,9 @@ #define VKD3D_SM4_GLOBAL_FLAGS_SHIFT 11 #define VKD3D_SM4_GLOBAL_FLAGS_MASK (0xffu << VKD3D_SM4_GLOBAL_FLAGS_SHIFT) +#define VKD3D_SM5_PRECISE_SHIFT 19 +#define VKD3D_SM5_PRECISE_MASK (0xfu << VKD3D_SM5_PRECISE_SHIFT) + #define VKD3D_SM5_CONTROL_POINT_COUNT_SHIFT 11 #define VKD3D_SM5_CONTROL_POINT_COUNT_MASK (0xffu << VKD3D_SM5_CONTROL_POINT_COUNT_SHIFT) @@ -1641,6 +1644,7 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha unsigned int i, len; SIZE_T remaining; const DWORD *p; + DWORD precise; list_move_head(&priv->src_free, &priv->src); @@ -1703,12 +1707,13 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha shader_sm4_read_instruction_modifier(previous_token = *p++, ins); ins->flags = (opcode_token & VKD3D_SM4_INSTRUCTION_FLAGS_MASK) >> VKD3D_SM4_INSTRUCTION_FLAGS_SHIFT; - if (ins->flags & VKD3D_SM4_INSTRUCTION_FLAG_SATURATE) { ins->flags &= ~VKD3D_SM4_INSTRUCTION_FLAG_SATURATE; instruction_dst_modifier = VKD3DSPDM_SATURATE; } + precise = (opcode_token & VKD3D_SM5_PRECISE_MASK) >> VKD3D_SM5_PRECISE_SHIFT; + ins->flags |= precise << VKD3DSI_PRECISE_SHIFT; for (i = 0; i < ins->dst_count; ++i) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 4aeeb50..1721977 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -480,6 +480,14 @@ enum vkd3d_tessellator_partitioning #define VKD3DSI_SAMPLE_INFO_UINT 0x1 #define VKD3DSI_SAMPLER_COMPARISON_MODE 0x1 +#define VKD3DSI_PRECISE_X 0x100 +#define VKD3DSI_PRECISE_Y 0x200 +#define VKD3DSI_PRECISE_Z 0x400 +#define VKD3DSI_PRECISE_W 0x800 +#define VKD3DSI_PRECISE_XYZW (VKD3DSI_PRECISE_X | VKD3DSI_PRECISE_Y \ + | VKD3DSI_PRECISE_Z | VKD3DSI_PRECISE_W) +#define VKD3DSI_PRECISE_SHIFT 8 + enum vkd3d_shader_rel_op { VKD3D_SHADER_REL_OP_GT = 1,

1 0

Józef Kucia : libs/vkd3d-shader: Recognize more shader registers.
by Alexandre Julliard 29 May '18

29 May '18

Module: vkd3d Branch: master Commit: 2fa29dd8238992050f3ee0f22763cd8ad97d880a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2fa29dd8238992050f3ee0f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 29 12:50:31 2018 +0200 libs/vkd3d-shader: Recognize more shader registers. 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 | 9 ++++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 5 +++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index c8e5b08..b8e22ac 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -295,6 +295,7 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_IMM_ATOMIC_UMAX = 0xbc, VKD3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, VKD3D_SM5_OP_SYNC = 0xbe, + VKD3D_SM5_OP_EVAL_SAMPLE_INDEX = 0xcc, VKD3D_SM5_OP_DCL_GS_INSTANCES = 0xce, }; @@ -312,6 +313,7 @@ enum vkd3d_sm4_register_type VKD3D_SM4_RT_PRIMID = 0x0b, VKD3D_SM4_RT_DEPTHOUT = 0x0c, VKD3D_SM4_RT_NULL = 0x0d, + VKD3D_SM4_RT_RASTERIZER = 0x0e, VKD3D_SM4_RT_OMASK = 0x0f, VKD3D_SM5_RT_STREAM = 0x10, VKD3D_SM5_RT_FUNCTION_BODY = 0x11, @@ -331,6 +333,8 @@ enum vkd3d_sm4_register_type VKD3D_SM5_RT_COVERAGE = 0x23, VKD3D_SM5_RT_LOCAL_THREAD_INDEX = 0x24, VKD3D_SM5_RT_GS_INSTANCE_ID = 0x25, + VKD3D_SM5_RT_DEPTHOUT_GREATER_EQUAL = 0x26, + VKD3D_SM5_RT_DEPTHOUT_LESS_EQUAL = 0x27, }; enum vkd3d_sm4_output_primitive_type @@ -1103,6 +1107,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM5_OP_IMM_ATOMIC_UMIN, VKD3DSIH_IMM_ATOMIC_UMIN, "uU", "iu"}, {VKD3D_SM5_OP_SYNC, VKD3DSIH_SYNC, "", "", shader_sm5_read_sync}, + {VKD3D_SM5_OP_EVAL_SAMPLE_INDEX, VKD3DSIH_EVAL_SAMPLE_INDEX, "f", "fi"}, {VKD3D_SM5_OP_DCL_GS_INSTANCES, VKD3DSIH_DCL_GS_INSTANCES, "", "", shader_sm4_read_declaration_count}, }; @@ -1123,7 +1128,7 @@ static const enum vkd3d_shader_register_type register_type_table[] = /* VKD3D_SM4_RT_PRIMID */ VKD3DSPR_PRIMID, /* VKD3D_SM4_RT_DEPTHOUT */ VKD3DSPR_DEPTHOUT, /* VKD3D_SM4_RT_NULL */ VKD3DSPR_NULL, - /* UNKNOWN */ ~0u, + /* VKD3D_SM4_RT_RASTERIZER */ VKD3DSPR_RASTERIZER, /* VKD3D_SM4_RT_OMASK */ VKD3DSPR_SAMPLEMASK, /* VKD3D_SM5_RT_STREAM */ VKD3DSPR_STREAM, /* VKD3D_SM5_RT_FUNCTION_BODY */ VKD3DSPR_FUNCTIONBODY, @@ -1147,6 +1152,8 @@ static const enum vkd3d_shader_register_type register_type_table[] = /* VKD3D_SM5_RT_COVERAGE */ VKD3DSPR_COVERAGE, /* VKD3D_SM5_RT_LOCAL_THREAD_INDEX */ VKD3DSPR_LOCALTHREADINDEX, /* VKD3D_SM5_RT_GS_INSTANCE_ID */ VKD3DSPR_GSINSTID, + /* VKD3D_SM5_RT_DEPTHOUT_GREATER_EQUAL */ VKD3DSPR_DEPTHOUTGE, + /* VKD3D_SM5_RT_DEPTHOUT_LESS_EQUAL */ VKD3DSPR_DEPTHOUTLE, }; static const struct vkd3d_sm4_opcode_info *get_opcode_info(enum vkd3d_sm4_opcode opcode) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 1721977..ba8c6c9 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -156,6 +156,7 @@ enum VKD3D_SHADER_INSTRUCTION_HANDLER VKD3DSIH_ENDREP, VKD3DSIH_ENDSWITCH, VKD3DSIH_EQ, + VKD3DSIH_EVAL_SAMPLE_INDEX, VKD3DSIH_EXP, VKD3DSIH_EXPP, VKD3DSIH_F16TOF32, @@ -352,6 +353,9 @@ enum vkd3d_shader_register_type VKD3DSPR_COVERAGE, VKD3DSPR_SAMPLEMASK, VKD3DSPR_GSINSTID, + VKD3DSPR_DEPTHOUTGE, + VKD3DSPR_DEPTHOUTLE, + VKD3DSPR_RASTERIZER, VKD3DSPR_INVALID = ~0u, }; @@ -436,6 +440,7 @@ enum vkd3d_shader_interpolation_mode enum vkd3d_shader_global_flags { VKD3DSGF_REFACTORING_ALLOWED = 0x1, + VKD3DSGF_FORCE_EARLY_DEPTH_STENCIL = 0x4, VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS = 0x8, };

1 0

Francois Gouget : testbot/build: Simplify Build.pl by reusing the patch analyser.
by Alexandre Julliard 29 May '18

29 May '18

Module: tools Branch: master Commit: 6641ea6dea6368169786b3018525abb9f23775fa URL: https://source.winehq.org/git/tools.git/?a=commit;h=6641ea6dea6368169786b30… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 29 00:42:30 2018 +0200 testbot/build: Simplify Build.pl by reusing the patch analyser. Also better identify patches that require rebuilding the native tools. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 41 +++++------------------------------ testbot/lib/WineTestBot/PatchUtils.pm | 31 +++++++++++++++++++++----- 2 files changed, 30 insertions(+), 42 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index c72489c..5e6b370 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -40,6 +40,7 @@ sub BEGIN } use WineTestBot::Config; +use WineTestBot::PatchUtils; sub InfoMsg(@) { @@ -74,39 +75,6 @@ sub ApplyPatch($) { my ($PatchFile) = @_; - my ($NeedMakeMakefiles, $NeedAutoconf, $HasConfigure, $NeedBuildNative); - if (open (FH, "<$PatchFile")) - { - my $Line; - while (defined($Line = <FH>) && - (!$NeedMakeMakefiles || !$NeedAutoconf || !$HasConfigure || - !$NeedBuildNative)) - { - if ($Line =~ m=^diff.*(?:aclocal\.m4|configure\.ac)=) - { - $NeedAutoconf = 1; - } - elsif ($Line =~ m=^diff.*configure=) - { - $HasConfigure = 1; - } - elsif ($Line =~ m=^new file= || $Line =~ m=^deleted file= || $Line =~ m=^rename= || - $Line =~ m=diff.*tools/make_makefiles=) - { - $NeedMakeMakefiles = 1; - } - elsif ($Line =~ m=^diff.*tools/makedep\.c=) - { - $NeedMakeMakefiles = $NeedBuildNative = 1; - } - elsif ($Line =~ m=^diff.*tools/(?:makedep\.c|make_xftmpl\.c|sfnt2fon|winebuild|winegcc|widl|wmc|wrc)=) - { - $NeedBuildNative = 1; - } - } - close FH; - } - InfoMsg "Applying patch\n"; system("( cd $DataDir/wine && set -x && " . " git apply --verbose $PatchFile && " . @@ -118,7 +86,8 @@ sub ApplyPatch($) return -1; } - if ($NeedMakeMakefiles) + my $Impacts = GetPatchImpact($PatchFile, "nounits"); + if ($Impacts->{Makefiles}) { InfoMsg "Running make_makefiles\n"; system("( cd $DataDir/wine && set -x && " . @@ -131,7 +100,7 @@ sub ApplyPatch($) } } - if ($NeedAutoconf && !$HasConfigure) + if ($Impacts->{Autoconf} && !$Impacts->{HasConfigure}) { InfoMsg "Running autoconf\n"; system("( cd $DataDir/wine && set -x && " . @@ -144,7 +113,7 @@ sub ApplyPatch($) } } - return $NeedBuildNative; + return $Impacts->{Tools}; } my $ncpus; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 74599ba..8dde61b 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -86,8 +86,8 @@ sub _AddTest($$$) }; } - # Assume makefile modifications may break the build but not the tests. - return if ($File eq "Makefile.in"); + # Assume makefile modifications may break the build but not the tests + return if ($File eq "Makefile.in" or $Impacts->{NoUnits}); if (!$Tests->{$Module}->{Files}) { @@ -118,18 +118,37 @@ configure, whether it impacts the tests, etc. =back =cut -sub GetPatchImpact($) +sub GetPatchImpact($;$) { - my ($PatchFileName) = @_; + my ($PatchFileName, $NoUnits) = @_; my $fh; return undef if (!open($fh, "<", $PatchFileName)); - my $Impacts = { Tests => {} }; + my $Impacts = { + NoUnits => $NoUnits, + Tests => {}, + }; my ($Path, $Change); while (my $Line = <$fh>) { - if ($Line =~ m=^--- /dev/null$=) + if ($Line =~ m=^--- \w+/(?:aclocal\.m4|configure\.ac)$=) + { + $Impacts->{Autoconf} = 1; + } + elsif ($Line =~ m=^--- \w+/configure$=) + { + $Impacts->{HasConfigure} = 1; + } + elsif ($Line =~ m=^--- \w+/tools/make_makefiles$=) + { + $Impacts->{Makefiles} = $Impacts->{Tools} = 1; + } + elsif ($Line =~ m=^--- \w+/tools/(?:makedep\.c|make_xftmpl\.c|sfnt2fon|winebuild|winegcc|widl|wmc|wrc)$=) + { + $Impacts->{Tools} = 1; + } + elsif ($Line =~ m=^--- /dev/null$=) { $Change = "new"; }

1 0