ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More commenting. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2921 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
omegadox 2009-04-07 21:17:15 +00:00
parent 1397ca100a
commit d1c9d2463c
3 changed files with 90 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Source/Core/Core/Src/HW/PixelEngine.cpp
View File

@ -33,12 +33,6 @@
#include "../Core.h" #include "../Core.h"
#include "../ConfigManager.h" #include "../ConfigManager.h"
u16 AlphaConfigReg = 0x0; // Fake Alpha Control Register
u16 ZConfigReg = 0x0; // Fake Z Control Register
u16 DstAlphaReg = 0x0; // Fake Alpha Dest Register
u16 AlphaModeReg = 0x0; // Fake Alpha Mode Register
u16 AlphaReg = 0x0; // Fake Alpha Register
namespace PixelEngine namespace PixelEngine
{ {
@ -49,7 +43,7 @@ enum
PE_ALPHACONF = 0x002, // Alpha Config PE_ALPHACONF = 0x002, // Alpha Config
PE_DSTALPHACONF = 0x004, // Destination Alpha Config PE_DSTALPHACONF = 0x004, // Destination Alpha Config
PE_ALPHAMODE = 0x006, // Alpha Mode Config PE_ALPHAMODE = 0x006, // Alpha Mode Config
PE_ALPHAREAD = 0x008, // Alpha Read ? PE_ALPHAREAD = 0x008, // Alpha Read
PE_CTRL_REGISTER = 0x00a, // Control PE_CTRL_REGISTER = 0x00a, // Control
PE_TOKEN_REG = 0x00e, // Token PE_TOKEN_REG = 0x00e, // Token
}; };
@ -118,28 +112,23 @@ void Read16(u16& _uReturnValue, const u32 _iAddress)
case PE_ALPHACONF: case PE_ALPHACONF:
// Most games read this early. no idea why. // Most games read this early. no idea why.
INFO_LOG(PIXELENGINE, "(r16): PE_ALPHACONF"); WARN_LOG(PIXELENGINE, "(r16): PE_ALPHACONF");
_uReturnValue = AlphaConfigReg;
return; return;
case PE_ZCONF: case PE_ZCONF:
INFO_LOG(PIXELENGINE, "(r16): PE_ZCONF"); WARN_LOG(PIXELENGINE, "(r16): PE_ZCONF");
_uReturnValue = ZConfigReg;
return; return;
case PE_DSTALPHACONF: case PE_DSTALPHACONF:
INFO_LOG(PIXELENGINE, "(r16): PE_DSTALPHACONF"); WARN_LOG(PIXELENGINE, "(r16): PE_DSTALPHACONF");
_uReturnValue = DstAlphaReg;
return; return;
case PE_ALPHAMODE: case PE_ALPHAMODE:
INFO_LOG(PIXELENGINE, "(r16): PE_ALPHAMODE"); WARN_LOG(PIXELENGINE, "(r16): PE_ALPHAMODE");
_uReturnValue = AlphaModeReg;
return; return;
case PE_ALPHAREAD: case PE_ALPHAREAD:
INFO_LOG(PIXELENGINE, "(r16): PE_ALPHAREAD"); WARN_LOG(PIXELENGINE, "(r16): PE_ALPHAREAD");
_uReturnValue = AlphaReg;
return; return;
default: default:
@ -183,13 +172,13 @@ void Write16(const u16 _iValue, const u32 _iAddress)
//g_token = _iValue; //g_token = _iValue;
break; break;
// These are probably the settings for direct CPU EFB access. Ugh. // CPU Direct Access EFB Raster State Config
// Lets save the written config in a fake reg anyways // TODO: Set the BPmem to these settings
case PE_ZCONF: INFO_LOG(PIXELENGINE, "(w16) ZCONF: %02x", _iValue); ZConfigReg = _iValue; break; case PE_ZCONF: WARN_LOG(PIXELENGINE, "(w16) ZCONF: %02x", _iValue); break;
case PE_ALPHACONF: INFO_LOG(PIXELENGINE, "(w16) ALPHACONF: %02x", _iValue); AlphaConfigReg = _iValue; break; case PE_ALPHACONF: WARN_LOG(PIXELENGINE, "(w16) ALPHACONF: %02x", _iValue); break;
case PE_DSTALPHACONF: INFO_LOG(PIXELENGINE, "(w16) DSTALPHACONF: %02x", _iValue); DstAlphaReg = _iValue; break; case PE_DSTALPHACONF: WARN_LOG(PIXELENGINE, "(w16) DSTALPHACONF: %02x", _iValue); break;
case PE_ALPHAMODE: INFO_LOG(PIXELENGINE, "(w16) ALPHAMODE: %02x", _iValue); AlphaModeReg = _iValue; break; case PE_ALPHAMODE: WARN_LOG(PIXELENGINE, "(w16) ALPHAMODE: %02x", _iValue); break;
case PE_ALPHAREAD: INFO_LOG(PIXELENGINE, "(w16) ALPHAREAD: %02x", _iValue); AlphaReg = _iValue; break; case PE_ALPHAREAD: WARN_LOG(PIXELENGINE, "(w16) ALPHAREAD: %02x", _iValue); break;
default: default:
WARN_LOG(PIXELENGINE, "Write16: unknown %04x @ %08x", _iValue, _iAddress); WARN_LOG(PIXELENGINE, "Write16: unknown %04x @ %08x", _iValue, _iAddress);

4
Source/Core/VideoCommon/Src/BPMemory.h
View File

@ -43,7 +43,7 @@
#define BPMEM_ZMODE 0x40 #define BPMEM_ZMODE 0x40
#define BPMEM_BLENDMODE 0x41 #define BPMEM_BLENDMODE 0x41
#define BPMEM_CONSTANTALPHA 0x42 #define BPMEM_CONSTANTALPHA 0x42
#define BPMEM_PE_CONTROL 0x43 #define BPMEM_ZCOMPARE 0x43
#define BPMEM_FIELDMASK 0x44 #define BPMEM_FIELDMASK 0x44
#define BPMEM_SETDRAWDONE 0x45 #define BPMEM_SETDRAWDONE 0x45
#define BPMEM_CLOCK0 0x46 #define BPMEM_CLOCK0 0x46
@ -95,7 +95,7 @@
#define BPMEM_FOGPARAM3 0xF1 #define BPMEM_FOGPARAM3 0xF1
#define BPMEM_FOGCOLOR 0xF2 #define BPMEM_FOGCOLOR 0xF2
#define BPMEM_ALPHACOMPARE 0xF3 #define BPMEM_ALPHACOMPARE 0xF3
#define BPMEM_ZTEX1 0xF4 #define BPMEM_BIAS 0xF4
#define BPMEM_ZTEX2 0xF5 #define BPMEM_ZTEX2 0xF5
#define BPMEM_TEV_KSEL 0xF6 // 0xF6 + 8 #define BPMEM_TEV_KSEL 0xF6 // 0xF6 + 8
#define BPMEM_BP_MASK 0xFE #define BPMEM_BP_MASK 0xFE

102
Source/Core/VideoCommon/Src/BPStructs.cpp
View File

@ -57,6 +57,22 @@ void BPWritten(const Bypass& bp)
// had to be ditched and the games seem to work fine with out it. // had to be ditched and the games seem to work fine with out it.
// -------------------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------------------
// Debugging only, this lets you skip a bp update
//static int times = 0;
//static bool enable = false;
//switch (bp.address)
//{
//case BPMEM_CONSTANTALPHA:
// {
// if (times == 0 && enable)
// return;
// else
// break;
// }
//default: break;
//}
FlushPipeline(); FlushPipeline();
((u32*)&bpmem)[bp.address] = bp.newvalue; ((u32*)&bpmem)[bp.address] = bp.newvalue;
@ -152,7 +168,7 @@ void BPWritten(const Bypass& bp)
break; break;
default: default:
DEBUG_LOG(VIDEO, "GXSetDrawDone ??? (value 0x%02X)", (bp.newvalue & 0xFFFF)); WARN_LOG(VIDEO, "GXSetDrawDone ??? (value 0x%02X)", (bp.newvalue & 0xFFFF));
break; break;
} }
break; break;
@ -260,12 +276,12 @@ void BPWritten(const Bypass& bp)
case BPMEM_FOGCOLOR: // Fog Color case BPMEM_FOGCOLOR: // Fog Color
PixelShaderManager::SetFogColorChanged(); PixelShaderManager::SetFogColorChanged();
break; break;
case BPMEM_ALPHACOMPARE: case BPMEM_ALPHACOMPARE: // Compare Alpha Values
PRIM_LOG("alphacmp: ref0=%d, ref1=%d, comp0=%d, comp1=%d, logic=%d", bpmem.alphaFunc.ref0, PRIM_LOG("alphacmp: ref0=%d, ref1=%d, comp0=%d, comp1=%d, logic=%d", bpmem.alphaFunc.ref0,
bpmem.alphaFunc.ref1, bpmem.alphaFunc.comp0, bpmem.alphaFunc.comp1, bpmem.alphaFunc.logic); bpmem.alphaFunc.ref1, bpmem.alphaFunc.comp0, bpmem.alphaFunc.comp1, bpmem.alphaFunc.logic);
PixelShaderManager::SetAlpha(bpmem.alphaFunc); PixelShaderManager::SetAlpha(bpmem.alphaFunc);
break; break;
case BPMEM_ZTEX1: // BIAS case BPMEM_BIAS: // BIAS
PRIM_LOG("ztex bias=0x%x", bpmem.ztex1.bias); PRIM_LOG("ztex bias=0x%x", bpmem.ztex1.bias);
PixelShaderManager::SetZTextureBias(bpmem.ztex1.bias); PixelShaderManager::SetZTextureBias(bpmem.ztex1.bias);
break; break;
@ -291,28 +307,50 @@ void BPWritten(const Bypass& bp)
case BPMEM_FIELDMODE: case BPMEM_FIELDMODE:
SetInterlacingMode(bp); SetInterlacingMode(bp);
break; break;
case BPMEM_CLOCK0: // Debugging/Profiling info, we don't care about them // ---------------------------------------------------
case BPMEM_CLOCK1: // Debugging/Profiling info, we don't care about them
case BPMEM_SU_COUNTER: // ---------------------------------------------------
case BPMEM_RAS_COUNTER: case BPMEM_CLOCK0: // Some Clock
case BPMEM_SETGPMETRIC: case BPMEM_CLOCK1: // Some Clock
case BPMEM_SU_COUNTER: // Pixel or Poly Count
case BPMEM_RAS_COUNTER: // Sound Count of something in the Texture Units
case BPMEM_SETGPMETRIC: // Set the Graphic Proccessor Metric
break; break;
// ----------------
// EFB Copy config
// ----------------
case BPMEM_EFB_TL: // EFB Source Rect. Top, Left case BPMEM_EFB_TL: // EFB Source Rect. Top, Left
case BPMEM_EFB_BR: // EFB Source Rect. Bottom, Right (w, h - 1) case BPMEM_EFB_BR: // EFB Source Rect. Bottom, Right (w, h - 1)
case BPMEM_EFB_ADDR: // EFB Target Address case BPMEM_EFB_ADDR: // EFB Target Address
break; break;
case BPMEM_CLEAR_AR: // Set Clear Alpha and Red Components // --------------
case BPMEM_CLEAR_GB: // Green and Blue // Clear Config
case BPMEM_CLEAR_Z: // Clear Z, 24-bit Z Value // --------------
case BPMEM_CLEAR_AR: // Alpha and Red Components
case BPMEM_CLEAR_GB: // Green and Blue Components
case BPMEM_CLEAR_Z: // Z Components (24-bit Zbuffer)
break; break;
case BPMEM_CLEARBBOX1: // let's hope not many games use bboxes.. // -------------------------
case BPMEM_CLEARBBOX2: // TODO(ector): add something that watches bboxes // Culling Occulsion, we don't support this
// let's hope not many games use bboxes..
// TODO(ector): add something that watches bboxes
// -------------------------
case BPMEM_CLEARBBOX1:
case BPMEM_CLEARBBOX2:
break; break;
case BPMEM_PE_CONTROL: // Pixel Engine Control (GXSetZCompLoc, GXPixModeSync) case BPMEM_ZCOMPARE: // Set the Z-Compare
case BPMEM_TEXINVALIDATE: // Used, if game has manual control the Texture Cache, which we don't allow case BPMEM_TEXINVALIDATE: // Used, if game has manual control the Texture Cache, which we don't allow
case BPMEM_MIPMAP_STRIDE: // MipMap Stride Channel case BPMEM_MIPMAP_STRIDE: // MipMap Stride Channel
case BPMEM_COPYYSCALE: // Display Copy Y Scale case BPMEM_COPYYSCALE: // Display Copy Y Scale
case BPMEM_IREF: // Something to do with Tev ordering case BPMEM_IREF: /* 24 RID
21 BC3 - Ind. Tex Stage 3 NTexCoord
18 BI3 - Ind. Tex Stage 3 NTexMap
15 BC2 - Ind. Tex Stage 2 NTexCoord
12 BI2 - Ind. Tex Stage 2 NTexMap
9 BC1 - Ind. Tex Stage 1 NTexCoord
6 BI1 - Ind. Tex Stage 1 NTexMap
3 BC0 - Ind. Tex Stage 0 NTexCoord
0 BI0 - Ind. Tex Stage 0 NTexMap */
break; break;
case BPMEM_TEV_KSEL: // Texture Environment Swap Mode Table 0 case BPMEM_TEV_KSEL: // Texture Environment Swap Mode Table 0
case BPMEM_TEV_KSEL+1:// Texture Environment Swap Mode Table 1 case BPMEM_TEV_KSEL+1:// Texture Environment Swap Mode Table 1
@ -323,10 +361,13 @@ void BPWritten(const Bypass& bp)
case BPMEM_TEV_KSEL+6:// Texture Environment Swap Mode Table 6 case BPMEM_TEV_KSEL+6:// Texture Environment Swap Mode Table 6
case BPMEM_TEV_KSEL+7:// Texture Environment Swap Mode Table 7 case BPMEM_TEV_KSEL+7:// Texture Environment Swap Mode Table 7
break; break;
case BPMEM_BP_MASK: // Masks case BPMEM_BP_MASK: // This Register can be used to limit to which bits of BP registers is actually written to. the mask is
case BPMEM_IND_IMASK: // only valid for the next BP command, and will reset itself.
case BPMEM_IND_IMASK: // Index Mask ?
break; break;
case BPMEM_UNKNOWN: // This is always set to 0xF at boot of any game, so this sounds like a useless reg case BPMEM_UNKNOWN: // This is always set to 0xF at boot of any game, so this sounds like a useless reg
if (bp.newvalue != 0x0F)
PanicAlert("Unknown is not 0xF! val = 0x%08x", bp.newvalue);
break; break;
// ------------------------------------------------ // ------------------------------------------------
@ -348,11 +389,11 @@ void BPWritten(const Bypass& bp)
case BPMEM_TREF+6: case BPMEM_TREF+6:
case BPMEM_TREF+7: case BPMEM_TREF+7:
break; break;
// --------------------------------------------- // ----------------------
// Mipmapping control of the polygon's wrapping // Set a triangle's Wrap
// --------------------------------------------- // ----------------------
case BPMEM_SU_SSIZE: // U case BPMEM_SU_SSIZE:
case BPMEM_SU_TSIZE: // V case BPMEM_SU_TSIZE:
case BPMEM_SU_SSIZE+2: case BPMEM_SU_SSIZE+2:
case BPMEM_SU_TSIZE+2: case BPMEM_SU_TSIZE+2:
case BPMEM_SU_SSIZE+4: case BPMEM_SU_SSIZE+4:
@ -369,12 +410,13 @@ void BPWritten(const Bypass& bp)
case BPMEM_SU_TSIZE+14: case BPMEM_SU_TSIZE+14:
break; break;
// ------------------------ // ------------------------
// Mipmapping mode control // BPMEM_TX_SETMODE0 - (Texture lookup and filtering mode) LOD/BIAS Clamp, MaxAnsio, LODBIAS, DiagLoad, Min Filter, Mag Filter, Wrap T, S
// BPMEM_TX_SETMODE1 - (LOD Stuff) - Max LOD, Min LOD
// ------------------------ // ------------------------
case BPMEM_TX_SETMODE0: // 0x90 for Linear, Index 0 case BPMEM_TX_SETMODE0: // (0x90 for linear)
case BPMEM_TX_SETMODE0+1: case BPMEM_TX_SETMODE0+1:
case BPMEM_TX_SETMODE0+2: case BPMEM_TX_SETMODE0+2:
case BPMEM_TX_SETMODE0+3: // Index 4 case BPMEM_TX_SETMODE0+3:
case BPMEM_TX_SETMODE1: case BPMEM_TX_SETMODE1:
case BPMEM_TX_SETMODE1+1: case BPMEM_TX_SETMODE1+1:
case BPMEM_TX_SETMODE1+2: case BPMEM_TX_SETMODE1+2:
@ -390,7 +432,10 @@ void BPWritten(const Bypass& bp)
SetSamplerState(bp); SetSamplerState(bp);
break; break;
// -------------------------------------------- // --------------------------------------------
// Mipmapping control of the polygon's texture // BPMEM_TX_SETIMAGE0 - Texture width, height, format
// BPMEM_TX_SETIMAGE1 - even LOD address in TMEM - Image Type, Cache Height, Cache Width, TMEM Offset
// BPMEM_TX_SETIMAGE2 - odd LOD address in TMEM - Cache Height, Cache Width, TMEM Offset
// BPMEM_TX_SETIMAGE3 - Address of Texture in main memory
// -------------------------------------------- // --------------------------------------------
case BPMEM_TX_SETIMAGE0: case BPMEM_TX_SETIMAGE0:
case BPMEM_TX_SETIMAGE0+1: case BPMEM_TX_SETIMAGE0+1:
@ -426,7 +471,8 @@ void BPWritten(const Bypass& bp)
case BPMEM_TX_SETIMAGE3_4+3: case BPMEM_TX_SETIMAGE3_4+3:
break; break;
// ------------------------------- // -------------------------------
// Mipmapping control of the TLUT // Set a TLUT
// BPMEM_TX_SETTLUT - Format, TMEM Offset (offset of TLUT from start of TMEM high bank > > 5)
// ------------------------------- // -------------------------------
case BPMEM_TX_SETTLUT: case BPMEM_TX_SETTLUT:
case BPMEM_TX_SETTLUT+1: case BPMEM_TX_SETTLUT+1:
@ -487,6 +533,8 @@ void BPWritten(const Bypass& bp)
break; break;
// -------------------------------------------------- // --------------------------------------------------
// Set Color/Alpha of a Tev // Set Color/Alpha of a Tev
// BPMEM_TEV_COLOR_ENV - Dest, Shift, Clamp, Sub, Bias, Sel A, Sel B, Sel C, Sel D
// BPMEM_TEV_ALPHA_ENV - Dest, Shift, Clamp, Sub, Bias, Sel A, Sel B, Sel C, Sel D, T Swap, R Swap
// -------------------------------------------------- // --------------------------------------------------
case BPMEM_TEV_COLOR_ENV: // Texture Environment 1 case BPMEM_TEV_COLOR_ENV: // Texture Environment 1
case BPMEM_TEV_ALPHA_ENV: case BPMEM_TEV_ALPHA_ENV: