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
pipe error messages through single function
[pcsx_rearmed.git]
/
frontend
/
libretro.c
diff --git
a/frontend/libretro.c
b/frontend/libretro.c
index
d1cb400
..
0eef059
100644
(file)
--- a/
frontend/libretro.c
+++ b/
frontend/libretro.c
@@
-11,6
+11,7
@@
#include "../libpcsxcore/misc.h"
#include "../libpcsxcore/psxcounters.h"
#include "../libpcsxcore/misc.h"
#include "../libpcsxcore/psxcounters.h"
+#include "../libpcsxcore/psxmem_map.h"
#include "../libpcsxcore/new_dynarec/new_dynarec.h"
#include "../plugins/dfsound/out.h"
#include "../plugins/gpulib/cspace.h"
#include "../libpcsxcore/new_dynarec/new_dynarec.h"
#include "../plugins/dfsound/out.h"
#include "../plugins/gpulib/cspace.h"
@@
-29,6
+30,7
@@
static retro_audio_sample_batch_t audio_batch_cb;
static void *vout_buf;
static int samples_sent, samples_to_send;
static int plugins_opened;
static void *vout_buf;
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;
@@
-41,11
+43,10
@@
static int vout_open(void)
return 0;
}
return 0;
}
-static void vout_set_mode(int w, int h, int bpp)
+static void vout_set_mode(int w, int h, int
raw_w, int raw_h, int
bpp)
{
}
{
}
-/* FIXME: either teach PCSX to blit to RGB1555 or RetroArch to support RGB565 */
static void convert(void *buf, size_t bytes)
{
unsigned int i, v, *p = buf;
static void convert(void *buf, size_t bytes)
{
unsigned int i, v, *p = buf;
@@
-64,7
+65,7
@@
static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
if (vram == NULL) {
// blanking
if (vram == NULL) {
// blanking
- memset(
pl_
vout_buf, 0, dstride * h * 2);
+ memset(vout_buf, 0, dstride * h * 2);
goto out;
}
goto out;
}
@@
-84,9
+85,9
@@
static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
}
}
}
}
-
out:
out:
- convert(vout_buf, w * h * 2);
+ if (!native_rgb565)
+ convert(vout_buf, w * h * 2);
video_cb(vout_buf, w, h, w * 2);
pl_rearmed_cbs.flip_cnt++;
}
video_cb(vout_buf, w, h, w * 2);
pl_rearmed_cbs.flip_cnt++;
}
@@
-95,11
+96,23
@@
static void vout_close(void)
{
}
{
}
+static void *pl_mmap(unsigned int size)
+{
+ return psxMap(0, size, 0, MAP_TAG_VRAM);
+}
+
+static void pl_munmap(void *ptr, unsigned int size)
+{
+ psxUnmap(ptr, size, MAP_TAG_VRAM);
+}
+
struct rearmed_cbs pl_rearmed_cbs = {
.pl_vout_open = vout_open,
.pl_vout_set_mode = vout_set_mode,
.pl_vout_flip = vout_flip,
.pl_vout_close = vout_close,
struct rearmed_cbs pl_rearmed_cbs = {
.pl_vout_open = vout_open,
.pl_vout_set_mode = vout_set_mode,
.pl_vout_flip = vout_flip,
.pl_vout_close = vout_close,
+ .mmap = pl_mmap,
+ .munmap = pl_munmap,
/* from psxcounters */
.gpu_hcnt = &hSyncCount,
.gpu_frame_count = &frame_counter,
/* from psxcounters */
.gpu_hcnt = &hSyncCount,
.gpu_frame_count = &frame_counter,
@@
-119,7
+132,7
@@
void plat_trigger_vibrate(int is_strong)
{
}
{
}
-void pl_update_gun(int *xn, int *
xres, int *y
, int *in)
+void pl_update_gun(int *xn, int *
yn, int *xres, int *yres
, int *in)
{
}
{
}
@@
-220,6
+233,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;
+ SysPrintf("RGB565 supported, using it\n");
+ }
+
if (plugins_opened) {
ClosePlugins();
plugins_opened = 0;
if (plugins_opened) {
ClosePlugins();
plugins_opened = 0;
@@
-229,7
+248,7
@@
bool retro_load_game(const struct retro_game_info *info)
/* have to reload after set_cd_image for correct cdr plugin */
if (LoadPlugins() == -1) {
/* have to reload after set_cd_image for correct cdr plugin */
if (LoadPlugins() == -1) {
-
printf("fa
led to load plugins\n");
+
SysPrintf("fai
led to load plugins\n");
return false;
}
return false;
}
@@
-237,7
+256,7
@@
bool retro_load_game(const struct retro_game_info *info)
NetOpened = 0;
if (OpenPlugins() == -1) {
NetOpened = 0;
if (OpenPlugins() == -1) {
-
printf("fa
led to open plugins\n");
+
SysPrintf("fai
led to open plugins\n");
return false;
}
return false;
}
@@
-245,17
+264,17
@@
bool retro_load_game(const struct retro_game_info *info)
Config.PsxAuto = 1;
if (CheckCdrom() == -1) {
Config.PsxAuto = 1;
if (CheckCdrom() == -1) {
-
p
rintf("unsupported/invalid CD image: %s\n", info->path);
+
SysP
rintf("unsupported/invalid CD image: %s\n", info->path);
return false;
}
SysReset();
if (LoadCdrom() == -1) {
return false;
}
SysReset();
if (LoadCdrom() == -1) {
-
p
rintf("could not load CD-ROM!\n");
+
SysP
rintf("could not load CD-ROM!\n");
return false;
}
return false;
}
- emu_on_new_cd();
+ emu_on_new_cd(
0
);
return true;
}
return true;
}
@@
-340,7
+359,7
@@
void retro_init(void)
ret = emu_core_preinit();
ret |= emu_core_init();
if (ret != 0) {
ret = emu_core_preinit();
ret |= emu_core_init();
if (ret != 0) {
-
printf("PCSX init failed, sorry
\n");
+
SysPrintf("PCSX init failed.
\n");
exit(1);
}
exit(1);
}
@@
-360,11
+379,11
@@
void retro_init(void)
}
}
if (f != NULL) {
}
}
if (f != NULL) {
-
p
rintf("found BIOS file: %s\n", Config.Bios);
+
SysP
rintf("found BIOS file: %s\n", Config.Bios);
fclose(f);
}
else
fclose(f);
}
else
-
p
rintf("no BIOS files found.\n");
+
SysP
rintf("no BIOS files found.\n");
level = 1;
environ_cb(RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL, &level);
level = 1;
environ_cb(RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL, &level);