Signed-off-by: Matteo Bruni mbruni@codeweavers.com --- libs/vkd3d-shader/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index afac0ab..4769475 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -755,7 +755,7 @@ static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *ty field->semantic = v->semantic; if (v->initializer.args_count) { - hlsl_error(ctx, v->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Illegal initializer on a struct field.\n"); + hlsl_error(ctx, v->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Illegal initializer on a struct field."); free_parse_initializer(&v->initializer); } list_add_tail(list, &field->entry);
Signed-off-by: Matteo Bruni mbruni@codeweavers.com --- configure.ac | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac index 2005c76..3ad4bbc 100644 --- a/configure.ac +++ b/configure.ac @@ -105,7 +105,7 @@ AC_CHECK_LIB([dl], [dlopen], AC_ARG_VAR([PTHREAD_LIBS], [linker flags for pthreads]) VKD3D_CHECK_PTHREAD
-AC_SUBST([VULKAN_LIBS]) +AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library]) VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], [VULKAN_LIBS="-lvulkan"], [VKD3D_CHECK_SONAME([vulkan-1], [vkGetInstanceProcAddr], @@ -115,7 +115,10 @@ VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], [VULKAN_LIBS="-lMoltenVK" AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], ["$ac_cv_lib_soname_MoltenVK"])], - [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])])])]) + [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])], + [$VULKAN_LIBS])], + [$VULKAN_LIBS])], + [$VULKAN_LIBS])
AS_IF([test "x$with_ncurses" != "xno"], [PKG_CHECK_MODULES([NCURSES], [ncurses],
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=87131
Your paranoid android.
=== debiant2 (build log) ===
error: patch failed: configure.ac:105 Task: Patch failed to apply
=== debiant2 (build log) ===
error: patch failed: configure.ac:105 Task: Patch failed to apply
On Wed, 17 Mar 2021 at 13:38, Matteo Bruni mbruni@codeweavers.com wrote:
-AC_SUBST([VULKAN_LIBS]) +AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library]) VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], [VULKAN_LIBS="-lvulkan"], [VKD3D_CHECK_SONAME([vulkan-1], [vkGetInstanceProcAddr],
I didn't notice this when I looked earlier, but shouldn't this then also set VULKAN_LIBS="$VULKAN_LIBS -lvulkan" instead of VULKAN_LIBS="-lvulkan"?
On Wed, Mar 17, 2021 at 9:31 PM Henri Verbeet hverbeet@gmail.com wrote:
On Wed, 17 Mar 2021 at 13:38, Matteo Bruni mbruni@codeweavers.com wrote:
-AC_SUBST([VULKAN_LIBS]) +AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library]) VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], [VULKAN_LIBS="-lvulkan"], [VKD3D_CHECK_SONAME([vulkan-1], [vkGetInstanceProcAddr],
I didn't notice this when I looked earlier, but shouldn't this then also set VULKAN_LIBS="$VULKAN_LIBS -lvulkan" instead of VULKAN_LIBS="-lvulkan"?
Yes, it should (and similarly for the others). I probably missed it because VULKAN_LIBS is only directly used for tests and demos, which I didn't check. Resending fixed...
Signed-off-by: Matteo Bruni mbruni@codeweavers.com --- configure.ac | 14 +------------- m4/check-vulkan.m4 | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 13 deletions(-) create mode 100644 m4/check-vulkan.m4
diff --git a/configure.ac b/configure.ac index 3ad4bbc..275bca2 100644 --- a/configure.ac +++ b/configure.ac @@ -106,19 +106,7 @@ AC_ARG_VAR([PTHREAD_LIBS], [linker flags for pthreads]) VKD3D_CHECK_PTHREAD
AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library]) -VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], - [VULKAN_LIBS="-lvulkan"], - [VKD3D_CHECK_SONAME([vulkan-1], [vkGetInstanceProcAddr], - [VULKAN_LIBS="-lvulkan-1" - AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], ["$ac_cv_lib_soname_vulkan_1"])], - [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr], - [VULKAN_LIBS="-lMoltenVK" - AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], - ["$ac_cv_lib_soname_MoltenVK"])], - [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])], - [$VULKAN_LIBS])], - [$VULKAN_LIBS])], - [$VULKAN_LIBS]) +VKD3D_CHECK_VULKAN
AS_IF([test "x$with_ncurses" != "xno"], [PKG_CHECK_MODULES([NCURSES], [ncurses], diff --git a/m4/check-vulkan.m4 b/m4/check-vulkan.m4 new file mode 100644 index 0000000..ed1229c --- /dev/null +++ b/m4/check-vulkan.m4 @@ -0,0 +1,16 @@ +dnl VKD3D_CHECK_VULKAN +AC_DEFUN([VKD3D_CHECK_VULKAN],[ +VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], + [VULKAN_LIBS="-lvulkan"], + [VKD3D_CHECK_SONAME([vulkan-1], [vkGetInstanceProcAddr], + [VULKAN_LIBS="-lvulkan-1" + AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], ["$ac_cv_lib_soname_vulkan_1"])], + [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr], + [VULKAN_LIBS="-lMoltenVK" + AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], + ["$ac_cv_lib_soname_MoltenVK"])], + [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])], + [$VULKAN_LIBS])], + [$VULKAN_LIBS])], + [$VULKAN_LIBS]) +])
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=87132
Your paranoid android.
=== debiant2 (build log) ===
error: patch failed: configure.ac:105 error: patch failed: configure.ac:106 Task: Patch failed to apply
=== debiant2 (build log) ===
error: patch failed: configure.ac:105 error: patch failed: configure.ac:106 Task: Patch failed to apply
-
Henri Verbeet -
Henri Verbeet -
Marvin -
Matteo Bruni -
Matteo Bruni