LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 07c26fbf: am 2a223529: Merge "1.1 Translator: fix conversion of compressed textures"

Browse Source 
* commit '07c26fbfa7f70ec37418352a48530cfeaf576d16':
  1.1 Translator: fix conversion of compressed textures
This commit is contained in:
David Turner
2011-07-06 07:44:58 -07:00
committed by Android Git Automerger
parent 2d301233f3 07c26fbfa7
commit d23b43e463
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/emulator/opengl/host/libs/Translator/GLES_CM/TextureUtils.cpp
View File

@@ -87,19 +87,20 @@ Color paletteColor(const unsigned char* pallete,unsigned int index,GLenum format
case GL_PALETTE8_R5_G6_B5_OES: case GL_PALETTE8_R5_G6_B5_OES:
case GL_PALETTE4_R5_G6_B5_OES: case GL_PALETTE4_R5_G6_B5_OES:
s = *((short *)(pallete+index)); s = *((short *)(pallete+index));
return Color(s >> 10,(s >> 5) & 0x3f ,s & 0x1f,0); return Color((s >> 11)*255/31,((s >> 5) & 0x3f)*255/63 ,(s & 0x1f)*255/31,0);
//RGBA //RGBA
case GL_PALETTE4_RGBA8_OES: case GL_PALETTE4_RGBA8_OES:
case GL_PALETTE8_RGBA8_OES: case GL_PALETTE8_RGBA8_OES:
return Color(pallete[index],pallete[index+1],pallete[index+2],pallete[index+3]); return Color(pallete[index],pallete[index+1],pallete[index+2],pallete[index+3]);
case GL_PALETTE4_RGBA4_OES: case GL_PALETTE4_RGBA4_OES:
case GL_PALETTE8_RGBA4_OES:
s = *((short *)(pallete+index)); s = *((short *)(pallete+index));
return Color((s >> 12) & 0xf,(s >> 8) & 0xf,(s >> 4) & 0xf ,s & 0xf); return Color(((s >> 12) & 0xf)*255/15,((s >> 8) & 0xf)*255/15,((s >> 4) & 0xf)*255/15 ,(s & 0xf)*255/15);
case GL_PALETTE4_RGB5_A1_OES: case GL_PALETTE4_RGB5_A1_OES:
case GL_PALETTE8_RGB5_A1_OES: case GL_PALETTE8_RGB5_A1_OES:
s = *((short *)(pallete+index)); s = *((short *)(pallete+index));
return Color((s >> 11) & 0x1f,(s >> 6) & 0x1f,(s >> 1) & 0x1f ,s & 0x1 * 255); return Color(((s >> 11) & 0x1f)*255/31,((s >> 6) & 0x1f)*255/31,((s >> 1) & 0x1f)*255/31 ,s & 0x1 * 255);
default: default:
return Color(255,255,255,255); return Color(255,255,255,255);
} }
@@ -148,7 +149,8 @@ unsigned char* uncompressTexture(GLenum internalformat,GLenum& formatOut,GLsizei
int paletteIndex = 0; int paletteIndex = 0;
int indexOut = i*colorSizeOut; int indexOut = i*colorSizeOut;
if(indexSizeBits == 4) { if(indexSizeBits == 4) {
paletteIndex = (i%2)? imageIndices[i/2] >> 4: //upper bits paletteIndex = (i%2) == 0 ?
imageIndices[i/2] >> 4: //upper bits
imageIndices[i/2] & 0xf; //lower bits imageIndices[i/2] & 0xf; //lower bits
} else { } else {
paletteIndex = imageIndices[i]; paletteIndex = imageIndices[i];