From 60772d15659f4c93082151e6fb30310c50e81663 Mon Sep 17 00:00:00 2001
From: pineappleEA <pineaea@gmail.com>
Date: Fri, 27 May 2022 07:40:06 +0200
Subject: [PATCH] early-access version 2738

---
 README.md                                     |  2 +-
 patches/inject-git-info.patch                 | 41 ++++++++++++++++++-
 .../renderer_vulkan/vk_texture_cache.cpp      |  4 +-
 3 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 5faa38408..4feee64ae 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 yuzu emulator early access
 =============
 
-This is the source code for early-access 2737.
+This is the source code for early-access 2738.
 
 ## Legal Notice
 
diff --git a/patches/inject-git-info.patch b/patches/inject-git-info.patch
index 34cb37067..a3c7b5951 100644
--- a/patches/inject-git-info.patch
+++ b/patches/inject-git-info.patch
@@ -1 +1,40 @@
-500: Internal Server Error
\ No newline at end of file
+diff --git a/CMakeModules/GenerateSCMRev.cmake b/CMakeModules/GenerateSCMRev.cmake
+--- a/CMakeModules/GenerateSCMRev.cmake
++++ b/CMakeModules/GenerateSCMRev.cmake
+@@ -11,10 +11,10 @@
+ 
+ # generate git/build information
+ include(GetGitRevisionDescription)
+-get_git_head_revision(GIT_REF_SPEC GIT_REV)
+-git_describe(GIT_DESC --always --long --dirty)
+-git_branch_name(GIT_BRANCH)
+-get_timestamp(BUILD_DATE)
++#get_git_head_revision(GIT_REF_SPEC GIT_REV)
++#git_describe(GIT_DESC --always --long --dirty)
++#git_branch_name(GIT_BRANCH)
++#get_timestamp(BUILD_DATE)
+ 
+ # Generate cpp with Git revision from template
+ # Also if this is a CI build, add the build name (ie: Nightly, Canary) to the scm_rev file as well
+@@ -113,4 +113,5 @@
+     set(COMBINED "${COMBINED}${TMP}")
+ endforeach()
+ string(MD5 SHADER_CACHE_VERSION "${COMBINED}")
++set(BUILD_FULLNAME "${BUILD_FULLNAME} ")
+ configure_file("${SRC_DIR}/src/common/scm_rev.cpp.in" "scm_rev.cpp" @ONLY)
+diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
+--- a/src/common/CMakeLists.txt
++++ b/src/common/CMakeLists.txt
+@@ -28,6 +28,12 @@
+       -DBUILD_TAG="${BUILD_TAG}"
+       -DBUILD_ID="${DISPLAY_VERSION}"
+       -DGIT_EXECUTABLE="${GIT_EXECUTABLE}"
++      -DGIT_REF_SPEC="${GIT_REF_SPEC}"
++      -DGIT_REV="${GIT_REV}"
++      -DGIT_DESC="${GIT_DESC}"
++      -DGIT_BRANCH="${GIT_BRANCH}"
++      -DBUILD_FULLNAME="${BUILD_FULLNAME}"
++      -DBUILD_DATE="${BUILD_DATE}"
+       -P "${CMAKE_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake"
+     DEPENDS
+       # WARNING! It was too much work to try and make a common location for this list,
diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp
index da88f02a8..353594293 100755
--- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp
@@ -1777,7 +1777,7 @@ void Framebuffer::CreateFramebuffer(TextureCacheRuntime& runtime,
         }
         attachments.push_back(color_buffer->RenderTarget());
         renderpass_key.color_formats[index] = color_buffer->format;
-        num_layers = std::min(num_layers, color_buffer->range.extent.layers);
+        num_layers = std::max(num_layers, color_buffer->range.extent.layers);
         images[num_images] = color_buffer->ImageHandle();
         image_ranges[num_images] = MakeSubresourceRange(color_buffer);
         samples = color_buffer->Samples();
@@ -1787,7 +1787,7 @@ void Framebuffer::CreateFramebuffer(TextureCacheRuntime& runtime,
     if (depth_buffer) {
         attachments.push_back(depth_buffer->RenderTarget());
         renderpass_key.depth_format = depth_buffer->format;
-        num_layers = std::min(num_layers, depth_buffer->range.extent.layers);
+        num_layers = std::max(num_layers, depth_buffer->range.extent.layers);
         images[num_images] = depth_buffer->ImageHandle();
         const VkImageSubresourceRange subresource_range = MakeSubresourceRange(depth_buffer);
         image_ranges[num_images] = subresource_range;