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

feat(gx): set supported texture formats in gx caps

Browse Source
This commit is contained in:
fallenoak 2023-03-09 23:10:25 -06:00 committed by GitHub
parent 907c3faf8f
commit 9fe6bc9cd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gx/CGxCaps.hpp
View File

@ -14,11 +14,9 @@ class CGxCaps {
EGxColorFormat m_colorFormat = GxCF_argb; EGxColorFormat m_colorFormat = GxCF_argb;
uint32_t m_maxIndex = 0; uint32_t m_maxIndex = 0;
int32_t m_generateMipMaps = 0; int32_t m_generateMipMaps = 0;
int32_t m_texFmt[GxTexFormats_Last] = { 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];
int32_t m_texFmtDxt1 = 0;
int32_t m_texFmtDxt3 = 0;
int32_t m_texFmtDxt5 = 0;
EGxShVS m_vertexShaderTarget = GxShVS_none; EGxShVS m_vertexShaderTarget = GxShVS_none;
EGxShPS m_pixelShaderTarget = GxShPS_none; EGxShPS m_pixelShaderTarget = GxShPS_none;
int32_t m_texFilterTrilinear = 0; int32_t m_texFilterTrilinear = 0;

6
src/gx/Texture.cpp
View File

@ -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) { void GetTextureFormats(PIXEL_FORMAT* pixFormat, EGxTexFormat* gxTexFormat, PIXEL_FORMAT preferredFormat, int32_t alphaBits) {
switch (preferredFormat) { switch (preferredFormat) {
case PIXEL_DXT1: case PIXEL_DXT1:
if (GxCaps().m_texFmtDxt1) { if (GxCaps().m_texFmt[GxTex_Dxt1]) {
*gxTexFormat = GxTex_Dxt1; *gxTexFormat = GxTex_Dxt1;
*pixFormat = PIXEL_DXT1; *pixFormat = PIXEL_DXT1;
} else if (alphaBits) { } else if (alphaBits) {
@ -408,7 +408,7 @@ void GetTextureFormats(PIXEL_FORMAT* pixFormat, EGxTexFormat* gxTexFormat, PIXEL
break; break;
case PIXEL_DXT3: case PIXEL_DXT3:
if (GxCaps().m_texFmtDxt3) { if (GxCaps().m_texFmt[GxTex_Dxt3]) {
*gxTexFormat = GxTex_Dxt3; *gxTexFormat = GxTex_Dxt3;
*pixFormat = PIXEL_DXT3; *pixFormat = PIXEL_DXT3;
} else { } else {
@ -443,7 +443,7 @@ void GetTextureFormats(PIXEL_FORMAT* pixFormat, EGxTexFormat* gxTexFormat, PIXEL
break; break;
case PIXEL_DXT5: case PIXEL_DXT5:
if (GxCaps().m_texFmtDxt5) { if (GxCaps().m_texFmt[GxTex_Dxt5]) {
*gxTexFormat = GxTex_Dxt5; *gxTexFormat = GxTex_Dxt5;
*pixFormat = PIXEL_DXT5; *pixFormat = PIXEL_DXT5;
} else { } else {

18
src/gx/d3d/CGxDeviceD3d.cpp
View File

@ -480,6 +480,7 @@ int32_t CGxDeviceD3d::ICreateD3dDevice(const CGxFormat& format) {
if (SUCCEEDED(this->m_d3d->CreateDevice(0, D3DDEVTYPE_HAL, this->m_hwnd, behaviorFlags, &d3dpp, &this->m_d3dDevice))) { if (SUCCEEDED(this->m_d3d->CreateDevice(0, D3DDEVTYPE_HAL, this->m_hwnd, behaviorFlags, &d3dpp, &this->m_d3dDevice))) {
// TODO // TODO
this->m_devAdapterFormat = d3dpp.BackBufferFormat;
this->m_context = 1; this->m_context = 1;
// TODO // TODO
@ -702,7 +703,22 @@ void CGxDeviceD3d::ISetCaps(const CGxFormat& format) {
// TODO modify shader targets based on format // TODO modify shader targets based on format
// TODO // Texture formats
for (int32_t i = 0; i < GxTexFormats_Last; i++) {
if (i == GxTex_Unknown) {
this->m_caps.m_texFmt[i] = 0;
} else {
this->m_caps.m_texFmt[i] = this->m_d3d->CheckDeviceFormat(
0,
D3DDEVTYPE_HAL,
this->m_devAdapterFormat,
0,
D3DRTYPE_TEXTURE,
CGxDeviceD3d::s_GxTexFmtToD3dFmt[i]
) == D3D_OK;
}
}
this->m_caps.m_generateMipMaps = (this->m_d3dCaps.Caps2 & D3DCAPS2_CANAUTOGENMIPMAP) != 0; this->m_caps.m_generateMipMaps = (this->m_d3dCaps.Caps2 & D3DCAPS2_CANAUTOGENMIPMAP) != 0;

1
src/gx/d3d/CGxDeviceD3d.hpp
View File

@ -218,6 +218,7 @@ class CGxDeviceD3d : public CGxDevice {
D3DCAPS9 m_d3dCaps; D3DCAPS9 m_d3dCaps;
int32_t m_d3dIsHwDevice = 0; int32_t m_d3dIsHwDevice = 0;
D3DDISPLAYMODE m_desktopDisplayMode; D3DDISPLAYMODE m_desktopDisplayMode;
D3DFORMAT m_devAdapterFormat;
uint32_t m_deviceStates[DeviceStates_Last]; uint32_t m_deviceStates[DeviceStates_Last];
// Virtual member functions // Virtual member functions

6
src/gx/gll/CGxDeviceGLL.cpp
View File

@ -672,9 +672,9 @@ void CGxDeviceGLL::ISetCaps(const CGxFormat& format) {
this->m_caps.m_generateMipMaps = 1; this->m_caps.m_generateMipMaps = 1;
this->m_caps.m_texFmtDxt1 = 1; this->m_caps.m_texFmt[GxTex_Dxt1] = 1;
this->m_caps.m_texFmtDxt3 = 1; this->m_caps.m_texFmt[GxTex_Dxt3] = 1;
this->m_caps.m_texFmtDxt5 = 1; this->m_caps.m_texFmt[GxTex_Dxt5] = 1;
this->m_caps.m_vertexShaderTarget = GxShVS_arbvp1; this->m_caps.m_vertexShaderTarget = GxShVS_arbvp1;
this->m_caps.m_pixelShaderTarget = GxShPS_arbfp1; this->m_caps.m_pixelShaderTarget = GxShPS_arbfp1;