#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 "main.h"
#include "plugin.h"
#include "plugin_lib.h"
static retro_audio_sample_batch_t audio_batch_cb;
static void *vout_buf;
-static int vout_width, vout_height;
static int samples_sent, samples_to_send;
static int plugins_opened;
static int native_rgb565;
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)
{
- vout_width = w;
- vout_height = h;
- return vout_buf;
}
-/* 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 *vout_flip(void)
+static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
{
- pl_rearmed_cbs.flip_cnt++;
- if (!native_rgb565)
- convert(vout_buf, vout_width * vout_height * 2);
- video_cb(vout_buf, vout_width, vout_height, vout_width * 2);
+ unsigned short *dest = vout_buf;
+ const unsigned short *src = vram;
+ int dstride = w, h1 = h;
+
+ if (vram == NULL) {
+ // blanking
+ memset(vout_buf, 0, dstride * h * 2);
+ goto out;
+ }
- return vout_buf;
+ if (bgr24)
+ {
+ // XXX: could we switch to RETRO_PIXEL_FORMAT_XRGB8888 here?
+ for (; h1-- > 0; dest += dstride, src += stride)
+ {
+ bgr888_to_rgb565(dest, src, w * 3);
+ }
+ }
+ else
+ {
+ for (; h1-- > 0; dest += dstride, src += stride)
+ {
+ bgr555_to_rgb565(dest, src, w * 2);
+ }
+ }
+
+out:
+ if (!native_rgb565)
+ convert(vout_buf, w * h * 2);
+ video_cb(vout_buf, w, h, w * 2);
+ pl_rearmed_cbs.flip_cnt++;
}
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,
+ .mmap = pl_mmap,
+ .munmap = pl_munmap,
/* from psxcounters */
.gpu_hcnt = &hSyncCount,
.gpu_frame_count = &frame_counter,
{
}
-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)
{
}
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");
+ SysPrintf("RGB565 supported, using it\n");
}
if (plugins_opened) {
/* have to reload after set_cd_image for correct cdr plugin */
if (LoadPlugins() == -1) {
- printf("faled to load plugins\n");
+ SysPrintf("failed to load plugins\n");
return false;
}
NetOpened = 0;
if (OpenPlugins() == -1) {
- printf("faled to open plugins\n");
+ SysPrintf("failed to open plugins\n");
return false;
}
Config.PsxAuto = 1;
if (CheckCdrom() == -1) {
- printf("unsupported/invalid CD image: %s\n", info->path);
+ SysPrintf("unsupported/invalid CD image: %s\n", info->path);
return false;
}
SysReset();
if (LoadCdrom() == -1) {
- printf("could not load CD-ROM!\n");
+ SysPrintf("could not load CD-ROM!\n");
return false;
}
- emu_on_new_cd();
+ emu_on_new_cd(0);
return true;
}
ret = emu_core_preinit();
ret |= emu_core_init();
if (ret != 0) {
- printf("PCSX init failed, sorry\n");
+ SysPrintf("PCSX init failed.\n");
exit(1);
}
}
}
if (f != NULL) {
- printf("found BIOS file: %s\n", Config.Bios);
+ SysPrintf("found BIOS file: %s\n", Config.Bios);
fclose(f);
}
else
- printf("no BIOS files found.\n");
+ SysPrintf("no BIOS files found.\n");
level = 1;
environ_cb(RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL, &level);