Merge pull request #896 from Azaezel/alpha401/setTextureTweak

aug GFXTextureArray::setTexture to report what texture sizes are mism…
This commit is contained in:
Brian Roberts 2022-09-18 05:36:31 -05:00 committed by GitHub
commit ada1e83de2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -123,13 +123,13 @@ void GFXTextureArray::setTexture(const GFXTexHandle& texture, U32 slot)
{ {
if (texture.getHeight() != mHeight || texture.getWidth() != mWidth) if (texture.getHeight() != mHeight || texture.getWidth() != mWidth)
{ {
AssertWarn(true, "GFXTextureArray::setTexture all textures should be the same size"); AssertWarn(true, avar("GFXTextureArray::setTexture all textures should be the same size: %i vs %i", texture.getHeight(), mHeight));
Con::warnf("GFXTextureArray::setTexture all textures should be the same size"); Con::warnf(avar("GFXTextureArray::setTexture all textures should be the same size: %i vs %i", texture.getHeight(), mHeight));
} }
else if (texture->getMipLevels() < mMipLevels) else if (texture->getMipLevels() < mMipLevels)
{ {
AssertWarn(true, "GFXTextureArray::setTexture all textures should have at least the same number of mips"); AssertWarn(true, avar("GFXTextureArray::setTexture all textures should have at least the same number of mips: %i vs %i", texture->getMipLevels(), mMipLevels));
Con::warnf("GFXTextureArray::setTexture all textures should have at least the same number of mips"); Con::warnf(avar("GFXTextureArray::setTexture all textures should have at least the same number of mips: %i vs %i", texture->getMipLevels(), mMipLevels));
} }
else else
{ {