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
gpulib: implement rgb888_to_rgb565
[pcsx_rearmed.git]
/
plugins
/
gpu-gles
/
gpulib_if.c
diff --git
a/plugins/gpu-gles/gpulib_if.c
b/plugins/gpu-gles/gpulib_if.c
index
569fff4
..
c669b63
100644
(file)
--- a/
plugins/gpu-gles/gpulib_if.c
+++ b/
plugins/gpu-gles/gpulib_if.c
@@
-502,16
+502,28
@@
int renderer_init(void)
extern const unsigned char cmd_lengths[256];
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 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];
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);
primTableJ[cmd]((void *)list);
@@
-519,8
+531,8
@@
void do_cmd_list(unsigned int *list, int list_len)
{
case 0x48 ... 0x4F:
{
{
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)
{
while(1)
{
@@
-531,16
+543,14
@@
void do_cmd_list(unsigned int *list, int list_len)
num_vertexes++;
}
num_vertexes++;
}
- if(num_vertexes > 2)
- len += (num_vertexes - 2);
-
+ len += (num_vertexes - 2);
break;
}
case 0x58 ... 0x5F:
{
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)
{
while(1)
{
@@
-551,9
+561,7
@@
void do_cmd_list(unsigned int *list, int list_len)
num_vertexes++;
}
num_vertexes++;
}
- if(num_vertexes > 2)
- len += (num_vertexes - 2) * 2;
-
+ len += (num_vertexes - 2) * 2;
break;
}
break;
}
@@
-571,6
+579,12
@@
void do_cmd_list(unsigned int *list, int list_len)
#endif
}
}
#endif
}
}
+
+ 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 renderer_sync_ecmds(uint32_t *ecmds)
@@
-626,11
+640,14
@@
void vout_update(void)
}
}
}
}
+static struct rearmed_cbs *cbs;
+
long GPUopen(void **dpy)
{
int ret;
long GPUopen(void **dpy)
{
int ret;
- iResX = 800; iResY = 480;
+ iResX = cbs->screen_w;
+ iResY = cbs->screen_h;
rRatioRect.left = rRatioRect.top=0;
rRatioRect.right = iResX;
rRatioRect.bottom = iResY;
rRatioRect.left = rRatioRect.top=0;
rRatioRect.right = iResX;
rRatioRect.bottom = iResY;
@@
-657,8
+674,6
@@
long GPUclose(void)
return 0;
}
return 0;
}
-static struct rearmed_cbs *cbs;
-
/* acting as both renderer and vout handler here .. */
void renderer_set_config(const struct rearmed_cbs *cbs_)
{
/* acting as both renderer and vout handler here .. */
void renderer_set_config(const struct rearmed_cbs *cbs_)
{