diff --git a/src/gx/CGxCaps.hpp b/src/gx/CGxCaps.hpp index 3ab5880..aa5c180 100644 --- a/src/gx/CGxCaps.hpp +++ b/src/gx/CGxCaps.hpp @@ -16,7 +16,6 @@ class CGxCaps { int32_t m_generateMipMaps = 0; int32_t m_texTarget[GxTexTargets_Last]; uint32_t m_texMaxSize[GxTexTargets_Last]; - uint32_t m_maxTextureSize = 0; int32_t m_texFmtDxt1 = 0; int32_t m_texFmtDxt3 = 0; int32_t m_texFmtDxt5 = 0; diff --git a/src/gx/Gx.cpp b/src/gx/Gx.cpp index d58a567..a94d2ce 100644 --- a/src/gx/Gx.cpp +++ b/src/gx/Gx.cpp @@ -48,8 +48,6 @@ CGxCaps* GxCaps() { g_placeholderGxCaps->m_generateMipMaps = 1; - g_placeholderGxCaps->m_maxTextureSize = 4096; - g_placeholderGxCaps->m_texFmtDxt1 = 1; g_placeholderGxCaps->m_texFmtDxt3 = 1; g_placeholderGxCaps->m_texFmtDxt5 = 1; diff --git a/src/gx/Texture.cpp b/src/gx/Texture.cpp index 2052560..0220a04 100644 --- a/src/gx/Texture.cpp +++ b/src/gx/Texture.cpp @@ -508,10 +508,9 @@ uint32_t MippedImgCalcSize(uint32_t fourCC, uint32_t width, uint32_t height) { // - order: width, height or height, width? void RequestImageDimensions(uint32_t* width, uint32_t* height, uint32_t* bestMip) { CGxCaps systemCaps; - memcpy(&systemCaps, GxCaps(), sizeof(systemCaps)); - uint32_t maxTextureSize = systemCaps.m_maxTextureSize; + auto maxTextureSize = systemCaps.m_texMaxSize[GxTex_2d]; if (maxTextureSize) { while (*height > maxTextureSize || *width > maxTextureSize) {