texture_cache: Handle 3D texture blits with one layer

2 files changed, 8 insertions, 3 deletions

diff --git a/src/video_core/texture_cache/surface_params.cpp b/src/video_core/texture_cache/surface_params.cpp
index 642eeb850..6fe7c85ac 100644
--- a/src/video_core/texture_cache/surface_params.cpp
+++ b/src/video_core/texture_cache/surface_params.cpp
@@ -246,8 +246,8 @@ SurfaceParams SurfaceParams::CreateForFermiCopySurface(
     params.width = config.width;
     params.height = config.height;
     params.pitch = config.pitch;
-    // TODO(Rodrigo): Try to guess the surface target from depth and layer parameters
-    params.target = SurfaceTarget::Texture2D;
+    // TODO(Rodrigo): Try to guess texture arrays from parameters
+    params.target = params.block_depth > 0 ? SurfaceTarget::Texture3D : SurfaceTarget::Texture2D;
     params.depth = 1;
     params.num_levels = 1;
     params.emulated_levels = 1;
diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h
index 4ee0d76b9..60b95a854 100644
--- a/src/video_core/texture_cache/texture_cache.h
+++ b/src/video_core/texture_cache/texture_cache.h
@@ -755,6 +755,8 @@ private:
         }
 
         TSurface new_surface = GetUncachedSurface(gpu_addr, params);
+        LoadSurface(new_surface);
+
         bool modified = false;
         for (auto& surface : overlaps) {
             const SurfaceParams& src_params = surface->GetSurfaceParams();
@@ -763,7 +765,10 @@ private:
                 src_params.block_height != params.block_height) {
                 return std::nullopt;
             }
-            modified |= surface->IsModified();
+            if (!surface->IsModified()) {
+                continue;
+            }
+            modified = true;
 
             const u32 offset = static_cast<u32>(surface->GetCpuAddr() - cpu_addr);
             const u32 slice = std::get<2>(params.GetBlockOffsetXYZ(offset));