summaryrefslogtreecommitdiff
path: root/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@Gmail.com>2013-02-27 02:22:08 +0000
committerRyan Houdek <Sonicadvance1@Gmail.com>2013-02-27 02:22:08 +0000
commit692e39d1bbe14f0c84e1d0e98e578534d1f1d656 (patch)
tree1dfec903910553e323f6b04b510c315fc8a3caed /Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp
parenta680d17eef88646b8cd6018c1c5e8f0e39d056ee (diff)
parentbe7643cd2d1a27324070550ad82eca2c3bd59f19 (diff)
Merge branch 'arm-noglsl'
Diffstat (limited to 'Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp')
-rw-r--r--Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp
index 0091e4eaca..032ff9d74a 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp
@@ -125,7 +125,9 @@ void DecodeStandard(u32 bufferSize)
if (Cmd == GX_NOP)
return;
-
+ // Causes a SIGBUS error on Android
+ // XXX: Investigate
+#ifndef ANDROID
// check if switching in or out of an object
// only used for debuggging
if (inObjectStream && (Cmd & 0x87) != lastPrimCmd)
@@ -139,7 +141,7 @@ void DecodeStandard(u32 bufferSize)
lastPrimCmd = Cmd & 0x87;
DebugUtil::OnObjectBegin();
}
-
+#endif
switch(Cmd)
{
case GX_NOP: