Changeset 26774

Timestamp:

Apr 11, 2022, 6:28:41 PM (2 years ago)

Author:

Vladislav Belov

Message:

Avoids a crash if a texture size is not a power of two.

Tested By: Stan

Differential Revision: ​https://code.wildfiregames.com/D4586

Location:

ps/trunk

Files:

• binaries/data/mods/_test.tex/art/textures/b/npot.png (added)
• source/graphics/TextureConverter.cpp (modified) (3 diffs)
• source/graphics/TextureManager.cpp (modified) (6 diffs)
• source/graphics/tests/test_TextureConverter.h (modified) (2 diffs)
• source/ps/Profiler2GPU.cpp (modified) (1 diff)

ps/trunk/source/graphics/TextureConverter.cpp

@@ -1 @@
-/* Copyright (C) 2021 Wildfire Games.
+/* Copyright (C) 202 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -20 +20 @@
 #include "TextureConverter.h"
 
+
+
 #include "lib/regex.h"
+
 #include "lib/timer.h"
-#include "lib/allocators/shared_ptr.h"
-#include "lib/tex/tex.h"
 #include "maths/MD5.h"
 #include "ps/CLogger.h"
@@ -348 +349 @@
     }
 
+
+
+
+
+
+
+
   �� // Check whether there's any alpha channel
     bool hasAlpha = ((tex.m_Flags & TEX_ALPHA) != 0);

ps/trunk/source/graphics/TextureManager.cpp

@@ -23 +23 @@
 #include "graphics/TextureConverter.h"
 #include "lib/allocators/shared_ptr.h"
+
 #include "lib/file/vfs/vfs_tree.h"
 #include "lib/hash.h"
@@ -409 +410 @@
             texture->ResetBackendTexture(
                 nullptr, m_ErrorTexture.GetTexture()->GetBackendTexture());
+
+
+
+
+
+
+
+
+
+
+
             return;
         }
@@ -443 +455 @@
             texture->ResetBackendTexture(
                 nullptr, m_ErrorTexture.GetTexture()->GetBackendTexture());
+
             return;
         }
@@ -558 +571 @@
     void ConvertTexture(const CTexturePtr& texture)
     {
-        VfsPath sourcePath = texture->m_Properties.m_Path;
+        VfsPath sourcePath = texture->m_Properties.m_Path;
 
         PROFILE2("convert texture");
@@ -566 +579 @@
         u32 version;
         PrepareCacheKey(texture, hash, version);
-        VfsPath looseCachePath = m_CacheLoader.LooseCachePath(sourcePath, hash, version);
-
-//      LOGWARNING("Converting texture \"%s\"", srcPath.c_str());
+        const VfsPath looseCachePath = m_CacheLoader.LooseCachePath(sourcePath, hash, version);
 
         CTextureConverter::Settings settings = GetConverterSettings(texture);
@@ -855 +866 @@
     if (!IsLoaded())
         return;
-    else if (!m_TextureData)
+    else if (!m_TextureData)
     {
         ResetBackendTexture(nullptr, m_TextureManager->GetErrorTexture()->GetBackendTexture());

ps/trunk/source/graphics/tests/test_TextureConverter.h

@@ -1 @@
-/* Copyright (C) 2021 Wildfire Games.
+/* Copyright (C) 202 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -86 +86 @@
         TS_ASSERT_EQUALS(texdata[8*4], texdata[16*4]);
         TS_ASSERT_DIFFERS(texdata[16*4], texdata[24*4]);
+
 
-//      for (size_t i = 0; i < tex.dataSize; ++i)
-//      {
-//          if (i % 4 == 0) printf("\n");
-//          printf("%02x ", texdata[i]);
-//      }
+    void test_not_pot()
+    {
+        // CTextureConverter prints to logs in case of an error.
+        TestLogger logger;
+
+        const VfsPath path = L"art/textures/b/npot.png";
+
+        CTextureConverter converter(m_VFS, false);
+        CTextureConverter::Settings settings =
+            converter.ComputeSettings(L"", std::vector<CTextureConverter::SettingsFile*>());
+        TS_ASSERT(!converter.ConvertTexture(CTexturePtr(), path, L"cache/npot.png", settings));
+        TS_ASSERT(logger.GetOutput().find("be power of two") != std::string::npos);
     }
 };

ps/trunk/source/ps/Profiler2GPU.cpp

@@ -287 +287 @@
 #else // CONFIG2_GLES
 
+
+
+
+
+
 CProfiler2GPU::CProfiler2GPU(CProfiler2& profiler) :
     m_Profiler(profiler)