Merge pull request #3599 from ReinUsesLisp/revert-3499

Revert "Merge pull request #3499 from ReinUsesLisp/depth-2d-array"
This commit is contained in:
bunnei 2020-04-07 16:51:41 -04:00 committed by GitHub
commit f316911248
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -113,10 +113,8 @@ 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::Texture2D && params.depth > 1) { if (params.target == SurfaceTarget::TextureCubemap ||
params.depth = 1; params.target == SurfaceTarget::TextureCubeArray) {
} 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;