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

feat(gx): remove placeholder gx caps (#45)

Browse source
This commit is contained in:
fallenoak 2023-03-09 22:29:33 -06:00 • committed by GitHub
parent 0e0b57fce9
commit 907c3faf8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 57 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/gx/Texture.cpp
View file

@ -243,17 +243,17 @@ int32_t GxTexCreate(EGxTexTarget target, uint32_t width, uint32_t height, uint32
texId = nullptr;
STORM_ASSERT(target <= GxTexTargets_Last);
STORM_ASSERT(GxCaps()->m_texTarget[target] == 1);
STORM_ASSERT(GxCaps().m_texTarget[target] == 1);
STORM_ASSERT(width >= 8);
STORM_ASSERT(height >= 8);
STORM_ASSERT(width <= GxCaps()->m_texMaxSize[target]);
STORM_ASSERT(height <= GxCaps()->m_texMaxSize[target]);
STORM_ASSERT(width <= GxCaps().m_texMaxSize[target]);
STORM_ASSERT(height <= GxCaps().m_texMaxSize[target]);
STORM_ASSERT((target != GxTex_Rectangle && target != GxTex_NonPow2) ? (width & (width - 1)) == 0 : 1);
STORM_ASSERT((target != GxTex_Rectangle && target != GxTex_NonPow2) ? (height & (height - 1)) == 0 : 1);
STORM_ASSERT((target == GxTex_Rectangle) ? flags.m_filter <= GxTex_Linear : 1);
STORM_ASSERT(format <= GxTexFormats_Last);
STORM_ASSERT((flags.m_generateMipMaps) ? (GxCaps()->m_generateMipMaps && !(format >= GxTex_Dxt1 && format <= GxTex_Dxt5)) : 1);
STORM_ASSERT((flags.m_filter == GxTex_Anisotropic) ? GxCaps()->m_texFilterAnisotropic : 1);
STORM_ASSERT((flags.m_generateMipMaps) ? (GxCaps().m_generateMipMaps && !(format >= GxTex_Dxt1 && format <= GxTex_Dxt5)) : 1);
STORM_ASSERT((flags.m_filter == GxTex_Anisotropic) ? GxCaps().m_texFilterAnisotropic : 1);
STORM_ASSERT(dataFormat <= GxTexFormats_Last);
STORM_ASSERT(userFunc != nullptr);
@ -394,7 +394,7 @@ void GetDefaultTexture(uint32_t height, uint32_t width) {
void GetTextureFormats(PIXEL_FORMAT* pixFormat, EGxTexFormat* gxTexFormat, PIXEL_FORMAT preferredFormat, int32_t alphaBits) {
switch (preferredFormat) {
case PIXEL_DXT1:
if (GxCaps()->m_texFmtDxt1) {
if (GxCaps().m_texFmtDxt1) {
*gxTexFormat = GxTex_Dxt1;
*pixFormat = PIXEL_DXT1;
} else if (alphaBits) {
@ -408,7 +408,7 @@ void GetTextureFormats(PIXEL_FORMAT* pixFormat, EGxTexFormat* gxTexFormat, PIXEL
break;
case PIXEL_DXT3:
if (GxCaps()->m_texFmtDxt3) {
if (GxCaps().m_texFmtDxt3) {
*gxTexFormat = GxTex_Dxt3;
*pixFormat = PIXEL_DXT3;
} else {
@ -443,7 +443,7 @@ void GetTextureFormats(PIXEL_FORMAT* pixFormat, EGxTexFormat* gxTexFormat, PIXEL
break;
case PIXEL_DXT5:
if (GxCaps()->m_texFmtDxt5) {
if (GxCaps().m_texFmtDxt5) {
*gxTexFormat = GxTex_Dxt5;
*pixFormat = PIXEL_DXT5;
} else {
@ -508,7 +508,7 @@ 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));
memcpy(&systemCaps, &GxCaps(), sizeof(systemCaps));
auto maxTextureSize = systemCaps.m_texMaxSize[GxTex_2d];