ecker/GLdc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle running out of PVR memory correctly

Browse Source
This commit is contained in:
Luke Benstead 2021-09-04 12:13:59 +01:00
parent efc75db05c
commit 3332dfa74a
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
GL/texture.c
View File

@ -665,6 +665,14 @@ void APIENTRY glCompressedTexImage2DARB(GLenum target,
active->data = yalloc_alloc_and_defrag(imageSize); active->data = yalloc_alloc_and_defrag(imageSize);
assert(active->data); // Debug assert
if(!active->data) { // Release, bail out "gracefully"
_glKosThrowError(GL_OUT_OF_MEMORY, __func__);
_glKosPrintError();
return;
}
if(data) { if(data) {
FASTCPY(active->data, data, imageSize); FASTCPY(active->data, data, imageSize);
} }
@ -1011,6 +1019,12 @@ void _glAllocateSpaceForMipmaps(TextureObject* active) {
active->data = yalloc_alloc_and_defrag(bytes); active->data = yalloc_alloc_and_defrag(bytes);
assert(active->data);
if(!active->data) {
free(temp);
return;
}
/* If there was existing data, then copy it where it should go */ /* If there was existing data, then copy it where it should go */
memcpy(_glGetMipmapLocation(active, 0), temp, size); memcpy(_glGetMipmapLocation(active, 0), temp, size);
@ -1168,7 +1182,6 @@ void APIENTRY glTexImage2D(GLenum target, GLint level, GLint internalFormat,
active->data = yalloc_alloc_and_defrag(active->baseDataSize); active->data = yalloc_alloc_and_defrag(active->baseDataSize);
} }
assert(active->data);
active->isCompressed = GL_FALSE; active->isCompressed = GL_FALSE;
active->isPaletted = isPaletted; active->isPaletted = isPaletted;
} }
@ -1179,6 +1192,15 @@ void APIENTRY glTexImage2D(GLenum target, GLint level, GLint internalFormat,
_glAllocateSpaceForMipmaps(active); _glAllocateSpaceForMipmaps(active);
} }
assert(active->data);
/* If we run out of PVR memory just return */
if(!active->data) {
_glKosThrowError(GL_OUT_OF_MEMORY, __func__);
_glKosPrintError();
return;
}
/* Mark this level as set in the mipmap bitmask */ /* Mark this level as set in the mipmap bitmask */
active->mipmap |= (1 << level); active->mipmap |= (1 << level);