April 2022 - Wine-commits - list.winehq.org

Francois Gouget : testbot/web: Fix and share the main page's job completion date formatting.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: tools Branch: master Commit: 5e6939a84bbe45f9f97cc5f07a509e535d04e558 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5e6939a84bbe45f9f97cc5f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 25 20:50:49 2022 +0200 testbot/web: Fix and share the main page's job completion date formatting. The main page still depended on the pre-datetime.js ShowDateTime() JavaScript function, which the new one is not compatible with. Add GenerateTipDateTime() so a timestamp can easily be added as a tooltip to an arbitrary HTML chunk. Tweak the column title to better reflect its content (contrast duration with elapsed time). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/ValueFormatter.pm | 47 ++++++++++++++++++++++++++- testbot/web/WineTestBot.css | 1 + testbot/web/index.pl | 12 ++----- testbot/web/js/datetime.js | 19 ++++++++--- 4 files changed, 65 insertions(+), 14 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm index 638504d..d987cee 100644 --- a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm +++ b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm @@ -22,7 +22,7 @@ use strict; package ObjectModel::CGI::ValueFormatter; use Exporter 'import'; -our @EXPORT = qw(GetDateTimeJSFile GenerateDateTime +our @EXPORT = qw(GetDateTimeJSFile GenerateDateTime GenerateTipDateTime GenerateTimeTipDate GenerateValueHTML); use POSIX qw(strftime); @@ -106,6 +106,51 @@ sub GenerateDateTime($;$$) =pod =over 12 +=item C<GenerateTipDateTime()> + +Adds a tooltip containing the timestamp to the specified HTML chunk. + +The timestamp is converted to the ISO 8601 format in the user's timezone if +JavaScript is available and in the server's timezone otherwise. + +The default for TagAttrs is 'a' and it should always be a tag that shows the +content of the title attribute as a tooltip. + +See GenerateDateTime() for more details. + +=back +=cut + +sub GenerateTipDateTime($$;$$) +{ + my ($Sec1970, $Html, $Class, $TagAttrs) = @_; + + if (defined $Sec1970) + { + my $Tag; + if ($TagAttrs) + { + $Tag = $TagAttrs; + $Tag =~ s/ .*$//; + } + else + { + $TagAttrs = $Tag = "a"; + } + $Class = "$Class " if ($Class); + print "<$TagAttrs class='${Class}tipdatetime' timestamp='$Sec1970' ", + strftime("title='%Y-%m-%d %H:%M:%S'>", localtime($Sec1970)), + "$Html</$Tag>"; + } + else + { + print $Html; + } +} + +=pod +=over 12 + =item C<GenerateTimeTipDate()> Show the timestamp's time with the date as a tooltip. diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 0955f58..350ab64 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -408,6 +408,7 @@ pre .log-fullnew { color: red; font-weight: bold; } a.title { color:inherit; text-decoration: none; } +a.tipdatetime { color:inherit; text-decoration: none; } a.timetipdate { color:inherit; text-decoration: none; } th.Record { text-align: center; } diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 4048cac..b07b39d 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -25,7 +25,7 @@ package JobStatusBlock; use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); -use POSIX qw(strftime); +use ObjectModel::CGI::ValueFormatter; use WineTestBot::Branches; use WineTestBot::Users; @@ -65,7 +65,7 @@ sub GenerateHeaderView($$$) } elsif ($PropertyName eq "Ended") { - print "<a class='title' title='Ended'>Time</a>"; + print "<a class='title' title='Completion timestamp'>Elapsed</a>"; } else { @@ -156,13 +156,7 @@ sub GenerateDataView($$$) if (defined $Job->Ended) { my $Duration = $Job->Ended - $Job->Submitted; - my $TagId = "E". $Job->Id; - print "<a id='$TagId' class='title' title='", - strftime("%Y-%m-%d %H:%M:%S", localtime($Job->Ended)), - "'>", DurationToString($Duration), "</a>\n"; - print "<script type='text/javascript'></script>"; + GenerateTipDateTime($Job->Ended, DurationToString($Duration)); } else { diff --git a/testbot/web/js/datetime.js b/testbot/web/js/datetime.js index 47b0feb..23b7b27 100644 --- a/testbot/web/js/datetime.js +++ b/testbot/web/js/datetime.js @@ -23,13 +23,21 @@ function Pad2(n) return n < 10 ? '0' + n : n; } -function ShowDateTime(dom) +function ShowDateTime(dom, attr) { const sec1970 = dom.getAttribute("timestamp"); const dt = new Date(sec1970 * 1000); - dom.innerHTML = dt.getFullYear() +'-'+ Pad2(dt.getMonth() + 1) +'-'+ - Pad2(dt.getDate()) +' '+ Pad2(dt.getHours()) +':'+ - Pad2(dt.getMinutes()) +':'+ Pad2(dt.getSeconds()) + const pretty = dt.getFullYear() +'-'+ Pad2(dt.getMonth() + 1) +'-'+ + Pad2(dt.getDate()) +' '+ Pad2(dt.getHours()) +':'+ + Pad2(dt.getMinutes()) +':'+ Pad2(dt.getSeconds()); + if (attr == null) + { + dom.innerHTML = pretty; + } + else + { + dom.setAttribute(attr, pretty); + } } function ShowTimeTipDate(dom) @@ -47,6 +55,9 @@ function init() document.querySelectorAll(".datetime").forEach(dom => { ShowDateTime(dom); }); + document.querySelectorAll(".tipdatetime").forEach(dom => { + ShowDateTime(dom, 'title'); + }); document.querySelectorAll(".timetipdate").forEach(dom => { ShowTimeTipDate(dom); });

1 0

Zebediah Figura : demos: Load libvulkan dynamically.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: vkd3d Branch: master Commit: f9c7b123d87aedbff2815f75eb9c3dd6946eb71d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f9c7b123d87aedbff2815f7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 22 15:17:59 2022 -0500 demos: Load libvulkan dynamically. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 +- demos/demo_xcb.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index e760a66b..3e113dc7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -322,7 +322,7 @@ endif EXTRA_DIST += $(vkd3d_shader_tests) if BUILD_DEMOS -DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @DEMO_LIBS@ @VULKAN_LIBS@ +DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @DL_LIBS@ @DEMO_LIBS@ DEMOS_CFLAGS = $(AM_CFLAGS) @DEMO_CFLAGS@ bin_PROGRAMS += $(vkd3d_demos) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index d8be00f0..bb43d8a4 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -17,18 +17,65 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define VK_NO_PROTOTYPES #define VK_USE_PLATFORM_XCB_KHR #define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_3 +#include "config.h" #include <vkd3d.h> #include <vkd3d_utils.h> #include <xcb/xcb_event.h> #include <xcb/xcb_icccm.h> #include <xcb/xcb_keysyms.h> #include <sys/stat.h> +#include <dlfcn.h> #include <limits.h> #include <unistd.h> #include <fcntl.h> #include <stdbool.h> +#include <stdio.h> + +#define DECLARE_VK_PFN(name) PFN_##name name; +DECLARE_VK_PFN(vkAcquireNextImageKHR) +DECLARE_VK_PFN(vkCreateFence) +DECLARE_VK_PFN(vkCreateSwapchainKHR) +DECLARE_VK_PFN(vkCreateXcbSurfaceKHR) +DECLARE_VK_PFN(vkDestroyFence) +DECLARE_VK_PFN(vkDestroySurfaceKHR) +DECLARE_VK_PFN(vkDestroySwapchainKHR) +DECLARE_VK_PFN(vkGetPhysicalDeviceSurfaceCapabilitiesKHR) +DECLARE_VK_PFN(vkGetPhysicalDeviceSurfaceFormatsKHR) +DECLARE_VK_PFN(vkGetPhysicalDeviceSurfaceSupportKHR) +DECLARE_VK_PFN(vkGetSwapchainImagesKHR) +DECLARE_VK_PFN(vkQueuePresentKHR) +DECLARE_VK_PFN(vkResetFences) +DECLARE_VK_PFN(vkWaitForFences) + +static void load_vulkan_procs(void) +{ + void *libvulkan; + + if (!(libvulkan = dlopen(SONAME_LIBVULKAN, RTLD_NOW))) + { + fprintf(stderr, "Failed to load %s: %s.\n", SONAME_LIBVULKAN, dlerror()); + exit(1); + } + +#define LOAD_VK_PFN(name) name = (void *)dlsym(libvulkan, #name); + LOAD_VK_PFN(vkAcquireNextImageKHR) + LOAD_VK_PFN(vkCreateFence) + LOAD_VK_PFN(vkCreateSwapchainKHR) + LOAD_VK_PFN(vkCreateXcbSurfaceKHR) + LOAD_VK_PFN(vkDestroyFence) + LOAD_VK_PFN(vkDestroySurfaceKHR) + LOAD_VK_PFN(vkDestroySwapchainKHR) + LOAD_VK_PFN(vkGetPhysicalDeviceSurfaceCapabilitiesKHR) + LOAD_VK_PFN(vkGetPhysicalDeviceSurfaceFormatsKHR) + LOAD_VK_PFN(vkGetPhysicalDeviceSurfaceSupportKHR) + LOAD_VK_PFN(vkGetSwapchainImagesKHR) + LOAD_VK_PFN(vkQueuePresentKHR) + LOAD_VK_PFN(vkResetFences) + LOAD_VK_PFN(vkWaitForFences) +} struct demo { @@ -330,6 +377,8 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c VkImage *vk_images; VkFormat format; + load_vulkan_procs(); + if ((format = vkd3d_get_vk_format(desc->format)) == VK_FORMAT_UNDEFINED) return NULL;

1 0

Zebediah Figura : configure: Remove the no longer used check for VULKAN_LIBS.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: vkd3d Branch: master Commit: 99a3adcc19f2a64fad630948851616f52c00d553 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=99a3adcc19f2a64fad63094… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 22 15:18:00 2022 -0500 configure: Remove the no longer used check for VULKAN_LIBS. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 1 - m4/check-vulkan.m4 | 16 ++++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index a58e453f..5250103c 100644 --- a/configure.ac +++ b/configure.ac @@ -112,7 +112,6 @@ case $host_os in ;; esac -AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library]) VKD3D_CHECK_VULKAN AS_IF([test "x$with_ncurses" != "xno"], diff --git a/m4/check-vulkan.m4 b/m4/check-vulkan.m4 index 756f61a0..b2c3f8a1 100644 --- a/m4/check-vulkan.m4 +++ b/m4/check-vulkan.m4 @@ -1,16 +1,12 @@ dnl VKD3D_CHECK_VULKAN AC_DEFUN([VKD3D_CHECK_VULKAN],[ -VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], - [VULKAN_LIBS="$VULKAN_LIBS -lvulkan"], +VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr],, [VKD3D_CHECK_SONAME([vulkan-1], [vkGetInstanceProcAddr], - [VULKAN_LIBS="$VULKAN_LIBS -lvulkan-1" - AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], ["$ac_cv_lib_soname_vulkan_1"])], + [AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], ["$ac_cv_lib_soname_vulkan_1"])], [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr], - [VULKAN_LIBS="$VULKAN_LIBS -lMoltenVK" - AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], + [AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], ["$ac_cv_lib_soname_MoltenVK"])], - [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])], - [$VULKAN_LIBS])], - [$VULKAN_LIBS])], - [$VULKAN_LIBS]) + [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])]) + ]) + ]) ])

1 0

Zebediah Figura : configure: Allow specifying the shared object name of the Vulkan library at configure time.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: vkd3d Branch: master Commit: cab16fe9034ce6492ed7cc0a97a3ee69a4085f2a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cab16fe9034ce6492ed7cc0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 22 15:18:01 2022 -0500 configure: Allow specifying the shared object name of the Vulkan library at configure time. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5250103c..b386104a 100644 --- a/configure.ac +++ b/configure.ac @@ -112,7 +112,10 @@ case $host_os in ;; esac -VKD3D_CHECK_VULKAN +AC_ARG_VAR([SONAME_LIBVULKAN], [shared object name for the Vulkan library]) +AS_IF([test "x$SONAME_LIBVULKAN" = "x"], + [VKD3D_CHECK_VULKAN], + [AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],["$SONAME_LIBVULKAN"],[Define to the shared object name of the Vulkan library.])]) AS_IF([test "x$with_ncurses" != "xno"], [PKG_CHECK_MODULES([NCURSES], [ncurses],

1 0

Conor McCarthy : vkd3d: Prevent a null pointer dereference when a descriptor is not a UAV.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: vkd3d Branch: master Commit: 6b893b597bd4a3c51cbd992a5bef55b3b676e3ed URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6b893b597bd4a3c51cbd992… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Apr 23 16:42:48 2022 +1000 vkd3d: Prevent a null pointer dereference when a descriptor is not a UAV. Fixes crashes in Shadow of the Tomb Raider, GRID 2019 and probably others. Signed-off-by: Conor McCarthy <cmccarthy(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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 0b643727..1522065f 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3653,7 +3653,7 @@ static void d3d12_desc_buffered_copy_atomic(struct d3d12_desc *dst, const struct vkd3d_mutex_unlock(mutex); infos[set].uav_counter |= (location->src.magic == VKD3D_DESCRIPTOR_MAGIC_UAV) - & !!location->src.u.view_info.view->vk_counter_view; + && !!location->src.u.view_info.view->vk_counter_view; location->dst = dst; if (infos[set].count == ARRAY_SIZE(locations[0]))

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Do not generate infinities in SM1.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: vkd3d Branch: master Commit: c680b674d61aac3dbe72a5286793f61bbf873423 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c680b674d61aac3dbe72a52… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Apr 22 12:24:57 2022 +0200 vkd3d-shader/hlsl: Do not generate infinities in SM1. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_constant_ops.c | 9 ++++++++- tests/arithmetic-float.shader_test | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 06b957ba..a1551ba1 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <math.h> + #include "hlsl.h" static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct hlsl_ir_constant *src) @@ -270,12 +272,17 @@ static bool fold_div(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, { case HLSL_TYPE_FLOAT: case HLSL_TYPE_HALF: - if (src2->value[k].f == 0) + if (ctx->profile->major_version >= 4 && src2->value[k].f == 0) { hlsl_warning(ctx, &dst->node.loc, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO, "Floating point division by zero"); } dst->value[k].f = src1->value[k].f / src2->value[k].f; + if (ctx->profile->major_version < 4 && isinf(dst->value[k].f)) + { + hlsl_error(ctx, &dst->node.loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO, + "Infinities are not allowed by the shader model."); + } break; case HLSL_TYPE_DOUBLE: diff --git a/tests/arithmetic-float.shader_test b/tests/arithmetic-float.shader_test index f99b9728..6824c3f1 100644 --- a/tests/arithmetic-float.shader_test +++ b/tests/arithmetic-float.shader_test @@ -25,6 +25,7 @@ todo draw quad probe all rgba (5.0, 5.0, -5.0, 3.0) [require] +% Infinities are not allowed in SM1 shader model >= 4.0 [pixel shader]

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Add trailing dots to warning messages.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: vkd3d Branch: master Commit: 0e8098ccfef0e9bf4e2b12e191f34f1385c72bce URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0e8098ccfef0e9bf4e2b12e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Apr 22 12:24:58 2022 +0200 vkd3d-shader/hlsl: Add trailing dots to warning messages. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_constant_ops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index a1551ba1..2e16577f 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -275,7 +275,7 @@ static bool fold_div(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, if (ctx->profile->major_version >= 4 && src2->value[k].f == 0) { hlsl_warning(ctx, &dst->node.loc, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO, - "Floating point division by zero"); + "Floating point division by zero."); } dst->value[k].f = src1->value[k].f / src2->value[k].f; if (ctx->profile->major_version < 4 && isinf(dst->value[k].f)) @@ -289,7 +289,7 @@ static bool fold_div(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, if (src2->value[k].d == 0) { hlsl_warning(ctx, &dst->node.loc, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO, - "Floating point division by zero"); + "Floating point division by zero."); } dst->value[k].d = src1->value[k].d / src2->value[k].d; break;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Update split_copy()'s introductory comment.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: vkd3d Branch: master Commit: d2ba10a69650d45b1c4cb9adfdeaa15dfca7e2d6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d2ba10a69650d45b1c4cb9a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Apr 22 12:25:01 2022 +0200 vkd3d-shader/hlsl: Update split_copy()'s introductory comment. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 73e3b73f..f22841fb 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -567,8 +567,10 @@ static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *inst return false; } -/* Helper for split_array_copies() and split_struct_copies(). Inserts new - * instructions right before "store". */ +/* Copy an element of a complex variable. Helper for + * split_array_copies(), split_struct_copies() and + * split_matrix_copies(). Inserts new instructions right before + * "store". */ static bool split_copy(struct hlsl_ctx *ctx, struct hlsl_ir_store *store, const struct hlsl_ir_load *load, const unsigned int offset, struct hlsl_type *type) {

1 0

Giovanni Mascellani : tests: Test matrix copying with a non-square matrix.
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: vkd3d Branch: master Commit: 3bbb90a3cb6537babd8e5edf12a5c42b3cdad1f6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3bbb90a3cb6537babd8e5ed… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Apr 22 12:25:02 2022 +0200 tests: Test matrix copying with a non-square matrix. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/hlsl-matrix-indexing.shader_test | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/hlsl-matrix-indexing.shader_test b/tests/hlsl-matrix-indexing.shader_test index e2103fe2..8057179e 100644 --- a/tests/hlsl-matrix-indexing.shader_test +++ b/tests/hlsl-matrix-indexing.shader_test @@ -47,18 +47,16 @@ todo draw quad probe all rgba (1.0, 5.0, 7.0, 12.0) [pixel shader] -uniform float4x4 m; +uniform float3x2 m; float4 main() : SV_TARGET { - float4x4 m2 = m; - return float4(m2[0][0], m2[1][0], m2[1][2], m2[2][3]); + float3x2 m2 = m; + return float4(m2[0][0], m2[2][0], m2[1][1], m2[2][1]); } [test] -uniform 0 float4 1.0 2.0 3.0 4.0 -uniform 4 float4 5.0 6.0 7.0 8.0 -uniform 8 float4 9.0 10.0 11.0 12.0 -uniform 12 float4 13.0 14.0 15.0 16.0 +uniform 0 float4 1.0 2.0 3.0 0.0 +uniform 4 float4 5.0 6.0 7.0 0.0 todo draw quad -probe all rgba (1.0, 2.0, 10.0, 15.0) +probe all rgba (1.0, 3.0, 6.0, 7.0)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Do not handle vector types in major_size() and minor_size().
by Alexandre Julliard 25 Apr '22

25 Apr '22

Module: vkd3d Branch: master Commit: 74273ccaddf4699bd978ed3152b0166073650528 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=74273ccaddf4699bd978ed3… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Apr 22 12:25:03 2022 +0200 vkd3d-shader/hlsl: Do not handle vector types in major_size() and minor_size(). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index f22841fb..f31bfe9f 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -676,7 +676,7 @@ static bool split_struct_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr static unsigned int minor_size(const struct hlsl_type *type) { - if (type->type == HLSL_CLASS_VECTOR || type->modifiers & HLSL_MODIFIER_ROW_MAJOR) + if (type->modifiers & HLSL_MODIFIER_ROW_MAJOR) return type->dimx; else return type->dimy; @@ -684,7 +684,7 @@ static unsigned int minor_size(const struct hlsl_type *type) static unsigned int major_size(const struct hlsl_type *type) { - if (type->type == HLSL_CLASS_VECTOR || type->modifiers & HLSL_MODIFIER_ROW_MAJOR) + if (type->modifiers & HLSL_MODIFIER_ROW_MAJOR) return type->dimy; else return type->dimx;

1 0