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
libretro: Move flip screen counter increment back to end of flip screen callback
[pcsx_rearmed.git]
/
frontend
/
libretro.c
diff --git
a/frontend/libretro.c
b/frontend/libretro.c
index
d1cb400
..
180c1d7
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"
@@
-30,6
+31,10
@@
static void *vout_buf;
static int samples_sent, samples_to_send;
static int plugins_opened;
static int samples_sent, samples_to_send;
static int plugins_opened;
+/* memory card data */
+extern char Mcd1Data[MCD_SIZE];
+extern char McdDisable[2];
+
/* PCSX ReARMed core calls and stuff */
int in_type1, in_type2;
int in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 };
/* PCSX ReARMed core calls and stuff */
int in_type1, in_type2;
int in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 };
@@
-41,11
+46,11
@@
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 */
+#ifdef FRONTEND_SUPPORTS_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;
@@
-55,6
+60,10
@@
static void convert(void *buf, size_t bytes)
p[i] = (v & 0x001f001f) | ((v >> 1) & 0x7fe07fe0);
}
}
p[i] = (v & 0x001f001f) | ((v >> 1) & 0x7fe07fe0);
}
}
+#endif
+
+static unsigned game_width;
+static unsigned game_height;
static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
{
static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
{
@@
-64,7
+73,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,10
+93,12
@@
static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
}
}
}
}
-
out:
out:
- convert(vout_buf, w * h * 2);
- video_cb(vout_buf, w, h, w * 2);
+#ifndef FRONTEND_SUPPORTS_RGB565
+ convert(vout_buf, w * h * 2);
+#endif
+ game_width = w;
+ game_height = h;
pl_rearmed_cbs.flip_cnt++;
}
pl_rearmed_cbs.flip_cnt++;
}
@@
-95,11
+106,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
+142,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
+243,13
@@
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)
{
+#ifdef FRONTEND_SUPPORTS_RGB565
+ enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_RGB565;
+ if (environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt)) {
+ fprintf(stderr, "RGB565 supported, using it\n");
+ }
+#endif
+
if (plugins_opened) {
ClosePlugins();
plugins_opened = 0;
if (plugins_opened) {
ClosePlugins();
plugins_opened = 0;
@@
-255,7
+285,7
@@
bool retro_load_game(const struct retro_game_info *info)
printf("could not load CD-ROM!\n");
return false;
}
printf("could not load CD-ROM!\n");
return false;
}
- emu_on_new_cd();
+ emu_on_new_cd(
0
);
return true;
}
return true;
}
@@
-276,12
+306,12
@@
unsigned retro_get_region(void)
void *retro_get_memory_data(unsigned id)
{
void *retro_get_memory_data(unsigned id)
{
- return
NULL
;
+ return
Mcd1Data
;
}
size_t retro_get_memory_size(unsigned id)
{
}
size_t retro_get_memory_size(unsigned id)
{
- return
0
;
+ return
MCD_SIZE
;
}
void retro_reset(void)
}
void retro_reset(void)
@@
-327,6
+357,7
@@
void retro_run(void)
psxCpu->Execute();
samples_to_send += 44100 / 60;
psxCpu->Execute();
samples_to_send += 44100 / 60;
+ video_cb(vout_buf, game_width, game_height, game_width * 2);
}
void retro_init(void)
}
void retro_init(void)
@@
-368,6
+399,9
@@
void retro_init(void)
level = 1;
environ_cb(RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL, &level);
level = 1;
environ_cb(RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL, &level);
+
+ McdDisable[0] = 0;
+ McdDisable[1] = 1;
}
void retro_deinit(void)
}
void retro_deinit(void)
@@
-376,4
+410,3
@@
void retro_deinit(void)
free(vout_buf);
vout_buf = NULL;
}
free(vout_buf);
vout_buf = NULL;
}
-