LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 00:02:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improved performance of ImageData:mapPixel (now up to 2x as fast as in 0.8.0!); love.graphics.newImage, Image:refresh, love.window.setIcon, and ImageRasterizers now prevent other threads from modifying the ImageData used in those functions until they're done accessing it

Browse Source
This commit is contained in:
Alex Szpakowski
2013-06-25 05:28:20 -03:00
parent 8d7e0b5629
commit 6e3a7288dd
8 changed files with 191 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Image.cpp
+17 -1
View File
@@ -165,6 +165,7 @@ void Image::uploadCompressedMipmaps()
void Image::createMipmaps()
{
// Only valid for Images created with ImageData.
if (!data)
return;
@@ -183,6 +184,9 @@ void Image::createMipmaps()
bind();
// Prevent other threads from changing the ImageData while we upload it.
love::thread::Lock lock(data->getMutex());
if (hasNpot() && (GLEE_VERSION_3_0 || GLEE_ARB_framebuffer_object))
{
// AMD/ATI drivers have several bugs when generating mipmaps,
@@ -376,6 +380,9 @@ bool Image::loadVolatilePOT()
vertices[2].s = s;
vertices[3].s = s;
// We want this lock to potentially cover mipmap creation as well.
love::thread::EmptyLock lock;
while (glGetError() != GL_NO_ERROR); // clear errors
if (isCompressed() && cdata)
@@ -407,6 +414,7 @@ bool Image::loadVolatilePOT()
GL_UNSIGNED_BYTE,
0);
lock.setLock(data->getMutex());
glTexSubImage2D(GL_TEXTURE_2D,
0,
0, 0,
@@ -436,6 +444,9 @@ bool Image::loadVolatileNPOT()
filter.anisotropy = gl.setTextureFilter(filter);
gl.setTextureWrap(wrap);
// We want this lock to potentially cover mipmap creation as well.
love::thread::EmptyLock lock;
while (glGetError() != GL_NO_ERROR); // clear errors
if (isCompressed() && cdata)
@@ -452,6 +463,7 @@ bool Image::loadVolatileNPOT()
}
else if (data)
{
lock.setLock(data->getMutex());
glTexImage2D(GL_TEXTURE_2D,
0,
GL_RGBA8,
@@ -490,6 +502,9 @@ bool Image::refresh()
if (texture == 0)
return false;
// We want this lock to potentially cover mipmap creation as well.
love::thread::EmptyLock lock;
bind();
if (isCompressed() && cdata)
@@ -497,7 +512,7 @@ bool Image::refresh()
GLenum format = getCompressedFormat(cdata->getType());
glCompressedTexSubImage2DARB(GL_TEXTURE_2D,
0,
0, 0,
0, 0,
cdata->getWidth(0),
cdata->getHeight(0),
format,
@@ -506,6 +521,7 @@ bool Image::refresh()
}
else if (data)
{
lock.setLock(data->getMutex());
glTexSubImage2D(GL_TEXTURE_2D,
0,
0, 0,