Xargon/Supermodel
1
0
Fork 0
mirror of https://github.com/RetroDECK/Supermodel.git synced 2024-11-22 22:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some bad/missing textures in fighting vipers. The game is referencing totally illegal texture sizes. The real h/w was just handling it somehow, whilst we were returning null for the textures. This might produce junk textures for the lower mipmaps, but this can be clamped in a later update.

Browse source
This commit is contained in:
Ian Curtis 2017-12-13 01:21:25 +00:00
parent 62d9584b0d
commit cede67468c
2 changed files with 42 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
Src/Graphics/New3D/Texture.cpp
View file

@ -68,17 +68,29 @@ void Texture::SetWrapMode(bool mirrorU, bool mirrorV)
void Texture::UploadTextureMip(int level, const UINT16* src, UINT8* scratch, int format, int x, int y, int width, int height) void Texture::UploadTextureMip(int level, const UINT16* src, UINT8* scratch, int format, int x, int y, int width, int height)
{ {
int xi, yi, i; int xi, yi, i;
int subWidth, subHeight;
GLubyte texel; GLubyte texel;
GLubyte c, a; GLubyte c, a;
i = 0; i = 0;
subWidth = width;
subHeight = height;
if (subWidth + x > 2048) {
subWidth = 2048 - x;
}
if (subHeight + y > 2048) {
subHeight = 2048 - y;
}
switch (format) switch (format)
{ {
default: // Debug texture default: // Debug texture
for (yi = y; yi < (y + height); yi++) for (yi = y; yi < (y + subHeight); yi++)
{ {
for (xi = x; xi < (x + width); xi++) for (xi = x; xi < (x + subWidth); xi++)
{ {
scratch[i++] = 255; // R scratch[i++] = 255; // R
scratch[i++] = 0; // G scratch[i++] = 0; // G
@ -89,9 +101,9 @@ void Texture::UploadTextureMip(int level, const UINT16* src, UINT8* scratch, int
break; break;
case 0: // T1RGB5 <- correct case 0: // T1RGB5 <- correct
for (yi = y; yi < (y + height); yi++) for (yi = y; yi < (y + subHeight); yi++)
{ {
for (xi = x; xi < (x + width); xi++) for (xi = x; xi < (x + subWidth); xi++)
{ {
scratch[i++] = ((src[yi * 2048 + xi] >> 10) & 0x1F) * 255 / 0x1F; // R scratch[i++] = ((src[yi * 2048 + xi] >> 10) & 0x1F) * 255 / 0x1F; // R
scratch[i++] = ((src[yi * 2048 + xi] >> 5) & 0x1F) * 255 / 0x1F; // G scratch[i++] = ((src[yi * 2048 + xi] >> 5) & 0x1F) * 255 / 0x1F; // G
@ -102,9 +114,9 @@ void Texture::UploadTextureMip(int level, const UINT16* src, UINT8* scratch, int
break; break;
case 1: // Interleaved A4L4 (low byte) case 1: // Interleaved A4L4 (low byte)
for (yi = y; yi < (y + height); yi++) for (yi = y; yi < (y + subHeight); yi++)
{ {
for (xi = x; xi < (x + width); xi++) for (xi = x; xi < (x + subWidth); xi++)
{ {
// Interpret as A4L4 // Interpret as A4L4
texel = src[yi * 2048 + xi] & 0xFF; texel = src[yi * 2048 + xi] & 0xFF;
@ -119,9 +131,9 @@ void Texture::UploadTextureMip(int level, const UINT16* src, UINT8* scratch, int
break; break;
case 2: // luminance alpha texture <- this one is correct case 2: // luminance alpha texture <- this one is correct
for (yi = y; yi < (y + height); yi++) for (yi = y; yi < (y + subHeight); yi++)
{ {
for (xi = x; xi < (x + width); xi++) for (xi = x; xi < (x + subWidth); xi++)
{ {
texel = src[yi * 2048 + xi] & 0xFF; texel = src[yi * 2048 + xi] & 0xFF;
c = ((texel >> 4) & 0xF) * 17; c = ((texel >> 4) & 0xF) * 17;
@ -135,9 +147,9 @@ void Texture::UploadTextureMip(int level, const UINT16* src, UINT8* scratch, int
break; break;
case 3: // 8-bit, A4L4 (high byte) case 3: // 8-bit, A4L4 (high byte)
for (yi = y; yi < (y + height); yi++) for (yi = y; yi < (y + subHeight); yi++)
{ {
for (xi = x; xi < (x + width); xi++) for (xi = x; xi < (x + subWidth); xi++)
{ {
texel = src[yi * 2048 + xi] >> 8; texel = src[yi * 2048 + xi] >> 8;
c = (texel & 0xF) * 17; c = (texel & 0xF) * 17;
@ -152,9 +164,9 @@ void Texture::UploadTextureMip(int level, const UINT16* src, UINT8* scratch, int
case 4: // 8-bit, L4A4 (high byte) case 4: // 8-bit, L4A4 (high byte)
for (yi = y; yi < (y + height); yi++) for (yi = y; yi < (y + subHeight); yi++)
{ {
for (xi = x; xi < (x + width); xi++) for (xi = x; xi < (x + subWidth); xi++)
{ {
texel = src[yi * 2048 + xi] >> 8; texel = src[yi * 2048 + xi] >> 8;
c = ((texel >> 4) & 0xF) * 17; c = ((texel >> 4) & 0xF) * 17;
@ -168,9 +180,9 @@ void Texture::UploadTextureMip(int level, const UINT16* src, UINT8* scratch, int
break; break;
case 5: // 8-bit grayscale case 5: // 8-bit grayscale
for (yi = y; yi < (y + height); yi++) for (yi = y; yi < (y + subHeight); yi++)
{ {
for (xi = x; xi < (x + width); xi++) for (xi = x; xi < (x + subWidth); xi++)
{ {
texel = src[yi * 2048 + xi] & 0xFF; texel = src[yi * 2048 + xi] & 0xFF;
scratch[i++] = texel; scratch[i++] = texel;
@ -182,9 +194,9 @@ void Texture::UploadTextureMip(int level, const UINT16* src, UINT8* scratch, int
break; break;
case 6: // 8-bit grayscale <-- this one is correct case 6: // 8-bit grayscale <-- this one is correct
for (yi = y; yi < (y + height); yi++) for (yi = y; yi < (y + subHeight); yi++)
{ {
for (xi = x; xi < (x + width); xi++) for (xi = x; xi < (x + subWidth); xi++)
{ {
texel = src[yi * 2048 + xi] >> 8; texel = src[yi * 2048 + xi] >> 8;
scratch[i++] = texel; scratch[i++] = texel;
@ -196,9 +208,9 @@ void Texture::UploadTextureMip(int level, const UINT16* src, UINT8* scratch, int
break; break;
case 7: // RGBA4 case 7: // RGBA4
for (yi = y; yi < (y + height); yi++) for (yi = y; yi < (y + subHeight); yi++)
{ {
for (xi = x; xi < (x + width); xi++) for (xi = x; xi < (x + subWidth); xi++)
{ {
scratch[i++] = ((src[yi * 2048 + xi] >> 12) & 0xF) * 17;// R scratch[i++] = ((src[yi * 2048 + xi] >> 12) & 0xF) * 17;// R
scratch[i++] = ((src[yi * 2048 + xi] >> 8) & 0xF) * 17; // G scratch[i++] = ((src[yi * 2048 + xi] >> 8) & 0xF) * 17; // G
@ -213,9 +225,9 @@ void Texture::UploadTextureMip(int level, const UINT16* src, UINT8* scratch, int
// //
case 8: // low byte, low nibble case 8: // low byte, low nibble
for (yi = y; yi < (y + height); yi++) for (yi = y; yi < (y + subHeight); yi++)
{ {
for (xi = x; xi < (x + width); xi++) for (xi = x; xi < (x + subWidth); xi++)
{ {
texel = src[yi * 2048 + xi] & 0xFF; texel = src[yi * 2048 + xi] & 0xFF;
c = (texel & 0xF) * 17; c = (texel & 0xF) * 17;
@ -228,9 +240,9 @@ void Texture::UploadTextureMip(int level, const UINT16* src, UINT8* scratch, int
break; break;
case 9: // low byte, high nibble case 9: // low byte, high nibble
for (yi = y; yi < (y + height); yi++) for (yi = y; yi < (y + subHeight); yi++)
{ {
for (xi = x; xi < (x + width); xi++) for (xi = x; xi < (x + subWidth); xi++)
{ {
texel = src[yi * 2048 + xi] & 0xFF; texel = src[yi * 2048 + xi] & 0xFF;
c = ((texel >> 4) & 0xF) * 17; c = ((texel >> 4) & 0xF) * 17;
@ -243,9 +255,9 @@ void Texture::UploadTextureMip(int level, const UINT16* src, UINT8* scratch, int
break; break;
case 10: // high byte, low nibble case 10: // high byte, low nibble
for (yi = y; yi < (y + height); yi++) for (yi = y; yi < (y + subHeight); yi++)
{ {
for (xi = x; xi < (x + width); xi++) for (xi = x; xi < (x + subWidth); xi++)
{ {
texel = src[yi * 2048 + xi] >> 8; texel = src[yi * 2048 + xi] >> 8;
c = (texel & 0xF) * 17; c = (texel & 0xF) * 17;
@ -259,9 +271,9 @@ void Texture::UploadTextureMip(int level, const UINT16* src, UINT8* scratch, int
case 11: // high byte, high nibble case 11: // high byte, high nibble
for (yi = y; yi < (y + height); yi++) for (yi = y; yi < (y + subHeight); yi++)
{ {
for (xi = x; xi < (x + width); xi++) for (xi = x; xi < (x + subWidth); xi++)
{ {
texel = src[yi * 2048 + xi] >> 8; texel = src[yi * 2048 + xi] >> 8;
c = ((texel >> 4) & 0xF) * 17; c = ((texel >> 4) & 0xF) * 17;
@ -274,14 +286,15 @@ void Texture::UploadTextureMip(int level, const UINT16* src, UINT8* scratch, int
break; break;
} }
glTexImage2D(GL_TEXTURE_2D, level, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, scratch); glTexImage2D(GL_TEXTURE_2D, level, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
glTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, subWidth, subHeight, GL_RGBA, GL_UNSIGNED_BYTE, scratch);
} }
UINT32 Texture::UploadTexture(const UINT16* src, UINT8* scratch, int format, bool mirrorU, bool mirrorV, int x, int y, int width, int height) UINT32 Texture::UploadTexture(const UINT16* src, UINT8* scratch, int format, bool mirrorU, bool mirrorV, int x, int y, int width, int height)
{ {
const int mipXBase[] = { 0, 1024, 1536, 1792, 1920, 1984, 2016, 2032, 2040, 2044, 2046, 2047 }; const int mipXBase[] = { 0, 1024, 1536, 1792, 1920, 1984, 2016, 2032, 2040, 2044, 2046, 2047 };
const int mipYBase[] = { 0, 512, 768, 896, 960, 992, 1008, 1016, 1020, 1022, 1023 }; const int mipYBase[] = { 0, 512, 768, 896, 960, 992, 1008, 1016, 1020, 1022, 1023 };
const int mipDivisor[] = { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512 }; const int mipDivisor[] = { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024 };
if (!src || !scratch) { if (!src || !scratch) {
return 0; // sanity checking return 0; // sanity checking

4
Src/Graphics/New3D/TextureSheet.cpp
View file

@ -21,10 +21,6 @@ std::shared_ptr<Texture> TextureSheet::BindTexture(const UINT16* src, int format
x &= 2047; x &= 2047;
y &= 2047; y &= 2047;
if ((x + width) > 2048 || (y + height) > 2048) {
return nullptr;
}
if (width > 1024 || height > 1024) { // sanity checking if (width > 1024 || height > 1024) { // sanity checking
return nullptr; return nullptr;
} }