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

am 37577cb6: am 05832ade: Merge "opengles Translator: fix uncompress palleted A1 textures"

Browse Source 
* commit '37577cb6ff4b68d4dde88238ba8bc0f545b2cddb':
  opengles Translator: fix uncompress palleted A1 textures
This commit is contained in:
David Turner
2011-07-11 15:56:59 -07:00
committed by Android Git Automerger
parent 333a2f8147 37577cb6ff
commit 87c04589e4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/emulator/opengl/host/libs/Translator/GLcommon/TextureUtils.cpp
View File

@@ -45,10 +45,10 @@ void getPaletteInfo(GLenum internalFormat,unsigned int& indexSizeBits,unsigned i
break; break;
case GL_PALETTE4_RGBA4_OES: case GL_PALETTE4_RGBA4_OES:
case GL_PALETTE4_RGB5_A1_OES:
colorFrmt = GL_RGBA; colorFrmt = GL_RGBA;
/* fall-through */ /* fall-through */
case GL_PALETTE4_R5_G6_B5_OES: case GL_PALETTE4_R5_G6_B5_OES:
case GL_PALETTE4_RGB5_A1_OES:
indexSizeBits = 4; indexSizeBits = 4;
colorSizeBytes = 2; colorSizeBytes = 2;
break; break;
@@ -65,10 +65,10 @@ void getPaletteInfo(GLenum internalFormat,unsigned int& indexSizeBits,unsigned i
break; break;
case GL_PALETTE8_RGBA4_OES: case GL_PALETTE8_RGBA4_OES:
case GL_PALETTE8_RGB5_A1_OES:
colorFrmt = GL_RGBA; colorFrmt = GL_RGBA;
/* fall-through */ /* fall-through */
case GL_PALETTE8_R5_G6_B5_OES: case GL_PALETTE8_R5_G6_B5_OES:
case GL_PALETTE8_RGB5_A1_OES:
indexSizeBits = 8; indexSizeBits = 8;
colorSizeBytes = 2; colorSizeBytes = 2;
break; break;
@@ -100,7 +100,7 @@ Color paletteColor(const unsigned char* pallete,unsigned int index,GLenum format
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)*255/31,((s >> 6) & 0x1f)*255/31,((s >> 1) & 0x1f)*255/31 ,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);
} }