mirrors/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-01-23 01:21:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Saturn/PS1/NDS: Use 16bpp bitmaps entirely

Browse source
This commit is contained in:
UnknownShadow200 2024-06-28 17:21:53 +10:00
parent c17973bd53
commit 1d7a43793a
8 changed files with 32 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Bitmap.h
View file

@ -21,6 +21,12 @@ struct Stream;
#define BITMAPCOLOR_G_SHIFT 5
#define BITMAPCOLOR_R_SHIFT 10
#define BITMAPCOLOR_A_SHIFT 15
#elif defined CC_BUILD_PS1 || defined CC_BUILD_SATURN || defined CC_BUILD_NDS
#define BITMAPCOLOR_R_SHIFT 0
#define BITMAPCOLOR_G_SHIFT 5
#define BITMAPCOLOR_B_SHIFT 10
#define BITMAPCOLOR_A_SHIFT 15
#define BITMAP_16BPP
#else
#define BITMAPCOLOR_B_SHIFT 0
#define BITMAPCOLOR_G_SHIFT 8

35
src/Graphics_NDS.c
View file

@ -94,28 +94,23 @@ void Gfx_EndFrame(void) {
/*########################################################################################################################*
*---------------------------------------------------------Textures--------------------------------------------------------*
*#########################################################################################################################*/
// B8 G8 R8 A8 > R5 G5 B5 A1
#define BGRA8_to_DS(src) \
((src[2] & 0xF8) >> 3) | ((src[1] & 0xF8) << 2) | ((src[0] & 0xF8) << 7) | ((src[3] & 0x80) << 8);
static void ConvertTexture(cc_uint16* dst, struct Bitmap* bmp, int rowWidth) {
for (int y = 0; y < bmp->height; y++)
{
cc_uint8* src = (cc_uint8*)(bmp->scan0 + y * rowWidth);
for (int x = 0; x < bmp->width; x++, src += 4)
{
*dst++ = BGRA8_to_DS(src);
}
}
}
static GfxResourceID Gfx_AllocTexture(struct Bitmap* bmp, int rowWidth, cc_uint8 flags, cc_bool mipmaps) {
vramSetBankA(VRAM_A_TEXTURE);
cc_uint16* tmp = Mem_TryAlloc(bmp->width * bmp->height, 2);
if (!tmp) return 0;
ConvertTexture(tmp, bmp, rowWidth);
// TODO: Only copy when rowWidth != bmp->width
for (int y = 0; y < bmp->height; y++)
{
cc_uint16* src = bmp->scan0 + y * rowWidth;
cc_uint16* dst = tmp + y * bmp->width;
for (int x = 0; x < bmp->width; x++)
{
dst[x] = src[x];
}
}
int textureID;
glGenTextures(1, &textureID);
@ -148,11 +143,11 @@ void Gfx_UpdateTexture(GfxResourceID texId, int x, int y, struct Bitmap* part, i
for (int yy = 0; yy < part->height; yy++)
{
cc_uint16* dst = vram_ptr + width * (y + yy) + x;
cc_uint8* src = (cc_uint8*)(part->scan0 + rowWidth * yy);
cc_uint16* src = part->scan0 + rowWidth * yy;
for (int xx = 0; xx < part->width; xx++, src += 4, dst++)
for (int xx = 0; xx < part->width; xx++)
{
*dst = BGRA8_to_DS(src);
*dst++ = *src++;
}
}
}

9
src/Graphics_PS1.c
View file

@ -210,21 +210,18 @@ typedef struct GPUTexture {
static GPUTexture textures[TEXTURES_MAX_COUNT];
static GPUTexture* curTex;
#define BGRA8_to_PS1(src) \
((src[2] & 0xF8) >> 3) | ((src[1] & 0xF8) << 2) | ((src[0] & 0xF8) << 7) | ((src[3] & 0x80) << 8)
static void* AllocTextureAt(int i, struct Bitmap* bmp, int rowWidth) {
cc_uint16* tmp = Mem_TryAlloc(bmp->width * bmp->height, 2);
if (!tmp) return NULL;
// TODO: Only copy when rowWidth != bmp->width
for (int y = 0; y < bmp->height; y++)
{
cc_uint32* src = bmp->scan0 + y * rowWidth;
cc_uint16* src = bmp->scan0 + y * rowWidth;
cc_uint16* dst = tmp + y * bmp->width;
for (int x = 0; x < bmp->width; x++) {
cc_uint8* color = (cc_uint8*)&src[x];
dst[x] = BGRA8_to_PS1(color);
dst[x] = src[x];
}
}

11
src/Graphics_Saturn.c
View file

@ -122,11 +122,6 @@ void Gfx_Free(void) {
/*########################################################################################################################*
*---------------------------------------------------------Textures--------------------------------------------------------*
*#########################################################################################################################*/
#define BGRA8_to_SATURN(src) \
((src[1] & 0xF8) >> 3) | ((src[2] & 0xF8) << 2) | ((src[3] & 0xF8) << 7) | 0x8000
// ((src[2] & 0xF8) >> 3) | ((src[1] & 0xF8) << 2) | ((src[0] & 0xF8) << 7) | ((src[3] & 0x80) << 8)
typedef struct CCTexture {
int width, height;
void* addr;
@ -145,15 +140,15 @@ static GfxResourceID Gfx_AllocTexture(struct Bitmap* bmp, int rowWidth, cc_uint8
tex_vram_addr += tex->width * tex->height * 2;
// TODO: Only copy when rowWidth != bmp->width
for (int y = 0; y < bmp->height; y++)
{
cc_uint32* src = bmp->scan0 + y * rowWidth;
cc_uint16* src = bmp->scan0 + y * rowWidth;
cc_uint16* dst = tmp + y * bmp->width;
for (int x = 0; x < bmp->width; x++)
{
cc_uint8* color = (cc_uint8*)&src[x];
dst[x] = BGRA8_to_SATURN(color);
dst[x] = src[x];
}
}

4
src/Platform_Saturn.c
View file

@ -91,7 +91,7 @@ void Platform_EncodePath(cc_filepath* dst, const cc_string* path) {
}
cc_result Directory_Create(const cc_filepath* path) {
return ERR_NOT_SUPPORTED;
return ReturnCode_DirectoryExists;
}
int File_Exists(const cc_string* path) {
@ -103,7 +103,7 @@ cc_result Directory_Enum(const cc_string* dirPath, void* obj, Directory_EnumCall
}
cc_result File_Open(cc_file* file, const cc_filepath* path) {
return ERR_NOT_SUPPORTED;
return ReturnCode_FileNotFound;
}
cc_result File_Create(cc_file* file, const cc_filepath* path) {

5
src/Window_NDS.c
View file

@ -272,10 +272,7 @@ void Window_DrawFramebuffer(Rect2D r, struct Bitmap* bmp) {
for (int x = r.x; x < r.x + r.width; x++)
{
BitmapCol color = src[x];
// 888 to 565 (discard least significant bits)
// quoting libDNS: < Bitmap background with 16 bit color values of the form aBBBBBGGGGGRRRRR (if 'a' is not set, the pixel will be transparent)
dst[x] = 0x8000 | ((BitmapCol_B(color) & 0xF8) << 7) | ((BitmapCol_G(color) & 0xF8) << 2) | (BitmapCol_R(color) >> 3);
dst[x] = src[x];
}
}

20
src/Window_PS1.c
View file

@ -154,7 +154,6 @@ void Gamepads_Process(float delta) {
*------------------------------------------------------Framebuffer--------------------------------------------------------*
*#########################################################################################################################*/
static DISPENV disp;
static cc_uint16* fb;
void Window_AllocFramebuffer(struct Bitmap* bmp, int width, int height) {
SetDefDispEnv(&disp, 0, 0, SCREEN_XRES, SCREEN_YRES);
@ -166,13 +165,8 @@ void Window_AllocFramebuffer(struct Bitmap* bmp, int width, int height) {
bmp->scan0 = (BitmapCol*)Mem_Alloc(width * height, BITMAPCOLOR_SIZE, "window pixels");
bmp->width = width;
bmp->height = height;
fb = Mem_Alloc(width * height, 2, "real surface");
}
#define BGRA8_to_PS1(src) \
((src[2] & 0xF8) >> 3) | ((src[1] & 0xF8) << 2) | ((src[0] & 0xF8) << 7) | 0x8000
void Window_DrawFramebuffer(Rect2D r, struct Bitmap* bmp) {
RECT rect;
rect.x = 0;
@ -180,24 +174,12 @@ void Window_DrawFramebuffer(Rect2D r, struct Bitmap* bmp) {
rect.w = SCREEN_XRES;
rect.h = SCREEN_YRES;
for (int y = r.y; y < r.y + r.height; y++)
{
cc_uint32* src = Bitmap_GetRow(bmp, y);
cc_uint16* dst = fb + y * bmp->width;
for (int x = r.x; x < r.x + r.width; x++) {
cc_uint8* color = (cc_uint8*)&src[x];
dst[x] = BGRA8_to_PS1(color);
}
}
LoadImage(&rect, fb);
LoadImage(&rect, bmp->scan0);
DrawSync(0);
}
void Window_FreeFramebuffer(struct Bitmap* bmp) {
Mem_Free(bmp->scan0);
Mem_Free(fb);
}

6
src/Window_Saturn.c
View file

@ -210,11 +210,7 @@ void Window_DrawFramebuffer(Rect2D r, struct Bitmap* bmp) {
for (int x = r.x; x < r.x + r.width; x++)
{
// TODO optimise
BitmapCol col = row[x];
cc_uint8 R = BitmapCol_R(col);
cc_uint8 G = BitmapCol_G(col);
cc_uint8 B = BitmapCol_B(col);
vram[x + (y * 512)] = RGB1555(0, R >> 3, G >> 3, B >> 3);
vram[x + (y * 512)].raw = row[x];
}
}