#include "gpuDraw.c"
#include "gpuTexture.c"
#include "gpuPrim.c"
+#include "hud.c"
static const short dispWidths[8] = {256,320,512,640,368,384,512,640};
short g_m1,g_m2,g_m3;
glEnable(GL_SCISSOR_TEST); glError();
}
+static void fps_update(void);
+
void updateDisplay(void)
{
bFakeFrontBuffer=FALSE;
}
if(iDrawnSomething)
+ {
+ fps_update();
eglSwapBuffers(display, surface);
- iDrawnSomething=0;
+ iDrawnSomething=0;
+ }
if(lClearOnSwap) // clear buffer after swap?
{
static int is_opened;
-int renderer_init(void)
+static void set_vram(void *vram)
{
- psxVub=(void *)gpu.vram;
+ psxVub=vram;
psxVuw=(unsigned short *)psxVub;
+}
+
+int renderer_init(void)
+{
+ set_vram(gpu.vram);
PSXDisplay.RGB24 = FALSE; // init some stuff
PSXDisplay.Interlaced = FALSE;
return 0;
}
+void renderer_finish(void)
+{
+}
+
+void renderer_notify_res_change(void)
+{
+}
+
extern const unsigned char cmd_lengths[256];
-void do_cmd_list(unsigned int *list, int list_len)
+// XXX: mostly dupe code from soft peops
+int do_cmd_list(unsigned int *list, int list_len, int *last_cmd)
{
unsigned int cmd, len;
-
+ unsigned int *list_start = list;
unsigned int *list_end = list + list_len;
for (; list < list_end; list += 1 + len)
{
cmd = *list >> 24;
len = cmd_lengths[cmd];
+ if (list + 1 + len > list_end) {
+ cmd = -1;
+ break;
+ }
+
+#ifndef TEST
+ if (cmd == 0xa0 || cmd == 0xc0)
+ break; // image i/o, forward to upper layer
+ else if ((cmd & 0xf8) == 0xe0)
+ gpu.ex_regs[cmd & 7] = list[0];
+#endif
primTableJ[cmd]((void *)list);
{
case 0x48 ... 0x4F:
{
- uint32_t num_vertexes = 1;
- uint32_t *list_position = &(list[2]);
+ uint32_t num_vertexes = 2;
+ uint32_t *list_position = &(list[3]);
while(1)
{
- if((*list_position & 0xf000f000) == 0x50005000 || list_position >= list_end)
+ if(list_position >= list_end) {
+ cmd = -1;
+ goto breakloop;
+ }
+
+ if((*list_position & 0xf000f000) == 0x50005000)
break;
list_position++;
num_vertexes++;
}
- if(num_vertexes > 2)
- len += (num_vertexes - 2);
-
+ len += (num_vertexes - 2);
break;
}
case 0x58 ... 0x5F:
{
- uint32_t num_vertexes = 1;
- uint32_t *list_position = &(list[2]);
+ uint32_t num_vertexes = 2;
+ uint32_t *list_position = &(list[4]);
while(1)
{
- if((*list_position & 0xf000f000) == 0x50005000 || list_position >= list_end)
+ if(list_position >= list_end) {
+ cmd = -1;
+ goto breakloop;
+ }
+
+ if((*list_position & 0xf000f000) == 0x50005000)
break;
list_position += 2;
num_vertexes++;
}
- if(num_vertexes > 2)
- len += (num_vertexes - 2) * 2;
-
+ len += (num_vertexes - 2) * 2;
break;
}
#endif
}
}
+
+breakloop:
+ gpu.ex_regs[1] &= ~0x1ff;
+ gpu.ex_regs[1] |= lGPUstatusRet & 0x1ff;
+
+ *last_cmd = cmd;
+ return list - list_start;
}
void renderer_sync_ecmds(uint32_t *ecmds)
}
}
+void vout_blank(void)
+{
+}
+
+void vout_set_config(const struct rearmed_cbs *cbs)
+{
+}
+
+static struct rearmed_cbs *cbs;
+
long GPUopen(void **dpy)
{
- iResX = 800; iResY = 480;
+ int ret;
+
+ iResX = cbs->screen_w;
+ iResY = cbs->screen_h;
rRatioRect.left = rRatioRect.top=0;
rRatioRect.right = iResX;
rRatioRect.bottom = iResY;
CSTEXTURE = CSVERTEX = CSCOLOR = 0;
InitializeTextureStore(); // init texture mem
- is_opened = 1;
- return GLinitialize();
+ ret = GLinitialize(cbs->gles_display, cbs->gles_surface);
+ MakeDisplayLists();
+
+ is_opened = 1;
+ return ret;
}
long GPUclose(void)
{
is_opened = 0;
+ KillDisplayLists();
GLcleanup(); // close OGL
return 0;
}
-//#include "../../frontend/plugin_lib.h"
-
-static const struct rearmed_cbs *cbs;
-
/* acting as both renderer and vout handler here .. */
void renderer_set_config(const struct rearmed_cbs *cbs_)
{
- cbs = cbs_;
+ cbs = (void *)cbs_; // ugh..
iOffscreenDrawing = 0;
iZBufferDepth = 0;
bUseFastMdec = cbs->gpu_peopsgl.bUseFastMdec;
iTexGarbageCollection = cbs->gpu_peopsgl.iTexGarbageCollection;
iVRamSize = cbs->gpu_peopsgl.iVRamSize;
-}
-void vout_set_config(const struct rearmed_cbs *cbs)
-{
+ if (cbs->pl_set_gpu_caps)
+ cbs->pl_set_gpu_caps(GPU_CAP_OWNS_DISPLAY);
+
+ if (is_opened && cbs->gles_display != NULL && cbs->gles_surface != NULL) {
+ // HACK..
+ GPUclose();
+ GPUopen(NULL);
+ }
+
+ set_vram(gpu.vram);
}
void SetAspectRatio(void)
{
- cbs->pl_get_layer_pos(&rRatioRect.left, &rRatioRect.top, &rRatioRect.right, &rRatioRect.bottom);
+ if (cbs->pl_get_layer_pos)
+ cbs->pl_get_layer_pos(&rRatioRect.left, &rRatioRect.top, &rRatioRect.right, &rRatioRect.bottom);
glScissor(rRatioRect.left,
iResY-(rRatioRect.top+rRatioRect.bottom),
rRatioRect.right,rRatioRect.bottom);
glError();
}
+
+static void fps_update(void)
+{
+ char buf[16];
+
+ cbs->flip_cnt++;
+ if(cbs->flips_per_sec != 0)
+ {
+ snprintf(buf,sizeof(buf),"%2d %4.1f",cbs->flips_per_sec,cbs->vsps_cur);
+ DisplayText(buf, 0);
+ }
+ if(cbs->cpu_usage != 0)
+ {
+ snprintf(buf,sizeof(buf),"%3d",cbs->cpu_usage);
+ DisplayText(buf, 1);
+ }
+}