Merge pull request #3499 from ReinUsesLisp/depth-2d-array

texture_cache/surface_params: Force depth=1 on 2D textures
master
Fernando Sahmkow 2020-03-14 09:48:39 +07:00 committed by GitHub
commit 41905ee467
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions

@ -113,8 +113,10 @@ SurfaceParams SurfaceParams::CreateForTexture(const FormatLookupTable& lookup_ta
params.height = tic.Height(); params.height = tic.Height();
params.depth = tic.Depth(); params.depth = tic.Depth();
params.pitch = params.is_tiled ? 0 : tic.Pitch(); params.pitch = params.is_tiled ? 0 : tic.Pitch();
if (params.target == SurfaceTarget::TextureCubemap || if (params.target == SurfaceTarget::Texture2D && params.depth > 1) {
params.target == SurfaceTarget::TextureCubeArray) { params.depth = 1;
} else if (params.target == SurfaceTarget::TextureCubemap ||
params.target == SurfaceTarget::TextureCubeArray) {
params.depth *= 6; params.depth *= 6;
} }
params.num_levels = tic.max_mip_level + 1; params.num_levels = tic.max_mip_level + 1;