kraken_engine/kraken
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TGA Images working once again on iOS and OSX runtimes.

Browse Source 
Image import / compression pipeline fixed -- was broken with TGA support
Corrected TGA RLE decompression -- 24bpp RLE compressed TGA's now tested and working.
No longer attempting to generate mipmaps for cube maps automatically at runtime.

--HG--
branch : nfb
This commit is contained in:
Kearwood Gilbert
2014-01-24 02:13:34 -08:00
parent 2ec9d5cf76
commit d906f67f76
5 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
KREngine/kraken/KRTexture.cpp
View File

@@ -79,9 +79,7 @@ void KRTexture::resize(int max_dim)
if(!createGLTexture(target_dim)) { if(!createGLTexture(target_dim)) {
getContext().getTextureManager()->memoryChanged(-m_newTextureMemUsed); getContext().getTextureManager()->memoryChanged(-m_newTextureMemUsed);
m_newTextureMemUsed = 0; m_newTextureMemUsed = 0;
// assert(false); assert(false); // Failed to create the texture
// FINDME - assert commented out .. this crashes the app when running in the debug UI and changing 'Debug-Display' to show the framerate
// the FPS doesn't draw anymore either (the drop shadow draws but the text doesn't)
} }
} }
} }

6
KREngine/kraken/KRTextureCube.cpp
View File

@@ -89,9 +89,9 @@ bool KRTextureCube::createGLTexture(int lod_max_dim)
if(bMipMaps) { if(bMipMaps) {
GLDEBUG(glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR)); GLDEBUG(glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR));
} else { } else {
// GLDEBUG(glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR)); GLDEBUG(glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR));
GLDEBUG(glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR)); // GLDEBUG(glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR));
GLDEBUG(glGenerateMipmap(GL_TEXTURE_CUBE_MAP)); // GLDEBUG(glGenerateMipmap(GL_TEXTURE_CUBE_MAP));
} }

4
KREngine/kraken/KRTextureManager.cpp
View File

@@ -329,10 +329,6 @@ void KRTextureManager::balanceTextureMemory()
} }
} }
if (maxDimActive > 512) maxDimActive = 512; // FINDME - hack to stop the texture resizer from blowing out its brains ..
// when the texture quality goes up to 1024, the app runs for about 2 mins and then
// runs out of memory.
// Resize active textures to balance the memory usage and mipmap levels // Resize active textures to balance the memory usage and mipmap levels
for(std::set<KRTexture *>::iterator itr=m_activeTextures_streamer.begin(); itr != m_activeTextures_streamer.end() && memory_available > 0; itr++) { for(std::set<KRTexture *>::iterator itr=m_activeTextures_streamer.begin(); itr != m_activeTextures_streamer.end() && memory_available > 0; itr++) {
KRTexture *activeTexture = *itr; KRTexture *activeTexture = *itr;

24
KREngine/kraken/KRTextureTGA.cpp
View File

@@ -77,17 +77,15 @@ bool KRTextureTGA::uploadTexture(GLenum target, int lod_max_dim, int &current_lo
TGA_HEADER *pHeader = (TGA_HEADER *)m_pData->getStart(); TGA_HEADER *pHeader = (TGA_HEADER *)m_pData->getStart();
unsigned char *pData = (unsigned char *)pHeader + (long)pHeader->idlength + (long)pHeader->colourmaplength * (long)pHeader->colourmaptype + sizeof(TGA_HEADER); unsigned char *pData = (unsigned char *)pHeader + (long)pHeader->idlength + (long)pHeader->colourmaplength * (long)pHeader->colourmaptype + sizeof(TGA_HEADER);
// #if TARGET_OS_IPHONEz
// FINDME - many of the GL constants in here are not defined in GLES2
#ifdef TARGET_OS_IPHONE
GLenum base_internal_format = GL_BGRA; GLenum base_internal_format = GL_BGRA;
#else #else
GLenum base_internal_format = pHeader->bitsperpixel == 24 ? GL_BGR : GL_BGRA; GLenum base_internal_format = pHeader->bitsperpixel == 24 ? GL_BGR : GL_BGRA;
#endif #endif
GLenum internal_format = 0; GLenum internal_format = GL_RGBA;
#ifndef TARGET_OS_IPHONE #if !TARGET_OS_IPHONE
if(compress) { if(compress) {
internal_format = pHeader->bitsperpixel == 24 ? GL_COMPRESSED_RGB_S3TC_DXT1_EXT : GL_COMPRESSED_RGBA_S3TC_DXT5_EXT; internal_format = pHeader->bitsperpixel == 24 ? GL_COMPRESSED_RGB_S3TC_DXT1_EXT : GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
} }
@@ -169,7 +167,7 @@ bool KRTextureTGA::uploadTexture(GLenum target, int lod_max_dim, int &current_lo
break; break;
case 10: // rgb + rle case 10: // rgb + rle
switch(pHeader->bitsperpixel) { switch(pHeader->bitsperpixel) {
case 24: case 32:
{ {
unsigned char *converted_image = (unsigned char *)malloc(pHeader->width * pHeader->height * 4); unsigned char *converted_image = (unsigned char *)malloc(pHeader->width * pHeader->height * 4);
unsigned char *pSource = pData; unsigned char *pSource = pData;
@@ -177,7 +175,7 @@ bool KRTextureTGA::uploadTexture(GLenum target, int lod_max_dim, int &current_lo
unsigned char *pEnd = converted_image + pHeader->height * pHeader->width * 4; unsigned char *pEnd = converted_image + pHeader->height * pHeader->width * 4;
if(premultiply_alpha) { if(premultiply_alpha) {
while(pDest < pEnd) { while(pDest < pEnd) {
int count = *pSource & 0x7f + 1; int count = (*pSource & 0x7f) + 1;
if(*pSource & 0x80) { if(*pSource & 0x80) {
// RLE Packet // RLE Packet
pSource++; pSource++;
@@ -202,7 +200,7 @@ bool KRTextureTGA::uploadTexture(GLenum target, int lod_max_dim, int &current_lo
} }
} else { } else {
while(pDest < pEnd) { while(pDest < pEnd) {
int count = *pSource & 0x7f + 1; int count = (*pSource & 0x7f) + 1;
if(*pSource & 0x80) { if(*pSource & 0x80) {
// RLE Packet // RLE Packet
pSource++; pSource++;
@@ -236,14 +234,14 @@ bool KRTextureTGA::uploadTexture(GLenum target, int lod_max_dim, int &current_lo
current_lod_max_dim = m_max_lod_max_dim; current_lod_max_dim = m_max_lod_max_dim;
} }
break; break;
case 32: case 24:
{ {
unsigned char *converted_image = (unsigned char *)malloc(pHeader->width * pHeader->height * 4); unsigned char *converted_image = (unsigned char *)malloc(pHeader->width * pHeader->height * 4);
unsigned char *pSource = pData; unsigned char *pSource = pData;
unsigned char *pDest = converted_image; unsigned char *pDest = converted_image;
unsigned char *pEnd = converted_image + pHeader->height * pHeader->width * 4; unsigned char *pEnd = converted_image + pHeader->height * pHeader->width * 4;
while(pDest < pEnd) { while(pDest < pEnd) {
int count = *pSource & 0x7f + 1; int count = (*pSource & 0x7f) + 1;
if(*pSource & 0x80) { if(*pSource & 0x80) {
// RLE Packet // RLE Packet
pSource++; pSource++;
@@ -290,6 +288,8 @@ bool KRTextureTGA::uploadTexture(GLenum target, int lod_max_dim, int &current_lo
return true; return true;
} }
#if !TARGET_OS_IPHONE
KRTexture *KRTextureTGA::compress(bool premultiply_alpha) KRTexture *KRTextureTGA::compress(bool premultiply_alpha)
{ {
m_pData->lock(); m_pData->lock();
@@ -311,7 +311,7 @@ KRTexture *KRTextureTGA::compress(bool premultiply_alpha)
GLint width = 0, height = 0, internal_format, base_internal_format; GLint width = 0, height = 0, internal_format, base_internal_format;
#ifndef TARGET_OS_IPHONE
GLDEBUG(glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width)); GLDEBUG(glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width));
GLDEBUG(glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &height)); GLDEBUG(glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &height));
GLDEBUG(glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT, &internal_format)); GLDEBUG(glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT, &internal_format));
@@ -350,7 +350,6 @@ KRTexture *KRTextureTGA::compress(bool premultiply_alpha)
// err will equal GL_INVALID_VALUE when // err will equal GL_INVALID_VALUE when
// assert(false); // Unexpected error // assert(false); // Unexpected error
} }
#endif
GLDEBUG(glBindTexture(GL_TEXTURE_2D, 0)); GLDEBUG(glBindTexture(GL_TEXTURE_2D, 0));
getContext().getTextureManager()->selectTexture(0, NULL); getContext().getTextureManager()->selectTexture(0, NULL);
@@ -369,6 +368,7 @@ KRTexture *KRTextureTGA::compress(bool premultiply_alpha)
return new_texture; return new_texture;
} }
#endif
long KRTextureTGA::getMemRequiredForSize(int max_dim) long KRTextureTGA::getMemRequiredForSize(int max_dim)
{ {

3
KREngine/kraken/KRTextureTGA.h
View File

@@ -19,7 +19,10 @@ public:
virtual std::string getExtension(); virtual std::string getExtension();
bool uploadTexture(GLenum target, int lod_max_dim, int &current_lod_max_dim, int prev_lod_max_dim, bool compress = false, bool premultiply_alpha = false); bool uploadTexture(GLenum target, int lod_max_dim, int &current_lod_max_dim, int prev_lod_max_dim, bool compress = false, bool premultiply_alpha = false);
#if !TARGET_OS_IPHONE
virtual KRTexture *compress(bool premultiply_alpha = false); virtual KRTexture *compress(bool premultiply_alpha = false);
#endif
virtual long getMemRequiredForSize(int max_dim); virtual long getMemRequiredForSize(int max_dim);
private: private: