From ec00b335f22d9e25fa48ae7e8ee6a98f6136deef Mon Sep 17 00:00:00 2001 From: raven02 Date: Fri, 20 Sep 2013 14:04:45 +0800 Subject: [PATCH 1/8] Add WARN_LOG_REPORT_ONCE for unsupported BJUMP/BOUNDINGBOX --- GPU/GLES/GLES_GPU.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/GPU/GLES/GLES_GPU.cpp b/GPU/GLES/GLES_GPU.cpp index 9aff8d7170..03a8dd00c2 100644 --- a/GPU/GLES/GLES_GPU.cpp +++ b/GPU/GLES/GLES_GPU.cpp @@ -813,10 +813,14 @@ void GLES_GPU::ExecuteOp(u32 op, u32 diff) { break; case GE_CMD_BJUMP: + if (data != 0) + WARN_LOG_REPORT_ONCE(bjump, G3D, "Unsupported bjump: %06x", data); // bounding box jump. Let's just not jump, for now. break; case GE_CMD_BOUNDINGBOX: + if (data != 0) + WARN_LOG_REPORT_ONCE(boundingbox, G3D, "Unsupported bounding box: %06x", data); // bounding box test. Let's do nothing. break; From f4b097ca49cdb140c08afcf2c94d24abc67e8f88 Mon Sep 17 00:00:00 2001 From: raven02 Date: Fri, 20 Sep 2013 14:16:17 +0800 Subject: [PATCH 2/8] Set GE_CMD_SCISSOR1/2 with FLAG_EXECUTE --- GPU/GLES/GLES_GPU.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/GPU/GLES/GLES_GPU.cpp b/GPU/GLES/GLES_GPU.cpp index 03a8dd00c2..8f3c4f3a7f 100644 --- a/GPU/GLES/GLES_GPU.cpp +++ b/GPU/GLES/GLES_GPU.cpp @@ -144,8 +144,10 @@ static const CommandTableEntry commandTable[] = { {GE_CMD_TEXENVCOLOR, FLAG_FLUSHBEFOREONCHANGE | FLAG_EXECUTE}, // Simple render state changes. Handled in StateMapping.cpp. - {GE_CMD_SCISSOR1, FLAG_FLUSHBEFOREONCHANGE}, - {GE_CMD_SCISSOR2, FLAG_FLUSHBEFOREONCHANGE}, + {GE_CMD_SCISSOR1, FLAG_FLUSHBEFOREONCHANGE | FLAG_EXECUTE}, + {GE_CMD_SCISSOR2, FLAG_FLUSHBEFOREONCHANGE | FLAG_EXECUTE}, + {GE_CMD_OFFSETX, FLAG_FLUSHBEFOREONCHANGE}, + {GE_CMD_OFFSETY, FLAG_FLUSHBEFOREONCHANGE}, {GE_CMD_CULL, FLAG_FLUSHBEFOREONCHANGE}, {GE_CMD_CULLFACEENABLE, FLAG_FLUSHBEFOREONCHANGE}, {GE_CMD_DITHERENABLE, FLAG_FLUSHBEFOREONCHANGE}, @@ -196,9 +198,6 @@ static const CommandTableEntry commandTable[] = { {GE_CMD_VIEWPORTZ1, FLAG_FLUSHBEFOREONCHANGE | FLAG_EXECUTE}, {GE_CMD_VIEWPORTZ2, FLAG_FLUSHBEFOREONCHANGE | FLAG_EXECUTE}, - {GE_CMD_OFFSETX, FLAG_FLUSHBEFOREONCHANGE}, - {GE_CMD_OFFSETY, FLAG_FLUSHBEFOREONCHANGE}, - // These dirty various vertex shader uniforms. Could embed information about that in this table and call dirtyuniform directly, hm... {GE_CMD_AMBIENTCOLOR, FLAG_FLUSHBEFOREONCHANGE | FLAG_EXECUTE}, {GE_CMD_AMBIENTALPHA, FLAG_FLUSHBEFOREONCHANGE | FLAG_EXECUTE}, From 010c2a087e876130ebe6176d73b4bf743b16e73d Mon Sep 17 00:00:00 2001 From: raven02 Date: Fri, 20 Sep 2013 14:30:33 +0800 Subject: [PATCH 3/8] Add WARN_LOG_REPORT_ONCE for unknown GE commands --- GPU/GLES/GLES_GPU.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/GPU/GLES/GLES_GPU.cpp b/GPU/GLES/GLES_GPU.cpp index 8f3c4f3a7f..4f56bd424a 100644 --- a/GPU/GLES/GLES_GPU.cpp +++ b/GPU/GLES/GLES_GPU.cpp @@ -1356,6 +1356,25 @@ void GLES_GPU::ExecuteOp(u32 op, u32 diff) { break; #endif + case GE_CMD_UNKNOWN_03: + case GE_CMD_UNKNOWN_0D: + case GE_CMD_UNKNOWN_11: + case GE_CMD_UNKNOWN_29: + case GE_CMD_UNKNOWN_34: + case GE_CMD_UNKNOWN_35: + case GE_CMD_UNKNOWN_39: + case GE_CMD_UNKNOWN_4E: + case GE_CMD_UNKNOWN_4F: + case GE_CMD_UNKNOWN_52: + case GE_CMD_UNKNOWN_59: + case GE_CMD_UNKNOWN_5A: + case GE_CMD_UNKNOWN_B6: + case GE_CMD_UNKNOWN_B7: + case GE_CMD_UNKNOWN_D1: + case GE_CMD_UNKNOWN_ED: + WARN_LOG_REPORT_ONCE(unknowncmd, G3D, "Unknown GE command: %06x", data); + break; + default: GPUCommon::ExecuteOp(op, diff); break; From 9e17a4abdbbf1c6169015edc0535ce5b1c96f801 Mon Sep 17 00:00:00 2001 From: raven02 Date: Fri, 20 Sep 2013 14:31:16 +0800 Subject: [PATCH 4/8] Add bunch of GE_CMD_UNKNOWN_XX --- GPU/ge_constants.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/GPU/ge_constants.h b/GPU/ge_constants.h index 0b7936a008..861cf33450 100644 --- a/GPU/ge_constants.h +++ b/GPU/ge_constants.h @@ -243,6 +243,22 @@ enum GECommand GE_CMD_TRANSFERSRCPOS = 0xEB, GE_CMD_TRANSFERDSTPOS = 0xEC, GE_CMD_TRANSFERSIZE = 0xEE, + GE_CMD_UNKNOWN_03 = 0x03, + GE_CMD_UNKNOWN_0D = 0x0D, + GE_CMD_UNKNOWN_11 = 0x11, + GE_CMD_UNKNOWN_29 = 0x29, + GE_CMD_UNKNOWN_34 = 0x34, + GE_CMD_UNKNOWN_35 = 0x35, + GE_CMD_UNKNOWN_39 = 0x39, + GE_CMD_UNKNOWN_4E = 0x4E, + GE_CMD_UNKNOWN_4F = 0x4F, + GE_CMD_UNKNOWN_52 = 0x52, + GE_CMD_UNKNOWN_59 = 0x59, + GE_CMD_UNKNOWN_5A = 0x5A, + GE_CMD_UNKNOWN_B6 = 0xB6, + GE_CMD_UNKNOWN_B7 = 0xB7, + GE_CMD_UNKNOWN_D1 = 0xD1, + GE_CMD_UNKNOWN_ED = 0xED, }; enum GEBufferFormat From c7f830f57514f7f0f5b4ebe1d8badb0a84dbd72c Mon Sep 17 00:00:00 2001 From: raven02 Date: Fri, 20 Sep 2013 14:41:52 +0800 Subject: [PATCH 5/8] Simplify AA lines --- GPU/GLES/GLES_GPU.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/GPU/GLES/GLES_GPU.cpp b/GPU/GLES/GLES_GPU.cpp index 4f56bd424a..c356829abd 100644 --- a/GPU/GLES/GLES_GPU.cpp +++ b/GPU/GLES/GLES_GPU.cpp @@ -669,18 +669,18 @@ void GLES_GPU::ExecuteOp(u32 op, u32 diff) { // Discard AA lines as we can't do anything that makes sense with these anyway. The SW plugin might, though. - // Discard AA lines in DOA - if ((prim == GE_PRIM_LINE_STRIP) && gstate.isAntiAliasEnabled()) - break; - - // Discard AA lines in Summon Night 5 - if ((prim == GE_PRIM_LINES) && gstate.isAntiAliasEnabled() && gstate.isSkinningEnabled()) - break; + if (gstate.isAntiAliasEnabled()) { + // Discard AA lines in DOA + if (prim == GE_PRIM_LINE_STRIP) + break; + // Discard AA lines in Summon Night 5 + if ((prim == GE_PRIM_LINES) && gstate.isSkinningEnabled()) + break; + } // This also make skipping drawing very effective. framebufferManager_.SetRenderFrameBuffer(); - if (gstate_c.skipDrawReason & (SKIPDRAW_SKIPFRAME | SKIPDRAW_NON_DISPLAYED_FB)) - { + if (gstate_c.skipDrawReason & (SKIPDRAW_SKIPFRAME | SKIPDRAW_NON_DISPLAYED_FB)) { transformDraw_.SetupVertexDecoder(gstate.vertType); // Rough estimate, not sure what's correct. int vertexCost = transformDraw_.EstimatePerVertexCost(); From 83bac402c4068fae06c9f6c7503ba6b1397fb0f5 Mon Sep 17 00:00:00 2001 From: raven02 Date: Fri, 20 Sep 2013 21:10:32 +0800 Subject: [PATCH 6/8] Replace them with GE_CMD_UNKNOWN_XX --- GPU/GLES/GLES_GPU.cpp | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/GPU/GLES/GLES_GPU.cpp b/GPU/GLES/GLES_GPU.cpp index c356829abd..1e9ccf855e 100644 --- a/GPU/GLES/GLES_GPU.cpp +++ b/GPU/GLES/GLES_GPU.cpp @@ -335,22 +335,23 @@ static const CommandTableEntry commandTable[] = { {GE_CMD_BONEMATRIXDATA, FLAG_EXECUTE}, // "Missing" commands (gaps in the sequence) - {0x03}, - {0x0d}, - {0x11}, - {0x29}, - {0x34}, - {0x35}, - {0x39}, - {0x4e}, - {0x4f}, - {0x52}, - {0x59}, - {0x5a}, - {0xb6}, - {0xb7}, - {0xd1}, - {0xed}, + // "Missing" commands (gaps in the sequence) + {GE_CMD_UNKNOWN_03, 0}, + {GE_CMD_UNKNOWN_0D, 0}, + {GE_CMD_UNKNOWN_11, 0}, + {GE_CMD_UNKNOWN_29, 0}, + {GE_CMD_UNKNOWN_34, 0}, + {GE_CMD_UNKNOWN_35, 0}, + {GE_CMD_UNKNOWN_39, 0}, + {GE_CMD_UNKNOWN_4E, 0}, + {GE_CMD_UNKNOWN_4F, 0}, + {GE_CMD_UNKNOWN_52, 0}, + {GE_CMD_UNKNOWN_59, 0}, + {GE_CMD_UNKNOWN_5A, 0}, + {GE_CMD_UNKNOWN_B6, 0}, + {GE_CMD_UNKNOWN_B7, 0}, + {GE_CMD_UNKNOWN_D1, 0}, + {GE_CMD_UNKNOWN_ED, 0}, }; From e5305f655dc3ccedbd6fd9748f69cc494f224cdd Mon Sep 17 00:00:00 2001 From: raven02 Date: Sun, 22 Sep 2013 11:41:58 +0800 Subject: [PATCH 7/8] Chane to ATRAC_ERROR_NO_LOOP_INFORMATION --- Core/HLE/sceAtrac.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 694a59754b..493e312f1b 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -47,7 +47,7 @@ #define ATRAC_ERROR_INCORRECT_READ_SIZE 0x80630013 #define ATRAC_ERROR_BAD_SAMPLE 0x80630015 #define ATRAC_ERROR_ADD_DATA_IS_TOO_BIG 0x80630018 -#define ATRAC_ERROR_UNSET_PARAM 0x80630021 +#define ATRAC_ERROR_NO_LOOP_INFORMATION 0x80630021 #define ATRAC_ERROR_SECOND_BUFFER_NOT_NEEDED 0x80630022 #define ATRAC_ERROR_BUFFER_IS_EMPTY 0x80630023 #define ATRAC_ERROR_ALL_DATA_DECODED 0x80630024 @@ -1309,7 +1309,7 @@ u32 sceAtracSetLoopNum(int atracID, int loopNum) Atrac *atrac = getAtrac(atracID); if (atrac) { if (atrac->loopinfoNum == 0) - return ATRAC_ERROR_UNSET_PARAM; + return ATRAC_ERROR_NO_LOOP_INFORMATION; atrac->loopNum = loopNum; if (loopNum != 0 && atrac->loopinfoNum == 0) { // Just loop the whole audio From 67b7ed53c77d3401f86b5ca0809330a5911c0abb Mon Sep 17 00:00:00 2001 From: raven02 Date: Sun, 22 Sep 2013 15:41:05 +0800 Subject: [PATCH 8/8] Log which GE command get called --- GPU/GLES/GLES_GPU.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GPU/GLES/GLES_GPU.cpp b/GPU/GLES/GLES_GPU.cpp index 1e9ccf855e..fa01f35f46 100644 --- a/GPU/GLES/GLES_GPU.cpp +++ b/GPU/GLES/GLES_GPU.cpp @@ -1373,7 +1373,7 @@ void GLES_GPU::ExecuteOp(u32 op, u32 diff) { case GE_CMD_UNKNOWN_B7: case GE_CMD_UNKNOWN_D1: case GE_CMD_UNKNOWN_ED: - WARN_LOG_REPORT_ONCE(unknowncmd, G3D, "Unknown GE command: %06x", data); + WARN_LOG_REPORT_ONCE(unknowncmd, G3D, "Unknown GE command : %08x ", op); break; default: