Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed the Qt images to load in buffers using dimensions multiple of power 2. Simplified the memory management as well.

Browse Source
This commit is contained in:
Xawotihs
2010-12-22 22:20:20 +00:00
parent a5c5a9d60b
commit 7a0bf2c78c
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JGE/include/JTypes.h
-4
View File
@@ -338,10 +338,6 @@ public:
int mFilter; int mFilter;
#if defined (QT_CONFIG)
QImage mImage;
#endif
#if defined (WIN32) || defined (LINUX) || defined (IOS) #if defined (WIN32) || defined (LINUX) || defined (IOS)
GLuint mTexId; GLuint mTexId;
u8* mBuffer; u8* mBuffer;
JGE/src/pc/JGfx.cpp
+11 -11
View File
@@ -353,9 +353,7 @@ JTexture::~JTexture()
if (mBuffer) if (mBuffer)
{ {
#ifndef QT_CONFIG
delete [] mBuffer; delete [] mBuffer;
#endif
mBuffer = NULL; mBuffer = NULL;
} }
} }
@@ -2118,18 +2116,22 @@ JTexture* JRenderer::LoadTexture(const char* filename, int mode, int TextureForm
if (tex) if (tex)
{ {
tmpImage = tmpImage.convertToFormat(QImage::Format_ARGB32_Premultiplied); tmpImage = tmpImage.convertToFormat(QImage::Format_ARGB32_Premultiplied);
tex->mImage = tmpImage.rgbSwapped(); tmpImage = tmpImage.rgbSwapped();
if (mImageFilter != NULL) if (mImageFilter != NULL)
mImageFilter->ProcessImage((PIXEL_TYPE*)tex->mImage.bits(), tex->mImage.width(), tex->mImage.height()); mImageFilter->ProcessImage((PIXEL_TYPE*)tmpImage.bits(), tmpImage.width(), tmpImage.height());
tex->mFilter = TEX_FILTER_LINEAR; tex->mFilter = TEX_FILTER_LINEAR;
tex->mWidth = tex->mImage.width(); tex->mWidth = tmpImage.width();
tex->mHeight = tex->mImage.height(); tex->mHeight = tmpImage.height();
tex->mTexWidth = tex->mImage.width(); tex->mTexWidth = getNextPower2(tmpImage.width());
tex->mTexHeight = tex->mImage.height(); tex->mTexHeight = getNextPower2(tmpImage.height());;
tex->mBuffer = new BYTE[tex->mTexWidth*tex->mTexHeight*4];
tex->mBuffer = tex->mImage.bits(); for(int i=0; i < tex->mHeight; i++)
{
memcpy(tex->mBuffer+(i*4*tex->mTexWidth), tmpImage.constScanLine(i), tmpImage.bytesPerLine());
}
} }
} while(false); } while(false);
@@ -2187,9 +2189,7 @@ void JRenderer::TransferTextureToGLContext(JTexture& inTexture)
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, inTexture.mTexWidth, inTexture.mTexHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, inTexture.mBuffer); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, inTexture.mTexWidth, inTexture.mTexHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, inTexture.mBuffer);
} }
} }
#ifndef QT_CONFIG
delete [] inTexture.mBuffer; delete [] inTexture.mBuffer;
#endif
inTexture.mBuffer = NULL; inTexture.mBuffer = NULL;
checkGlError(); checkGlError();