AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-14 10:05:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

DS: Allocate palette on stack instead

Browse Source
This commit is contained in:
UnknownShadow200 2025-01-25 10:10:20 +11:00
parent 633d6abbec
commit b88f114e12
2 changed files with 49 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
src/Graphics_NDS.c
View File

@ -152,10 +152,10 @@ void Gfx_DisableTextureOffset(void) {
static int FindColorInPalette(cc_uint16* pal, int pal_size, cc_uint16 col) { static int FindColorInPalette(cc_uint16* pal, int pal_size, cc_uint16 col) {
if ((col >> 15) == 0) return 0; if ((col >> 15) == 0) return 0;
for (int i = 1; i < pal_size; i++) { for (int i = 1; i < pal_size; i++)
if(pal[i] == col) return i; {
if (pal[i] == col) return i;
} }
return -1; return -1;
} }
@ -173,8 +173,7 @@ GfxResourceID Gfx_AllocTexture(struct Bitmap* bmp, int rowWidth, cc_uint8 flags,
// Palettize texture if possible // Palettize texture if possible
int pal_size = 1; int pal_size = 1;
cc_uint16* tmp_palette = Mem_TryAlloc(256, 2); cc_uint16 tmp_palette[256];
if (!tmp_palette) return 0;
tmp_palette[0] = 0; tmp_palette[0] = 0;
for (int i = 0; i < bmp->width * bmp->height; i++) { for (int i = 0; i < bmp->width * bmp->height; i++) {
@ -189,57 +188,59 @@ GfxResourceID Gfx_AllocTexture(struct Bitmap* bmp, int rowWidth, cc_uint8 flags,
} }
} }
int texFormat = GL_RGBA;
if(pal_size <= 4) texFormat = GL_RGB4;
else if(pal_size <= 16) texFormat = GL_RGB16;
else if(pal_size <= 256) texFormat = GL_RGB256;
if(texFormat != GL_RGBA) {
char* tmp_chr = (char*) tmp;
for (int i = 0; i < bmp->width * bmp->height; i++) {
cc_uint16 col = tmp[i];
int idx = FindColorInPalette(tmp_palette, pal_size, col);
if(texFormat == GL_RGB256) {
tmp_chr[i] = idx;
} else if(texFormat == GL_RGB16) {
if((i & 1) == 0) {
tmp_chr[i >> 1] = idx;
} else {
tmp_chr[i >> 1] |= idx << 4;
}
} else {
if((i & 3) == 0) {
tmp_chr[i >> 2] = idx;
} else {
tmp_chr[i >> 2] |= idx << (2 * (i & 3));
}
}
}
}
// Load texture in vram
int textureID; int textureID;
glGenTextures(1, &textureID); glGenTextures(1, &textureID);
glBindTexture(0, textureID); glBindTexture(0, textureID);
glTexImage2D(0, 0, texFormat, bmp->width, bmp->height, 0, 0, tmp); char* tmp_chr = (char*)tmp;
if (texFormat != GL_RGBA) {
int glPalSize;
if(texFormat == GL_RGB4) glPalSize = 4;
else if(texFormat == GL_RGB16) glPalSize = 16;
else glPalSize = 256;
glColorTableEXT(0, 0, glPalSize, 0, 0, tmp_palette); if (pal_size <= 4) {
for (int i = 0; i < bmp->width * bmp->height; i++)
{
cc_uint16 col = tmp[i];
int idx = FindColorInPalette(tmp_palette, pal_size, col);
if ((i & 3) == 0) {
tmp_chr[i >> 2] = idx;
} else {
tmp_chr[i >> 2] |= idx << (2 * (i & 3));
}
}
glTexImage2D(0, 0, GL_RGB4, bmp->width, bmp->height, 0, 0, tmp);
glColorTableEXT(0, 0, 4, 0, 0, tmp_palette);
} else if (pal_size <= 16) {
for (int i = 0; i < bmp->width * bmp->height; i++)
{
cc_uint16 col = tmp[i];
int idx = FindColorInPalette(tmp_palette, pal_size, col);
if ((i & 1) == 0) {
tmp_chr[i >> 1] = idx;
} else {
tmp_chr[i >> 1] |= idx << 4;
}
}
glTexImage2D(0, 0, GL_RGB16, bmp->width, bmp->height, 0, 0, tmp);
glColorTableEXT(0, 0, 16, 0, 0, tmp_palette);
} else if(pal_size <= 256) {
for (int i = 0; i < bmp->width * bmp->height; i++)
{
cc_uint16 col = tmp[i];
tmp_chr[i] = FindColorInPalette(tmp_palette, pal_size, col);
}
glTexImage2D(0, 0, GL_RGB256, bmp->width, bmp->height, 0, 0, tmp);
glColorTableEXT(0, 0, 256, 0, 0, tmp_palette);
} else {
glTexImage2D(0, 0, GL_RGBA, bmp->width, bmp->height, 0, 0, tmp);
} }
glTexParameter(0, GL_TEXTURE_WRAP_S | GL_TEXTURE_WRAP_T | TEXGEN_TEXCOORD | GL_TEXTURE_COLOR0_TRANSPARENT); glTexParameter(0, GL_TEXTURE_WRAP_S | GL_TEXTURE_WRAP_T | TEXGEN_TEXCOORD | GL_TEXTURE_COLOR0_TRANSPARENT);
cc_uint16* vram_ptr = glGetTexturePointer(textureID); cc_uint16* vram_ptr = glGetTexturePointer(textureID);
if (!vram_ptr) Platform_Log2("No VRAM for %i x %i texture", &bmp->width, &bmp->height); if (!vram_ptr) Platform_Log2("No VRAM for %i x %i texture", &bmp->width, &bmp->height);
Mem_Free(tmp); Mem_Free(tmp);
Mem_Free(tmp_palette);
return (void*)textureID; return (void*)textureID;
} }

2
src/Platform_NDS.c
View File

@ -591,7 +591,7 @@ void Platform_Init(void) {
// So to avoid having the stack overlapping the heap when more stack space // So to avoid having the stack overlapping the heap when more stack space
// is used, manually reduce the heap limit by 32 kb // is used, manually reduce the heap limit by 32 kb
extern char* fake_heap_end; extern char* fake_heap_end;
fake_heap_end -= 32768; if (fake_heap_end) fake_heap_end -= 32768;
InitFilesystem(); InitFilesystem();
InitNetworking(); InitNetworking();