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
gpu_neon: rework buffer selection
[pcsx_rearmed.git]
/
plugins
/
gpu_unai
/
gpulib_if.cpp
diff --git
a/plugins/gpu_unai/gpulib_if.cpp
b/plugins/gpu_unai/gpulib_if.cpp
index
38e7ce1
..
0064aaa
100644
(file)
--- a/
plugins/gpu_unai/gpulib_if.cpp
+++ b/
plugins/gpu_unai/gpulib_if.cpp
@@
-23,6
+23,7
@@
#include <stdlib.h>
#include <string.h>
#include "../gpulib/gpu.h"
#include <stdlib.h>
#include <string.h>
#include "../gpulib/gpu.h"
+#include "arm_features.h"
#define u8 uint8_t
#define s8 int8_t
#define u8 uint8_t
#define s8 int8_t
@@
-154,6
+155,18
@@
int renderer_init(void)
return 0;
}
return 0;
}
+void renderer_finish(void)
+{
+}
+
+void renderer_notify_res_change(void)
+{
+}
+
+void renderer_notify_scanout_x_change(int x, int w)
+{
+}
+
extern const unsigned char cmd_lengths[256];
int do_cmd_list(unsigned int *list, int list_len, int *last_cmd)
extern const unsigned char cmd_lengths[256];
int do_cmd_list(unsigned int *list, int list_len, int *last_cmd)
@@
-163,8
+176,8
@@
int do_cmd_list(unsigned int *list, int list_len, int *last_cmd)
unsigned int *list_end = list + list_len;
linesInterlace = force_interlace;
unsigned int *list_end = list + list_len;
linesInterlace = force_interlace;
-#if
ndef __ARM_ARCH_7A__
/* XXX */
- linesInterlace |=
gpu.status.interlace
;
+#if
def HAVE_PRE_ARMV7
/* XXX */
+ linesInterlace |=
!!(gpu.status & PSX_GPU_STATUS_INTERLACE)
;
#endif
for (; list < list_end; list += 1 + len)
#endif
for (; list < list_end; list += 1 + len)
@@
-299,7
+312,11
@@
int do_cmd_list(unsigned int *list, int list_len, int *last_cmd)
gpuDrawLF(gpuPixelDrivers [ (Blending_Mode | Masking | Blending | (PixelMSB>>3)) >> 1]);
num_vertexes++;
gpuDrawLF(gpuPixelDrivers [ (Blending_Mode | Masking | Blending | (PixelMSB>>3)) >> 1]);
num_vertexes++;
- if((*list_position & 0xf000f000) == 0x50005000 || list_position >= list_end)
+ if(list_position >= list_end) {
+ cmd = -1;
+ goto breakloop;
+ }
+ if((*list_position & 0xf000f000) == 0x50005000)
break;
}
break;
}
@@
-330,7
+347,11
@@
int do_cmd_list(unsigned int *list, int list_len, int *last_cmd)
gpuDrawLG(gpuPixelDrivers [ (Blending_Mode | Masking | Blending | (PixelMSB>>3)) >> 1]);
num_vertexes++;
gpuDrawLG(gpuPixelDrivers [ (Blending_Mode | Masking | Blending | (PixelMSB>>3)) >> 1]);
num_vertexes++;
- if((*list_position & 0xf000f000) == 0x50005000 || list_position >= list_end)
+ if(list_position >= list_end) {
+ cmd = -1;
+ goto breakloop;
+ }
+ if((*list_position & 0xf000f000) == 0x50005000)
break;
}
break;
}
@@
-474,8
+495,8
@@
int do_cmd_list(unsigned int *list, int list_len, int *last_cmd)
}
case 0xE5: {
const u32 temp = PacketBuffer.U4[0];
}
case 0xE5: {
const u32 temp = PacketBuffer.U4[0];
- DrawingOffset[0] = ((
long
)temp<<(32-11))>>(32-11);
- DrawingOffset[1] = ((
long
)temp<<(32-22))>>(32-11);
+ DrawingOffset[0] = ((
s32
)temp<<(32-11))>>(32-11);
+ DrawingOffset[1] = ((
s32
)temp<<(32-22))>>(32-11);
gpu.ex_regs[5] = temp;
break;
}
gpu.ex_regs[5] = temp;
break;
}
@@
-503,7
+524,7
@@
void renderer_sync_ecmds(uint32_t *ecmds)
do_cmd_list(&ecmds[1], 6, &dummy);
}
do_cmd_list(&ecmds[1], 6, &dummy);
}
-void renderer_update_caches(int x, int y, int w, int h)
+void renderer_update_caches(int x, int y, int w, int h
, int state_changed
)
{
}
{
}
@@
-525,6
+546,8
@@
void renderer_set_config(const struct rearmed_cbs *cbs)
enableAbbeyHack = cbs->gpu_unai.abe_hack;
light = !cbs->gpu_unai.no_light;
blend = !cbs->gpu_unai.no_blend;
enableAbbeyHack = cbs->gpu_unai.abe_hack;
light = !cbs->gpu_unai.no_light;
blend = !cbs->gpu_unai.no_blend;
+
+ GPU_FrameBuffer = (u16 *)gpu.vram;
}
#endif
}
#endif