Update Vulkan SDK to 1.3.296.

Update vcpkg to 2024.12.16.
GPSnoopy · Dec 25, 2024 · c8c79bc · c8c79bc
1 parent f8584ab
commit c8c79bc
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -7,7 +7,7 @@ jobs:
 
     runs-on: ubuntu-22.04
     env: 
-      SDK_VERSION: 1.3.280
+      SDK_VERSION: 1.3.296
 
     steps:
     - uses: actions/checkout@v4

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -7,7 +7,7 @@ jobs:
 
     runs-on: windows-2022
     env:
-      SDK_VERSION: 1.3.280.0
+      SDK_VERSION: 1.3.296.0
 
     steps:
     - uses: actions/checkout@v4

diff --git a/src/UserInterface.cpp b/src/UserInterface.cpp
@@ -67,12 +67,13 @@ UserInterface::UserInterface(
 	vulkanInit.Queue = device.GraphicsQueue();
 	vulkanInit.PipelineCache = nullptr;
 	vulkanInit.DescriptorPool = descriptorPool_->Handle();
+	vulkanInit.RenderPass = renderPass_->Handle();
 	vulkanInit.MinImageCount = swapChain.MinImageCount();
 	vulkanInit.ImageCount = static_cast<uint32_t>(swapChain.Images().size());
 	vulkanInit.Allocator = nullptr;
 	vulkanInit.CheckVkResultFn = CheckVulkanResultCallback;
 
-	if (!ImGui_ImplVulkan_Init(&vulkanInit, renderPass_->Handle()))
+	if (!ImGui_ImplVulkan_Init(&vulkanInit))
 	{
 		Throw(std::runtime_error("failed to initialise ImGui vulkan adapter"));
 	}

diff --git a/vcpkg_linux.sh b/vcpkg_linux.sh
@@ -24,7 +24,7 @@ mkdir -p build
 cd build
 git clone https://github.com/Microsoft/vcpkg.git vcpkg.linux
 cd vcpkg.linux
-git checkout 2024.03.25
+git checkout 2024.12.16
 ./bootstrap-vcpkg.sh
 
 ./vcpkg install \

diff --git a/vcpkg_windows.bat b/vcpkg_windows.bat
@@ -2,7 +2,7 @@ mkdir build
 cd build || goto :error
 git clone https://github.com/Microsoft/vcpkg.git vcpkg.windows || goto :error
 cd vcpkg.windows || goto :error
-git checkout 2024.03.25 || goto :error
+git checkout 2024.12.16 || goto :error
 call bootstrap-vcpkg.bat || goto :error
 
 vcpkg.exe install ^