thunderbrewhq/thunderbrew
1
0
Fork 0
mirror of https://github.com/thunderbrewhq/thunderbrew synced 2025-12-12 03:02:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(gx): remove placeholder max tex size field from gx caps

Browse source
This commit is contained in:
fallenoak 2023-03-09 21:54:41 -06:00
parent 5d49ab72c4
commit 27583b6f2e
No known key found for this signature in database
GPG key ID: 7628F8E61AEA070D
3 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/gx/CGxCaps.hpp
View file

@ -16,7 +16,6 @@ class CGxCaps {
int32_t m_generateMipMaps = 0; int32_t m_generateMipMaps = 0;
int32_t m_texTarget[GxTexTargets_Last]; int32_t m_texTarget[GxTexTargets_Last];
uint32_t m_texMaxSize[GxTexTargets_Last]; uint32_t m_texMaxSize[GxTexTargets_Last];
uint32_t m_maxTextureSize = 0;
int32_t m_texFmtDxt1 = 0; int32_t m_texFmtDxt1 = 0;
int32_t m_texFmtDxt3 = 0; int32_t m_texFmtDxt3 = 0;
int32_t m_texFmtDxt5 = 0; int32_t m_texFmtDxt5 = 0;

2
src/gx/Gx.cpp
View file

@ -48,8 +48,6 @@ CGxCaps* GxCaps() {
g_placeholderGxCaps->m_generateMipMaps = 1; g_placeholderGxCaps->m_generateMipMaps = 1;
g_placeholderGxCaps->m_maxTextureSize = 4096;
g_placeholderGxCaps->m_texFmtDxt1 = 1; g_placeholderGxCaps->m_texFmtDxt1 = 1;
g_placeholderGxCaps->m_texFmtDxt3 = 1; g_placeholderGxCaps->m_texFmtDxt3 = 1;
g_placeholderGxCaps->m_texFmtDxt5 = 1; g_placeholderGxCaps->m_texFmtDxt5 = 1;

3
src/gx/Texture.cpp
View file

@ -508,10 +508,9 @@ uint32_t MippedImgCalcSize(uint32_t fourCC, uint32_t width, uint32_t height) {
// - order: width, height or height, width? // - order: width, height or height, width?
void RequestImageDimensions(uint32_t* width, uint32_t* height, uint32_t* bestMip) { void RequestImageDimensions(uint32_t* width, uint32_t* height, uint32_t* bestMip) {
CGxCaps systemCaps; CGxCaps systemCaps;
memcpy(&systemCaps, GxCaps(), sizeof(systemCaps)); memcpy(&systemCaps, GxCaps(), sizeof(systemCaps));
uint32_t maxTextureSize = systemCaps.m_maxTextureSize; auto maxTextureSize = systemCaps.m_texMaxSize[GxTex_2d];
if (maxTextureSize) { if (maxTextureSize) {
while (*height > maxTextureSize || *width > maxTextureSize) { while (*height > maxTextureSize || *width > maxTextureSize) {