diff options
| author | 2020-04-07 16:51:41 -0400 | |
|---|---|---|
| committer | 2020-04-07 16:51:41 -0400 | |
| commit | f316911248e8046a3044fd0fdcd434663a5e588e (patch) | |
| tree | 404ed950ca2ed9f90bd33e39a47824ade719f26b /src | |
| parent | Merge pull request #3489 from namkazt/patch-2 (diff) | |
| parent | Revert "Merge pull request #3499 from ReinUsesLisp/depth-2d-array" (diff) | |
| download | yuzu-f316911248e8046a3044fd0fdcd434663a5e588e.tar.gz yuzu-f316911248e8046a3044fd0fdcd434663a5e588e.tar.xz yuzu-f316911248e8046a3044fd0fdcd434663a5e588e.zip | |
Merge pull request #3599 from ReinUsesLisp/revert-3499
Revert "Merge pull request #3499 from ReinUsesLisp/depth-2d-array"
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/texture_cache/surface_params.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/video_core/texture_cache/surface_params.cpp b/src/video_core/texture_cache/surface_params.cpp index 47b2aafbd..6f3ef45be 100644 --- a/src/video_core/texture_cache/surface_params.cpp +++ b/src/video_core/texture_cache/surface_params.cpp | |||
| @@ -113,10 +113,8 @@ SurfaceParams SurfaceParams::CreateForTexture(const FormatLookupTable& lookup_ta | |||
| 113 | params.height = tic.Height(); | 113 | params.height = tic.Height(); |
| 114 | params.depth = tic.Depth(); | 114 | params.depth = tic.Depth(); |
| 115 | params.pitch = params.is_tiled ? 0 : tic.Pitch(); | 115 | params.pitch = params.is_tiled ? 0 : tic.Pitch(); |
| 116 | if (params.target == SurfaceTarget::Texture2D && params.depth > 1) { | 116 | if (params.target == SurfaceTarget::TextureCubemap || |
| 117 | params.depth = 1; | 117 | params.target == SurfaceTarget::TextureCubeArray) { |
| 118 | } else if (params.target == SurfaceTarget::TextureCubemap || | ||
| 119 | params.target == SurfaceTarget::TextureCubeArray) { | ||
| 120 | params.depth *= 6; | 118 | params.depth *= 6; |
| 121 | } | 119 | } |
| 122 | params.num_levels = tic.max_mip_level + 1; | 120 | params.num_levels = tic.max_mip_level + 1; |