notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3 from libretro/master
[pcsx_rearmed.git]
/
frontend
/
libretro.c
diff --git
a/frontend/libretro.c
b/frontend/libretro.c
index
a0b9f46
..
4305aa7
100644
(file)
--- a/
frontend/libretro.c
+++ b/
frontend/libretro.c
@@
-29,6
+29,7
@@
static void *vout_buf;
static int vout_width, vout_height;
static int samples_sent, samples_to_send;
static int plugins_opened;
static int vout_width, vout_height;
static int samples_sent, samples_to_send;
static int plugins_opened;
+static int native_rgb565;
/* PCSX ReARMed core calls and stuff */
int in_type1, in_type2;
/* PCSX ReARMed core calls and stuff */
int in_type1, in_type2;
@@
-49,11
+50,11
@@
static void *vout_set_mode(int w, int h, int bpp)
}
/* FIXME: either teach PCSX to blit to RGB1555 or RetroArch to support RGB565 */
}
/* FIXME: either teach PCSX to blit to RGB1555 or RetroArch to support RGB565 */
-static void convert(void *buf, size_t
size
)
+static void convert(void *buf, size_t
bytes
)
{
unsigned int i, v, *p = buf;
{
unsigned int i, v, *p = buf;
- for (i = 0; i <
size / 2
; i++) {
+ for (i = 0; i <
bytes / 4
; i++) {
v = p[i];
p[i] = (v & 0x001f001f) | ((v >> 1) & 0x7fe07fe0);
}
v = p[i];
p[i] = (v & 0x001f001f) | ((v >> 1) & 0x7fe07fe0);
}
@@
-62,7
+63,8
@@
static void convert(void *buf, size_t size)
static void *vout_flip(void)
{
pl_rearmed_cbs.flip_cnt++;
static void *vout_flip(void)
{
pl_rearmed_cbs.flip_cnt++;
- convert(vout_buf, vout_width * vout_height * 2);
+ if (!native_rgb565)
+ convert(vout_buf, vout_width * vout_height * 2);
video_cb(vout_buf, vout_width, vout_height, vout_width * 2);
return vout_buf;
video_cb(vout_buf, vout_width, vout_height, vout_width * 2);
return vout_buf;
@@
-197,6
+199,12
@@
void retro_cheat_set(unsigned index, bool enabled, const char *code)
bool retro_load_game(const struct retro_game_info *info)
{
bool retro_load_game(const struct retro_game_info *info)
{
+ enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_RGB565;
+ if (environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt)) {
+ native_rgb565 = 1;
+ fprintf(stderr, "RGB565 supported, using it\n");
+ }
+
if (plugins_opened) {
ClosePlugins();
plugins_opened = 0;
if (plugins_opened) {
ClosePlugins();
plugins_opened = 0;