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
Merge pull request #147 from senquack/cdrom_sstate_fix
[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
de16721
..
2dedbf8
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
@@
-171,7
+172,7
@@
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 */
+#if
def HAVE_PRE_ARMV7
/* XXX */
linesInterlace |= gpu.status.interlace;
#endif
linesInterlace |= gpu.status.interlace;
#endif
@@
-307,7
+308,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;
}
@@
-338,7
+343,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;
}
@@
-482,8
+491,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;
}