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

Cleaned up and simplified some graphics code.

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2014-10-26 15:31:32 -03:00
parent d4be84a630
commit 5eb37d30f7
8 changed files with 55 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Image.cpp
+12 -15
View File
@@ -365,20 +365,6 @@ void Image::unloadVolatile()
}
}
void Image::uploadImageData(int xoffset, int yoffset, int w, int h)
{
const image::pixel *pdata = (const image::pixel *) data->getData();
pdata += yoffset * data->getWidth() + xoffset;
{
thread::Lock lock(data->getMutex());
glTexSubImage2D(GL_TEXTURE_2D, 0, xoffset, yoffset, w, h, GL_RGBA,
GL_UNSIGNED_BYTE, pdata);
}
generateMipmaps();
}
bool Image::refresh(int xoffset, int yoffset, int w, int h)
{
// No effect if the texture hasn't been created yet.
@@ -396,7 +382,18 @@ bool Image::refresh(int xoffset, int yoffset, int w, int h)
if (isCompressed())
loadTextureFromCompressedData();
else
uploadImageData(xoffset, yoffset, w, h);
{
const image::pixel *pdata = (const image::pixel *) data->getData();
pdata += yoffset * data->getWidth() + xoffset;
{
thread::Lock lock(data->getMutex());
glTexSubImage2D(GL_TEXTURE_2D, 0, xoffset, yoffset, w, h, GL_RGBA,
GL_UNSIGNED_BYTE, pdata);
}
generateMipmaps();
}
return true;
}