libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-10 21:03:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GRIM/OPENGL: un-hardcode GFX operations a bit

Browse Source
This commit is contained in:
Pawel Kolodziejski 2014-07-14 08:10:08 +02:00
parent 0ba0bf20ca
commit 5ece56965c
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engines/grim/gfx_opengl.cpp
View File

@ -990,11 +990,11 @@ void GfxOpenGL::createBitmap(BitmapData *bitmap) {
for (int pic = 0; pic < bitmap->_numImages; pic++) { for (int pic = 0; pic < bitmap->_numImages; pic++) {
if (bitmap->_format == 1 && bitmap->_bpp == 16 && bitmap->_colorFormat != BM_RGB1555) { if (bitmap->_format == 1 && bitmap->_bpp == 16 && bitmap->_colorFormat != BM_RGB1555) {
if (texData == nullptr) if (texData == nullptr)
texData = new byte[4 * bitmap->_width * bitmap->_height]; texData = new byte[bytes * bitmap->_width * bitmap->_height];
// Convert data to 32-bit RGBA format // Convert data to 32-bit RGBA format
byte *texDataPtr = texData; byte *texDataPtr = texData;
uint16 *bitmapData = reinterpret_cast<uint16 *>(bitmap->getImageData(pic).getRawBuffer()); uint16 *bitmapData = reinterpret_cast<uint16 *>(bitmap->getImageData(pic).getRawBuffer());
for (int i = 0; i < bitmap->_width * bitmap->_height; i++, texDataPtr += 4, bitmapData++) { for (int i = 0; i < bitmap->_width * bitmap->_height; i++, texDataPtr += bytes, bitmapData++) {
uint16 pixel = *bitmapData; uint16 pixel = *bitmapData;
int r = pixel >> 11; int r = pixel >> 11;
texDataPtr[0] = (r << 3) | (r >> 2); texDataPtr[0] = (r << 3) | (r >> 2);
@ -1381,11 +1381,12 @@ void GfxOpenGL::createTexture(Texture *texture, const char *data, const CMap *cm
char *texdatapos = texdata; char *texdatapos = texdata;
if (cmap != nullptr) { // EMI doesn't have colour-maps if (cmap != nullptr) { // EMI doesn't have colour-maps
int bytes = 4;
for (int y = 0; y < texture->_height; y++) { for (int y = 0; y < texture->_height; y++) {
for (int x = 0; x < texture->_width; x++) { for (int x = 0; x < texture->_width; x++) {
uint8 col = *(const uint8 *)(data); uint8 col = *(const uint8 *)(data);
if (col == 0) { if (col == 0) {
memset(texdatapos, 0, 4); // transparent memset(texdatapos, 0, bytes); // transparent
if (!texture->_hasAlpha) { if (!texture->_hasAlpha) {
texdatapos[3] = '\xff'; // fully opaque texdatapos[3] = '\xff'; // fully opaque
} }
@ -1393,7 +1394,7 @@ void GfxOpenGL::createTexture(Texture *texture, const char *data, const CMap *cm
memcpy(texdatapos, cmap->_colors + 3 * (col), 3); memcpy(texdatapos, cmap->_colors + 3 * (col), 3);
texdatapos[3] = '\xff'; // fully opaque texdatapos[3] = '\xff'; // fully opaque
} }
texdatapos += 4; texdatapos += bytes;
data++; data++;
} }
} }

9
engines/grim/gfx_opengl_shaders.cpp
View File

@ -1025,11 +1025,12 @@ void GfxOpenGLS::createTexture(Texture *texture, const char *data, const CMap *c
char *texdatapos = texdata; char *texdatapos = texdata;
if (cmap != NULL) { // EMI doesn't have colour-maps if (cmap != NULL) { // EMI doesn't have colour-maps
int bytes = 4;
for (int y = 0; y < texture->_height; y++) { for (int y = 0; y < texture->_height; y++) {
for (int x = 0; x < texture->_width; x++) { for (int x = 0; x < texture->_width; x++) {
uint8 col = *(const uint8 *)(data); uint8 col = *(const uint8 *)(data);
if (col == 0) { if (col == 0) {
memset(texdatapos, 0, 4); // transparent memset(texdatapos, 0, bytes); // transparent
if (!texture->_hasAlpha) { if (!texture->_hasAlpha) {
texdatapos[3] = '\xff'; // fully opaque texdatapos[3] = '\xff'; // fully opaque
} }
@ -1037,7 +1038,7 @@ void GfxOpenGLS::createTexture(Texture *texture, const char *data, const CMap *c
memcpy(texdatapos, cmap->_colors + 3 * (col), 3); memcpy(texdatapos, cmap->_colors + 3 * (col), 3);
texdatapos[3] = '\xff'; // fully opaque texdatapos[3] = '\xff'; // fully opaque
} }
texdatapos += 4; texdatapos += bytes;
data++; data++;
} }
} }
@ -1138,11 +1139,11 @@ void GfxOpenGLS::createBitmap(BitmapData *bitmap) {
for (int pic = 0; pic < bitmap->_numImages; pic++) { for (int pic = 0; pic < bitmap->_numImages; pic++) {
if (bitmap->_format == 1 && bitmap->_bpp == 16 && bitmap->_colorFormat != BM_RGB1555) { if (bitmap->_format == 1 && bitmap->_bpp == 16 && bitmap->_colorFormat != BM_RGB1555) {
if (texData == 0) if (texData == 0)
texData = new byte[4 * bitmap->_width * bitmap->_height]; texData = new byte[bytes * bitmap->_width * bitmap->_height];
// Convert data to 32-bit RGBA format // Convert data to 32-bit RGBA format
byte *texDataPtr = texData; byte *texDataPtr = texData;
uint16 *bitmapData = reinterpret_cast<uint16 *>(bitmap->getImageData(pic).getRawBuffer()); uint16 *bitmapData = reinterpret_cast<uint16 *>(bitmap->getImageData(pic).getRawBuffer());
for (int i = 0; i < bitmap->_width * bitmap->_height; i++, texDataPtr += 4, bitmapData++) { for (int i = 0; i < bitmap->_width * bitmap->_height; i++, texDataPtr += bytes, bitmapData++) {
uint16 pixel = *bitmapData; uint16 pixel = *bitmapData;
int r = pixel >> 11; int r = pixel >> 11;
texDataPtr[0] = (r << 3) | (r >> 2); texDataPtr[0] = (r << 3) | (r >> 2);