psp gfx scaling/etc stuff

[picodrive.git] / platform / psp / psp.c

diff --git a/platform/psp/psp.c b/platform/psp/psp.c
index 4bc1020..84ab5c8 100644 (file)
--- a/platform/psp/psp.c
+++ b/platform/psp/psp.c
@@ -1,5 +1,11 @@
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+
 #include <pspkernel.h>
+#include <pspiofilemgr.h>
 #include <pspdisplay.h>
+#include <psppower.h>
 #include <pspgu.h>
 
 #include "psp.h"
@@ -7,9 +13,12 @@
 
 PSP_MODULE_INFO("PicoDrive", 0, 1, 34);
 
-void *psp_screen = PSP_VRAM_BASE0;
+unsigned int __attribute__((aligned(16))) guCmdList[GU_CMDLIST_SIZE];
+
+void *psp_screen = VRAM_FB0;
 static int current_screen = 0; /* front bufer */
 
+static SceUID logfd = -1;
 
 /* Exit callback */
 static int exit_callback(int arg1, int arg2, void *common)
@@ -47,13 +56,39 @@ void psp_init(void)
 
        /* video */
        sceDisplaySetMode(0, 480, 272);
-       sceDisplaySetFrameBuf(PSP_VRAM_BASE1, 512, PSP_DISPLAY_PIXEL_FORMAT_565, PSP_DISPLAY_SETBUF_NEXTFRAME);
+       sceDisplaySetFrameBuf(VRAM_FB1, 512, PSP_DISPLAY_PIXEL_FORMAT_565, PSP_DISPLAY_SETBUF_NEXTFRAME);
        current_screen = 1;
-       psp_screen = PSP_VRAM_BASE0;
+       psp_screen = VRAM_FB0;
 
        /* gu */
        sceGuInit();
 
+       sceGuStart(GU_DIRECT, guCmdList);
+       sceGuDrawBuffer(GU_PSM_5650, (void *)VRAMOFFS_FB0, 512);
+       sceGuDispBuffer(480, 272, (void *)VRAMOFFS_FB1, 512); // don't care
+       sceGuClear(GU_COLOR_BUFFER_BIT | GU_DEPTH_BUFFER_BIT);
+       sceGuDepthBuffer((void *)VRAMOFFS_DEPTH, 512);
+       sceGuOffset(2048 - (480 / 2), 2048 - (272 / 2));
+       sceGuViewport(2048, 2048, 480, 272);
+       sceGuDepthRange(0xc350, 0x2710);
+       sceGuScissor(0, 0, 480, 272);
+       sceGuEnable(GU_SCISSOR_TEST);
+
+       sceGuDepthMask(0xffff);
+       sceGuDisable(GU_DEPTH_TEST);
+
+       sceGuFrontFace(GU_CW);
+       sceGuEnable(GU_TEXTURE_2D);
+       sceGuTexFunc(GU_TFX_REPLACE, GU_TCC_RGB);
+       sceGuAmbientColor(0xffffffff);
+       sceGuColor(0xffffffff);
+       sceGuFinish();
+       sceGuSync(0, 0);
+
+       sceDisplayWaitVblankStart();
+       sceGuDisplay(GU_TRUE);
+
+
        /* input */
        sceCtrlSetSamplingCycle(0);
        sceCtrlSetSamplingMode(0);
@@ -67,16 +102,23 @@ void psp_finish(void)
        sceKernelExitGame();
 }
 
-void psp_video_flip(void)
+void psp_video_flip(int wait_vsync)
 {
-       sceDisplaySetFrameBuf(psp_screen, 512, PSP_DISPLAY_PIXEL_FORMAT_565, PSP_DISPLAY_SETBUF_NEXTFRAME);
+       if (wait_vsync) sceDisplayWaitVblankStart();
+       sceDisplaySetFrameBuf(psp_screen, 512, PSP_DISPLAY_PIXEL_FORMAT_565,
+               wait_vsync ? PSP_DISPLAY_SETBUF_IMMEDIATE : PSP_DISPLAY_SETBUF_NEXTFRAME);
        current_screen ^= 1;
-       psp_screen = current_screen ? PSP_VRAM_BASE1 : PSP_VRAM_BASE0;
+       psp_screen = current_screen ? VRAM_FB0 : VRAM_FB1;
+}
+
+void *psp_video_get_active_fb(void)
+{
+       return current_screen ? VRAM_FB1 : VRAM_FB0;
 }
 
 void psp_video_switch_to_single(void)
 {
-       psp_screen = PSP_VRAM_BASE0;
+       psp_screen = VRAM_FB0;
        sceDisplaySetFrameBuf(psp_screen, 512, PSP_DISPLAY_PIXEL_FORMAT_565, PSP_DISPLAY_SETBUF_NEXTFRAME);
        current_screen = 0;
 }
@@ -86,11 +128,52 @@ void psp_msleep(int ms)
        sceKernelDelayThread(ms * 1000);
 }
 
-unsigned int psp_pad_read(void)
+unsigned int psp_pad_read(int blocking)
 {
        SceCtrlData pad;
-       sceCtrlReadBufferPositive(&pad, 1);
+       if (blocking)
+            sceCtrlReadBufferPositive(&pad, 1);
+       else sceCtrlPeekBufferPositive(&pad, 1);
 
        return pad.Buttons;
 }
 
+int psp_get_cpu_clock(void)
+{
+       return scePowerGetCpuClockFrequencyInt();
+}
+
+int psp_set_cpu_clock(int clock)
+{
+       int ret = scePowerSetClockFrequency(clock, clock, clock/2);
+       if (ret != 0) lprintf("failed to set clock: %i\n", ret);
+
+       return ret;
+}
+
+/* alt logging */
+#define LOG_FILE "log.log"
+
+void lprintf_f(const char *fmt, ...)
+{
+       va_list vl;
+       char buff[256];
+
+       if (logfd < 0)
+       {
+               logfd = sceIoOpen(LOG_FILE, PSP_O_WRONLY|PSP_O_APPEND, 0777);
+               if (logfd < 0)
+                       return;
+       }
+
+       va_start(vl, fmt);
+       vsnprintf(buff, sizeof(buff), fmt, vl);
+       va_end(vl);
+
+       sceIoWrite(logfd, buff, strlen(buff));
+//sceKernelDelayThread(200 * 1000);
+sceIoClose(logfd);
+logfd = -1;
+}
+
+