mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-16 19:13:40 +01:00
Merge pull request #3849 from raven02/patch-21
Add reporting for unsupported GE commands (BJUMP/BOUNDINGBOX)
This commit is contained in:
commit
f6ca0bd90c
6 files changed
+74
-34
No files matched your search
@@ -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
|
||||
|
||||
+53
-29
@@ -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},
|
||||
@@ -336,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},
|
||||
};
|
||||
|
||||
|
||||
@@ -670,18 +670,19 @@ 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() && vertTypeIsSkinningEnabled(gstate.vertType))
|
||||
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();
|
||||
@@ -813,10 +814,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;
|
||||
|
||||
@@ -1353,6 +1358,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 : %08x ", op);
|
||||
break;
|
||||
|
||||
default:
|
||||
GPUCommon::ExecuteOp(op, diff);
|
||||
break;
|
||||
|
||||
@@ -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
|
||||
|
||||
+1
-1
Submodule lang updated: dc0ada4053...7497df3451.
+1
-1
Submodule native updated: 0b53ecb1ef...997aae346b.
+1
-1
Submodule pspautotests updated: aaa095c1d0...596de8a28c.
Reference in new issue
Block a user