update to 2.1.r297.g3bf817aea

3 files changed, 75 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ffbb1a835f98..a2223c5c6a19 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libretro-flycast-git
 	pkgdesc = Sega Dreamcast/NAOMI/NAOMI 2/Atomiswave core (fork of reicast)
-	pkgver = 2.1.r292.gdca048981
+	pkgver = 2.1.r297.g3bf817aea
 	pkgrel = 1
 	url = https://github.com/flyinghead/flycast
 	arch = aarch64
@@ -19,8 +19,8 @@ pkgbase = libretro-flycast-git
 	makedepends = libgl
 	makedepends = libzip
 	makedepends = miniupnpc
-	makedepends = vulkan-headers>=1:1.3.250
-	makedepends = vulkan-icd-loader
+	makedepends = vulkan-headers>=1:1.3.256
+	makedepends = vulkan-memory-allocator
 	makedepends = xbyak
 	makedepends = xxhash
 	depends = gcc-libs
@@ -30,11 +30,9 @@ pkgbase = libretro-flycast-git
 	provides = libretro-flycast
 	conflicts = libretro-flycast
 	source = flycast::git+https://github.com/flyinghead/flycast.git
-	source = VulkanMemoryAllocator::git+https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
 	source = use-system-libs.patch
 	b2sums = SKIP
-	b2sums = SKIP
-	b2sums = c226d68266b6a1bd6e59f0c9d1e6ba5299945b2282673839c76d738d16c14e4e5e6a45b930d7ba8a14edbe1aa7c5ea053243895db6ccfca4ae1164008fe4334f
+	b2sums = ad0de164a518b93a684fc52be3b848719f80888f7fe89c1c64301aa312da8cf5a2951c4a735809d7ce39ea8f23d8b4e8d1ab88011827a2b1c63b8fd5afc3c943
 
 pkgname = libretro-flycast-git
 	depends = gcc-libs
diff --git a/PKGBUILD b/PKGBUILD
index d98fa37a4bff..64ce5ddc1d94 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _reponame=flycast
 _pkgname=libretro-$_reponame
 pkgname=$_pkgname-git
-pkgver=2.1.r292.gdca048981
+pkgver=2.1.r297.g3bf817aea
 pkgrel=1
 pkgdesc="Sega Dreamcast/NAOMI/NAOMI 2/Atomiswave core (fork of reicast)"
 arch=('aarch64' 'armv7h' 'i486' 'i686' 'pentium4' 'x86_64')
@@ -20,8 +20,8 @@ makedepends=(
 	'libgl'
 	'libzip'
 	'miniupnpc'
-	'vulkan-headers>=1:1.3.250'
-	'vulkan-icd-loader'
+	'vulkan-headers>=1:1.3.256'
+	'vulkan-memory-allocator'
 	'xbyak'
 	'xxhash'
 )
@@ -29,13 +29,11 @@ provides=("$_pkgname")
 conflicts=("$_pkgname")
 source=(
 	"$_reponame::git+$url.git"
-	'VulkanMemoryAllocator::git+https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git'
 	'use-system-libs.patch'
 )
 b2sums=(
 	'SKIP'
-	'SKIP'
-	'c226d68266b6a1bd6e59f0c9d1e6ba5299945b2282673839c76d738d16c14e4e5e6a45b930d7ba8a14edbe1aa7c5ea053243895db6ccfca4ae1164008fe4334f'
+	'ad0de164a518b93a684fc52be3b848719f80888f7fe89c1c64301aa312da8cf5a2951c4a735809d7ce39ea8f23d8b4e8d1ab88011827a2b1c63b8fd5afc3c943'
 )
 
 pkgver() {
@@ -45,8 +43,6 @@ pkgver() {
 
 prepare() {
 	cd $_reponame
-	git config submodule.core/deps/VulkanMemoryAllocator.url ../VulkanMemoryAllocator
-	git -c protocol.file.allow=always submodule update
 	patch -Np1 < ../use-system-libs.patch
 	rm -r core/deps/libretro-common/include/libchdr
 }
diff --git a/use-system-libs.patch b/use-system-libs.patch
index 77b1c82bdc0f..bc6c23e6f727 100644
--- a/use-system-libs.patch
+++ b/use-system-libs.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1962e6955..ca9f97e85 100644
+index 1962e6955..31401f8dc 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -360,12 +360,13 @@ endif()
@@ -94,11 +94,24 @@ index 1962e6955..ca9f97e85 100644
  	endif()
  
 -	add_subdirectory(core/deps/Vulkan-Headers)
-+	find_package(Vulkan)
++	find_package(VulkanHeaders)
  	target_link_libraries(${PROJECT_NAME} PRIVATE Vulkan::Headers)
  
  	if (APPLE)
-@@ -1468,7 +1468,7 @@ if("arm64" IN_LIST ARCHITECTURE)
+@@ -1256,10 +1256,8 @@ if(USE_VULKAN)
+ 		target_compile_definitions(${PROJECT_NAME} PRIVATE VMA_USE_STL_SHARED_MUTEX=0)
+ 	endif()
+ 	
+-	add_library(VulkanMemoryAllocator INTERFACE)
+-	target_compile_options(VulkanMemoryAllocator INTERFACE $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:AppleClang,Clang>>:-Wno-nullability-completeness>)
+-	target_include_directories(VulkanMemoryAllocator INTERFACE core/deps/VulkanMemoryAllocator/include)
+-	target_link_libraries(${PROJECT_NAME} PRIVATE VulkanMemoryAllocator)
++	find_package(VulkanMemoryAllocator)
++	target_link_libraries(${PROJECT_NAME} PRIVATE GPUOpen::VulkanMemoryAllocator)
+ 
+ 	target_compile_definitions(${PROJECT_NAME} PRIVATE USE_VULKAN HAVE_VULKAN)
+ 	target_sources(${PROJECT_NAME} PRIVATE
+@@ -1468,7 +1466,7 @@ if("arm64" IN_LIST ARCHITECTURE)
  	target_sources(${PROJECT_NAME} PRIVATE core/rec-ARM64/rec_arm64.cpp core/rec-ARM64/arm64_regalloc.h)
  endif()
  if("x86" IN_LIST ARCHITECTURE OR "x86_64" IN_LIST ARCHITECTURE)
@@ -133,3 +146,54 @@ index 148122335..5761a4f35 100644
  
  #include <glm/glm.hpp>
  #include <map>
+diff --git a/core/rend/vulkan/vmallocator.cpp b/core/rend/vulkan/vmallocator.cpp
+index 6a441d2c5..9b288e05a 100644
+--- a/core/rend/vulkan/vmallocator.cpp
++++ b/core/rend/vulkan/vmallocator.cpp
+@@ -70,5 +70,5 @@ void VMAllocator::Init(vk::PhysicalDevice physicalDevice, vk::Device device, vk:
+ 
+ 	VkResult rc = vmaCreateAllocator(&allocatorInfo, &allocator);
+ 	if (rc != VK_SUCCESS)
+-		vk::throwResultException((vk::Result)rc, "vmaCreateAllocator failed");
++		vk::detail::throwResultException((vk::Result)rc, "vmaCreateAllocator failed");
+ }
+diff --git a/core/rend/vulkan/vmallocator.h b/core/rend/vulkan/vmallocator.h
+index 4d61d4f10..b9b0746d9 100644
+--- a/core/rend/vulkan/vmallocator.h
++++ b/core/rend/vulkan/vmallocator.h
+@@ -65,7 +65,7 @@ public:
+ 		void *p;
+ 		VkResult res = vmaMapMemory(allocator, allocation, &p);
+ 		if (res != VK_SUCCESS)
+-			vk::throwResultException((vk::Result)res, "vmaMapMemory failed");
++			vk::detail::throwResultException((vk::Result)res, "vmaMapMemory failed");
+ 		VkMemoryPropertyFlags flags;
+ 		vmaGetMemoryTypeProperties(allocator, allocInfo.memoryType, &flags);
+ 		if ((flags & VK_MEMORY_PROPERTY_HOST_CACHED_BIT) && (flags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT) == 0)
+@@ -116,7 +116,7 @@ public:
+ 		VmaAllocationInfo allocInfo;
+ 		VkResult rc = vmaAllocateMemory(allocator, (VkMemoryRequirements*)&memoryRequirements, &allocCreateInfo, &vmaAllocation, &allocInfo);
+ 		if (rc != VK_SUCCESS)
+-			vk::throwResultException((vk::Result)rc, "vmaAllocateMemory failed");
++			vk::detail::throwResultException((vk::Result)rc, "vmaAllocateMemory failed");
+ 		return Allocation(allocator, vmaAllocation, allocInfo);
+ 	}
+ 
+@@ -126,7 +126,7 @@ public:
+ 		VmaAllocationInfo allocInfo;
+ 		VkResult rc = vmaAllocateMemoryForImage(allocator, (VkImage)image, &allocCreateInfo, &vmaAllocation, &allocInfo);
+ 		if (rc != VK_SUCCESS)
+-			vk::throwResultException((vk::Result)rc, "vmaAllocateMemoryForImage failed");
++			vk::detail::throwResultException((vk::Result)rc, "vmaAllocateMemoryForImage failed");
+ 		vmaBindImageMemory(allocator, vmaAllocation, (VkImage)image);
+ 
+ 		return Allocation(allocator, vmaAllocation, allocInfo);
+@@ -138,7 +138,7 @@ public:
+ 		VmaAllocationInfo allocInfo;
+ 		VkResult rc = vmaAllocateMemoryForBuffer(allocator, (VkBuffer)buffer, &allocCreateInfo, &vmaAllocation, &allocInfo);
+ 		if (rc != VK_SUCCESS)
+-			vk::throwResultException((vk::Result)rc, "vmaAllocateMemoryForBuffer failed");
++			vk::detail::throwResultException((vk::Result)rc, "vmaAllocateMemoryForBuffer failed");
+ 		vmaBindBufferMemory(allocator, vmaAllocation, (VkBuffer)buffer);
+ 
+ 		return Allocation(allocator, vmaAllocation, allocInfo);