mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-04 10:34:01 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of /home/fg/fgone/Aquaria_fg_clean

Browse source
This commit is contained in:
fgenesis 2012-06-15 04:24:23 +00:00
commit e5b0a81bea
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
BBGE/Texture.cpp
View file

@ -821,7 +821,7 @@ static unsigned int clp2(unsigned int x)
unsigned char * Texture::getBufferAndSize(int *wparam, int *hparam, unsigned int *sizeparam) unsigned char * Texture::getBufferAndSize(int *wparam, int *hparam, unsigned int *sizeparam)
{ {
unsigned char *data = NULL; unsigned char *data = NULL;
unsigned int size = 0; unsigned int size = 0, allocsize = 0;
int tw = 0, th = 0; int tw = 0, th = 0;
int w = 0, h = 0; int w = 0, h = 0;
@ -848,12 +848,13 @@ unsigned char * Texture::getBufferAndSize(int *wparam, int *hparam, unsigned int
h = h > th ? h : th; h = h > th ? h : th;
} }
size = w * h * 4 * textureMemoryMultiplier; size = w * h * 4;
if (!size) if (!size)
goto fail; goto fail;
data = (unsigned char*)malloc(size + 32); allocsize = size * textureMemoryMultiplier;
memcpy(data + size, "SAFE", 5);
data = (unsigned char*)malloc(allocsize + 32);
if (!data) if (!data)
{ {
std::ostringstream os; std::ostringstream os;
@ -861,11 +862,12 @@ unsigned char * Texture::getBufferAndSize(int *wparam, int *hparam, unsigned int
errorLog(os.str()); errorLog(os.str());
goto fail; goto fail;
} }
memcpy(data + allocsize, "SAFE", 5);
glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, data); glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
// Not sure but this might be the case with nouveau drivers on linux... still investigating. -- fg // Not sure but this might be the case with nouveau drivers on linux... still investigating. -- fg
if(memcmp(data + size, "SAFE", 5)) if(memcmp(data + allocsize, "SAFE", 5))
{ {
errorLog("Texture::getBufferAndSize(): Broken graphics driver! Wrote past end of buffer!"); errorLog("Texture::getBufferAndSize(): Broken graphics driver! Wrote past end of buffer!");
free(data); // in case we are here, this will most likely cause a crash. free(data); // in case we are here, this will most likely cause a crash.