CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-30 06:43:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(PSP) fix up RGUI colors.

Browse Source
This commit is contained in:
aliaspider 2014-02-18 22:01:04 +01:00
parent 68c7a3ad5b
commit bf3ad47cbe
2 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/menu/disp/rgui.c
View File

@ -74,7 +74,7 @@ static uint16_t gray_filler(unsigned x, unsigned y)
x >>= 1; x >>= 1;
y >>= 1; y >>= 1;
unsigned col = ((x + y) & 1) + 1; unsigned col = ((x + y) & 1) + 1;
#ifdef GEKKO #if defined(GEKKO) || defined(PSP)
return (6 << 12) | (col << 8) | (col << 4) | (col << 0); return (6 << 12) | (col << 8) | (col << 4) | (col << 0);
#else #else
return (col << 13) | (col << 9) | (col << 5) | (12 << 0); return (col << 13) | (col << 9) | (col << 5) | (12 << 0);
@ -86,7 +86,7 @@ static uint16_t green_filler(unsigned x, unsigned y)
x >>= 1; x >>= 1;
y >>= 1; y >>= 1;
unsigned col = ((x + y) & 1) + 1; unsigned col = ((x + y) & 1) + 1;
#ifdef GEKKO #if defined(GEKKO) || defined(PSP)
return (6 << 12) | (col << 8) | (col << 5) | (col << 0); return (6 << 12) | (col << 8) | (col << 5) | (col << 0);
#else #else
return (col << 13) | (col << 10) | (col << 5) | (12 << 0); return (col << 13) | (col << 10) | (col << 5) | (12 << 0);
@ -121,7 +121,7 @@ static void blit_line(rgui_handle_t *rgui,
if (col) if (col)
{ {
rgui->frame_buf[(y + j) * (rgui->frame_buf_pitch >> 1) + (x + i)] = green ? rgui->frame_buf[(y + j) * (rgui->frame_buf_pitch >> 1) + (x + i)] = green ?
#ifdef GEKKO #if defined(GEKKO)|| defined(PSP)
(3 << 0) | (10 << 4) | (3 << 8) | (7 << 12) : 0x7FFF; (3 << 0) | (10 << 4) | (3 << 8) | (7 << 12) : 0x7FFF;
#else #else
(15 << 0) | (7 << 4) | (15 << 8) | (7 << 12) : 0xFFFF; (15 << 0) | (7 << 4) | (15 << 8) | (7 << 12) : 0xFFFF;

59
psp1/psp1_video.c
View File

@ -52,9 +52,9 @@
#define TO_UNCACHED_PTR(ptr) ((void *)((uint32_t)ptr|0x40000000)) #define TO_UNCACHED_PTR(ptr) ((void *)((uint32_t)ptr|0x40000000))
#define TO_CACHED_PTR(ptr) ((void *)((uint32_t)ptr&~0x40000000)) #define TO_CACHED_PTR(ptr) ((void *)((uint32_t)ptr&~0x40000000))
typedef void (*psp1_RGB_to_BGR_func) (const void *in_frame, unsigned in_buffer_width, typedef void (*psp1_copy_frame_func) (const void *in_frame, unsigned in_buffer_width,
void *out_frame, unsigned out_buffer_width, void *out_frame, unsigned out_buffer_width,
unsigned width, unsigned height); unsigned width, unsigned height);
typedef struct psp1_rgui_frame typedef struct psp1_rgui_frame
@ -76,7 +76,7 @@ typedef struct psp1_rgui_frame
bool active; bool active;
psp1_RGB_to_BGR_func RGB_to_BGR; psp1_copy_frame_func copy_frame;
} psp1_rgui_frame_t; } psp1_rgui_frame_t;
@ -85,6 +85,7 @@ typedef struct psp1_video
void* displayList; void* displayList;
void* frameBuffers[2]; void* frameBuffers[2];
unsigned int drawBuffer_ID; unsigned int drawBuffer_ID;
bool vsync;
bool rgb32; bool rgb32;
int pixel_format; int pixel_format;
@ -93,14 +94,13 @@ typedef struct psp1_video
unsigned buffer_Height; unsigned buffer_Height;
void* buffer; void* buffer;
psp1_RGB_to_BGR_func RGB_to_BGR; psp1_copy_frame_func copy_frame;
psp1_rgui_frame_t rgui; psp1_rgui_frame_t rgui;
// not implemented // not implemented
unsigned width; unsigned width;
unsigned height; unsigned height;
bool vsync;
bool force_aspect; bool force_aspect;
bool smooth; bool smooth;
unsigned input_scale; // Maximum input size: RARCH_SCALE_BASE * input_scale unsigned input_scale; // Maximum input size: RARCH_SCALE_BASE * input_scale
@ -117,7 +117,7 @@ typedef struct psp1_vertex
} psp1_vertex_t; } psp1_vertex_t;
static void ARGB8888_to_ABGR8888(const void *in_frame, unsigned in_buffer_width, static void copy_frame_ARGB8888_to_ABGR8888(const void *in_frame, unsigned in_buffer_width,
void *out_frame, unsigned out_buffer_width, void *out_frame, unsigned out_buffer_width,
unsigned width, unsigned height) unsigned width, unsigned height)
{ {
@ -139,9 +139,9 @@ static void ARGB8888_to_ABGR8888(const void *in_frame, unsigned in_buffer_width,
#define RGB565_GREEN_MASK 0x7E0 #define RGB565_GREEN_MASK 0x7E0
#define RGB565_BLUE_MASK 0x1F #define RGB565_BLUE_MASK 0x1F
static void RGB5650_to_BGR5650(const void *in_frame, unsigned in_buffer_width, static void copy_frame_RGB5650_to_BGR5650(const void *in_frame, unsigned in_buffer_width,
void *out_frame, unsigned out_buffer_width, void *out_frame, unsigned out_buffer_width,
unsigned width, unsigned height) unsigned width, unsigned height)
{ {
int x,y; int x,y;
const uint16_t *in_p = (const uint16_t*)in_frame; const uint16_t *in_p = (const uint16_t*)in_frame;
@ -159,6 +159,25 @@ static void RGB5650_to_BGR5650(const void *in_frame, unsigned in_buffer_width,
} }
} }
static void copy_frame_XBGR16(const void *in_frame, unsigned in_buffer_width,
void *out_frame, unsigned out_buffer_width,
unsigned width, unsigned height)
{
int x,y;
const uint16_t *in_p = (const uint16_t*)in_frame;
uint16_t *out_p = (uint16_t*)out_frame;
for(y = 0; y < height; y++)
{
for (x = 0; x < width; x++)
{
*out_p++ =*in_p++;
}
in_p += in_buffer_width - width;
out_p += out_buffer_width - width;
}
}
static void *psp_init(const video_info_t *video, static void *psp_init(const video_info_t *video,
const input_driver_t **input, void **input_data) const input_driver_t **input, void **input_data)
{ {
@ -197,18 +216,18 @@ static void *psp_init(const video_info_t *video,
psp->rgb32 = video->rgb32; psp->rgb32 = video->rgb32;
psp->pixel_format = psp->rgb32 ? GU_PSM_8888 : GU_PSM_5650; psp->pixel_format = psp->rgb32 ? GU_PSM_8888 : GU_PSM_5650;
psp->pixel_size = psp->rgb32 ? 4 : 2; psp->pixel_size = psp->rgb32 ? 4 : 2;
psp->RGB_to_BGR = psp->rgb32 ? ARGB8888_to_ABGR8888 : RGB5650_to_BGR5650; psp->copy_frame = psp->rgb32 ? copy_frame_ARGB8888_to_ABGR8888 : copy_frame_RGB5650_to_BGR5650;
if (psp->buffer) if (psp->buffer)
free(TO_CACHED_PTR(psp->buffer)); free(TO_CACHED_PTR(psp->buffer));
psp->buffer = memalign(16, psp->buffer_width * psp->buffer_Height * psp->pixel_size); psp->buffer = memalign(16, psp->buffer_width * psp->buffer_Height * psp->pixel_size);
psp->buffer = TO_UNCACHED_PTR(psp->buffer); psp->buffer = TO_UNCACHED_PTR(psp->buffer);
//init rgui to video->rgb32 too since it can't be empty when psp_set_texture_frame is called //init rgui to 16-bit pixel format since it can't be empty when psp_set_texture_frame is called
psp->rgui.rgb32 = video->rgb32; psp->rgui.rgb32 = video->rgb32;
psp->rgui.pixel_format = psp->rgui.rgb32 ? GU_PSM_8888 : GU_PSM_5650; psp->rgui.pixel_format = psp->rgui.rgb32 ? GU_PSM_8888 : GU_PSM_4444;
psp->rgui.pixel_size = psp->rgui.rgb32 ? 4 : 2; psp->rgui.pixel_size = psp->rgui.rgb32 ? 4 : 2;
psp->rgui.RGB_to_BGR = psp->rgui.rgb32 ? ARGB8888_to_ABGR8888 : RGB5650_to_BGR5650; psp->rgui.copy_frame = psp->rgui.rgb32 ? copy_frame_ARGB8888_to_ABGR8888 : copy_frame_XBGR16;
psp->frameBuffers[0]=psp->rgui.rgb32 ? SCEGU_VRAM_BP32_0 : SCEGU_VRAM_BP_0; psp->frameBuffers[0]=psp->rgui.rgb32 ? SCEGU_VRAM_BP32_0 : SCEGU_VRAM_BP_0;
psp->frameBuffers[1]=psp->rgui.rgb32 ? SCEGU_VRAM_BP32_1 : SCEGU_VRAM_BP_1; psp->frameBuffers[1]=psp->rgui.rgb32 ? SCEGU_VRAM_BP32_1 : SCEGU_VRAM_BP_1;
psp->drawBuffer_ID=0; psp->drawBuffer_ID=0;
@ -295,7 +314,7 @@ static bool psp_frame(void *data, const void *frame,
if (frame == NULL) if (frame == NULL)
return true; return true;
psp->RGB_to_BGR(frame, pitch / psp->pixel_size, psp->buffer, psp->buffer_width, width, height); psp->copy_frame(frame, pitch / psp->pixel_size, psp->buffer, psp->buffer_width, width, height);
sceGuStart(GU_DIRECT, psp->displayList); sceGuStart(GU_DIRECT, psp->displayList);
sceGuClear(GU_COLOR_BUFFER_BIT); sceGuClear(GU_COLOR_BUFFER_BIT);
@ -347,7 +366,7 @@ static bool psp_frame(void *data, const void *frame,
static void psp_set_nonblock_state(void *data, bool toggle) static void psp_set_nonblock_state(void *data, bool toggle)
{ {
psp1_video_t *psp = (psp1_video_t*)data; psp1_video_t *psp = (psp1_video_t*)data;
psp->vsync = toggle; psp->vsync = !toggle;
} }
static bool psp_alive(void *data) static bool psp_alive(void *data)
@ -396,9 +415,9 @@ static void psp_set_texture_frame(void *data, const void *frame, bool rgb32,
if (psp->rgui.rgb32 != rgb32) if (psp->rgui.rgb32 != rgb32)
{ {
psp->rgui.rgb32 = rgb32; psp->rgui.rgb32 = rgb32;
psp->rgui.pixel_format = psp->rgui.rgb32 ? GU_PSM_8888 : GU_PSM_5650; psp->rgui.pixel_format = psp->rgui.rgb32 ? GU_PSM_8888 : GU_PSM_4444;
psp->rgui.pixel_size = psp->rgui.rgb32 ? 4 : 2; psp->rgui.pixel_size = psp->rgui.rgb32 ? 4 : 2;
psp->rgui.RGB_to_BGR = psp->rgui.rgb32 ? ARGB8888_to_ABGR8888 : RGB5650_to_BGR5650; psp->rgui.copy_frame = psp->rgui.rgb32 ? copy_frame_ARGB8888_to_ABGR8888 : copy_frame_XBGR16;
if (psp->rgui.buffer) if (psp->rgui.buffer)
free(TO_CACHED_PTR(psp->rgui.buffer)); free(TO_CACHED_PTR(psp->rgui.buffer));
@ -409,9 +428,9 @@ static void psp_set_texture_frame(void *data, const void *frame, bool rgb32,
psp->rgui.width = width; psp->rgui.width = width;
psp->rgui.height = height; psp->rgui.height = height;
psp->rgui.RGB_to_BGR(frame, width, psp->rgui.buffer, psp->rgui.buffer_width, width, height); psp->rgui.copy_frame(frame, width, psp->rgui.buffer, psp->rgui.buffer_width, width, height);
psp->rgui.alpha = alpha; psp->rgui.alpha = alpha;
uint32_t mask; uint32_t mask;
mask = alpha*255.0; mask = alpha*255.0;
mask &= 0xFF; mask &= 0xFF;