2024-06-14 20:57:32 -07:00
|
|
|
From 30c7eb4c615cea3965b2f77c32cbbeff3b6749a2 Mon Sep 17 00:00:00 2001
|
2024-05-30 14:40:33 -07:00
|
|
|
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
|
|
|
|
Date: Thu, 7 Mar 2024 10:40:41 +1100
|
|
|
|
|
Subject: [PATCH] Updated vkd3d to 36c123c0056abd227ddfaac37a2a0902ac2f4bc5.
|
|
|
|
|
|
|
|
|
|
1.12 Release
|
|
|
|
|
---
|
|
|
|
|
libs/vkd3d/include/private/vkd3d_common.h | 2 +-
|
|
|
|
|
libs/vkd3d/libs/vkd3d-common/blob.c | 1 +
|
|
|
|
|
libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_main.c | 2 ++
|
|
|
|
|
3 files changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/libs/vkd3d/include/private/vkd3d_common.h b/libs/vkd3d/include/private/vkd3d_common.h
|
|
|
|
|
index a9d709d10fe..2d950b4f7aa 100644
|
|
|
|
|
--- a/libs/vkd3d/include/private/vkd3d_common.h
|
|
|
|
|
+++ b/libs/vkd3d/include/private/vkd3d_common.h
|
|
|
|
|
@@ -233,7 +233,7 @@ static inline unsigned int vkd3d_popcount(unsigned int v)
|
|
|
|
|
{
|
|
|
|
|
#ifdef _MSC_VER
|
|
|
|
|
return __popcnt(v);
|
|
|
|
|
-#elif defined(__MINGW32__)
|
|
|
|
|
+#elif defined(HAVE_BUILTIN_POPCOUNT)
|
|
|
|
|
return __builtin_popcount(v);
|
|
|
|
|
#else
|
|
|
|
|
v -= (v >> 1) & 0x55555555;
|
|
|
|
|
diff --git a/libs/vkd3d/libs/vkd3d-common/blob.c b/libs/vkd3d/libs/vkd3d-common/blob.c
|
|
|
|
|
index f60ef7db769..c2c6ad67804 100644
|
|
|
|
|
--- a/libs/vkd3d/libs/vkd3d-common/blob.c
|
|
|
|
|
+++ b/libs/vkd3d/libs/vkd3d-common/blob.c
|
|
|
|
|
@@ -20,6 +20,7 @@
|
|
|
|
|
#define WIDL_C_INLINE_WRAPPERS
|
|
|
|
|
#endif
|
|
|
|
|
#define COBJMACROS
|
|
|
|
|
+
|
|
|
|
|
#define CONST_VTABLE
|
|
|
|
|
#include "vkd3d.h"
|
|
|
|
|
#include "vkd3d_blob.h"
|
|
|
|
|
diff --git a/libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_main.c
|
|
|
|
|
index 14a3fa778e5..46c0da2a2d7 100644
|
|
|
|
|
--- a/libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_main.c
|
|
|
|
|
+++ b/libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_main.c
|
|
|
|
|
@@ -23,6 +23,8 @@
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <math.h>
|
|
|
|
|
|
|
|
|
|
+/* VKD3D_DEBUG_ENV_NAME("VKD3D_SHADER_DEBUG"); */
|
|
|
|
|
+
|
|
|
|
|
static inline int char_to_int(char c)
|
|
|
|
|
{
|
|
|
|
|
if ('0' <= c && c <= '9')
|
|
|
|
|
--
|
|
|
|
|
2.43.0
|
|
|
|
|
|
