AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-14 10:05:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to avoid crashing if CreateVb/Tex fails with E_OUTOFMEMORY and if CreateTex fails with D3DERR_OUTOFVIDEOMEMORY (Thanks Henry242)

Browse Source
This commit is contained in:
UnknownShadow200 2020-10-27 23:55:43 +11:00
parent a99e3d8121
commit 25e8a4dfcc
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/Graphics.c
View File

@ -481,6 +481,17 @@ static void Gfx_RestoreState(void) {
D3D9_RestoreRenderStates(); D3D9_RestoreRenderStates();
} }
static cc_bool D3D9_CheckResult(cc_result res, const char* func) {
if (!res) return true;
if (res == D3DERR_OUTOFVIDEOMEMORY || res == E_OUTOFMEMORY) {
Event_RaiseVoid(&GfxEvents.LowVRAMDetected);
} else {
Logger_Abort2(res, func);
}
return false;
}
/*########################################################################################################################* /*########################################################################################################################*
*---------------------------------------------------------Textures--------------------------------------------------------* *---------------------------------------------------------Textures--------------------------------------------------------*
@ -545,6 +556,7 @@ static void D3D9_DoMipmaps(IDirect3DTexture9* texture, int x, int y, struct Bitm
GfxResourceID Gfx_CreateTexture(struct Bitmap* bmp, cc_bool managedPool, cc_bool mipmaps) { GfxResourceID Gfx_CreateTexture(struct Bitmap* bmp, cc_bool managedPool, cc_bool mipmaps) {
IDirect3DTexture9* tex; IDirect3DTexture9* tex;
IDirect3DTexture9* sys;
cc_result res; cc_result res;
int mipmapsLevels = CalcMipmapsLevels(bmp->width, bmp->height); int mipmapsLevels = CalcMipmapsLevels(bmp->width, bmp->height);
int levels = 1 + (mipmaps ? mipmapsLevels : 0); int levels = 1 + (mipmaps ? mipmapsLevels : 0);
@ -555,24 +567,29 @@ GfxResourceID Gfx_CreateTexture(struct Bitmap* bmp, cc_bool managedPool, cc_bool
if (Gfx.LostContext) return 0; if (Gfx.LostContext) return 0;
if (managedPool) { if (managedPool) {
res = IDirect3DDevice9_CreateTexture(device, bmp->width, bmp->height, levels, for (;;) {
0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &tex, NULL); res = IDirect3DDevice9_CreateTexture(device, bmp->width, bmp->height, levels,
if (res) Logger_Abort2(res, "D3D9_CreateTexture"); 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &tex, NULL);
if (D3D9_CheckResult(res, "D3D9_CreateTexture failed")) break;
}
D3D9_SetTextureData(tex, bmp, 0); D3D9_SetTextureData(tex, bmp, 0);
if (mipmaps) D3D9_DoMipmaps(tex, 0, 0, bmp, bmp->width, false); if (mipmaps) D3D9_DoMipmaps(tex, 0, 0, bmp, bmp->width, false);
} else { } else {
IDirect3DTexture9* sys; for (;;) {
res = IDirect3DDevice9_CreateTexture(device, bmp->width, bmp->height, levels, res = IDirect3DDevice9_CreateTexture(device, bmp->width, bmp->height, levels,
0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &sys, NULL); 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &sys, NULL);
if (res) Logger_Abort2(res, "D3D9_CreateTexture - SystemMem"); if (D3D9_CheckResult(res, "D3D9_CreateSysTexture failed")) break;
}
D3D9_SetTextureData(sys, bmp, 0); D3D9_SetTextureData(sys, bmp, 0);
if (mipmaps) D3D9_DoMipmaps(sys, 0, 0, bmp, bmp->width, false); if (mipmaps) D3D9_DoMipmaps(sys, 0, 0, bmp, bmp->width, false);
res = IDirect3DDevice9_CreateTexture(device, bmp->width, bmp->height, levels, for (;;) {
0, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex, NULL); res = IDirect3DDevice9_CreateTexture(device, bmp->width, bmp->height, levels,
if (res) Logger_Abort2(res, "D3D9_CreateTexture - GPU"); 0, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &tex, NULL);
if (D3D9_CheckResult(res, "D3D9_CreateGPUTexture failed")) break;
}
res = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9*)sys, (IDirect3DBaseTexture9*)tex); res = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9*)sys, (IDirect3DBaseTexture9*)tex);
if (res) Logger_Abort2(res, "D3D9_CreateTexture - Update"); if (res) Logger_Abort2(res, "D3D9_CreateTexture - Update");
@ -755,11 +772,8 @@ static IDirect3DVertexBuffer9* D3D9_AllocVertexBuffer(VertexFormat fmt, int coun
for (;;) { for (;;) {
res = IDirect3DDevice9_CreateVertexBuffer(device, size, usage, res = IDirect3DDevice9_CreateVertexBuffer(device, size, usage,
d3d9_formatMappings[fmt], D3DPOOL_DEFAULT, &vbuffer, NULL); d3d9_formatMappings[fmt], D3DPOOL_DEFAULT, &vbuffer, NULL);
if (!res) break; if (D3D9_CheckResult(res, "D3D9_CreateVb failed")) break;
if (res != D3DERR_OUTOFVIDEOMEMORY) Logger_Abort2(res, "D3D9_CreateVb");
Event_RaiseVoid(&GfxEvents.LowVRAMDetected);
} }
return vbuffer; return vbuffer;
} }