Переглянути джерело

set cubemapsaver profile to one that preserves sizes
also aug size mismatches for the popup so they're reported

AzaezelX 3 роки тому
батько
коміт
0527865462

+ 2 - 2
Engine/source/gfx/D3D11/gfxD3D11TextureObject.cpp

@@ -198,8 +198,8 @@ bool GFXD3D11TextureObject::copyToBmp(GBitmap* bmp)
 
 
    PROFILE_START(GFXD3D11TextureObject_copyToBmp);
    PROFILE_START(GFXD3D11TextureObject_copyToBmp);
 
 
-   AssertFatal(bmp->getWidth() == getWidth(), "GFXD3D11TextureObject::copyToBmp - source/dest width does not match");
-   AssertFatal(bmp->getHeight() == getHeight(), "GFXD3D11TextureObject::copyToBmp - source/dest height does not match");
+   AssertFatal(bmp->getWidth() == getWidth(), avar("GFXGLTextureObject::copyToBmp - Width mismatch: %i vs %i", bmp->getWidth(), getWidth()));
+   AssertFatal(bmp->getHeight() == getHeight(), avar("GFXGLTextureObject::copyToBmp - Height mismatch: %i vs %i", bmp->getHeight(), getHeight()));
    const U32 mipLevels = getMipLevels();
    const U32 mipLevels = getMipLevels();
 
 
    bmp->setHasTransparency(mHasTransparency);
    bmp->setHasTransparency(mHasTransparency);

+ 1 - 1
Engine/source/gfx/bitmap/cubemapSaver.cpp

@@ -56,7 +56,7 @@ namespace CubemapSaver
       for (U32 face = 0; face < CubeFaces; face++)
       for (U32 face = 0; face < CubeFaces; face++)
       {
       {
          pTextures[face].set(faceSize, faceSize, targetFmt,
          pTextures[face].set(faceSize, faceSize, targetFmt,
-            &GFXStaticTextureProfile, avar("%s() - (line %d)", __FUNCTION__, __LINE__),
+            &GFXTexturePersistentProfile, avar("%s() - (line %d)", __FUNCTION__, __LINE__),
             mipLevels, GFXTextureManager::AA_MATCH_BACKBUFFER);
             mipLevels, GFXTextureManager::AA_MATCH_BACKBUFFER);
 
 
          // yep t3d has funky z up, need to change the face order
          // yep t3d has funky z up, need to change the face order

+ 2 - 2
Engine/source/gfx/gl/gfxGLTextureObject.cpp

@@ -162,8 +162,8 @@ bool GFXGLTextureObject::copyToBmp(GBitmap * bmp)
    if (mFormat != GFXFormatR16G16B16A16F && mFormat != GFXFormatR8G8B8A8 && mFormat != GFXFormatR8G8B8A8_LINEAR_FORCE && mFormat != GFXFormatR8G8B8A8_SRGB)
    if (mFormat != GFXFormatR16G16B16A16F && mFormat != GFXFormatR8G8B8A8 && mFormat != GFXFormatR8G8B8A8_LINEAR_FORCE && mFormat != GFXFormatR8G8B8A8_SRGB)
 	   return false;
 	   return false;
 
 
-   AssertFatal(bmp->getWidth() == getWidth(), "GFXGLTextureObject::copyToBmp - invalid size");
-   AssertFatal(bmp->getHeight() == getHeight(), "GFXGLTextureObject::copyToBmp - invalid size");
+   AssertFatal(bmp->getWidth() == getWidth(), avar("GFXGLTextureObject::copyToBmp - Width mismatch: %i vs %i", bmp->getWidth(), getWidth()));
+   AssertFatal(bmp->getHeight() == getHeight(), avar("GFXGLTextureObject::copyToBmp - Height mismatch: %i vs %i", bmp->getHeight(), getHeight()));
 
 
    PROFILE_SCOPE(GFXGLTextureObject_copyToBmp);
    PROFILE_SCOPE(GFXGLTextureObject_copyToBmp);