piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 23:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

VideoCommon: reimplement Dirty() in PixelShaderManager

Browse Source 
This isn't needed in VertexShaderManager as it's still in the old dirty flag way.

But it's very importend for PixelShaderManager as some float4s aren't initialized as 0.0f
This commit is contained in:
degasus
2013-10-12 17:56:41 +02:00
parent 50c404ce4a
commit 2754c1132e
3 changed files with 58 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -173,11 +173,11 @@ void BPWritten(const BPCmd& bp)
break; break;
case BPMEM_RAS1_SS0: // Index Texture Coordinate Scale 0 case BPMEM_RAS1_SS0: // Index Texture Coordinate Scale 0
if(bp.changes) if(bp.changes)
PixelShaderManager::SetIndTexScaleChanged(0x03); PixelShaderManager::SetIndTexScaleChanged(false);
break; break;
case BPMEM_RAS1_SS1: // Index Texture Coordinate Scale 1 case BPMEM_RAS1_SS1: // Index Texture Coordinate Scale 1
if(bp.changes) if(bp.changes)
PixelShaderManager::SetIndTexScaleChanged(0x0c); PixelShaderManager::SetIndTexScaleChanged(true);
break; break;
// ---------------- // ----------------
// Scissor Control // Scissor Control
@ -225,7 +225,7 @@ void BPWritten(const BPCmd& bp)
{ {
PRIM_LOG("constalpha: alp=%d, en=%d", bpmem.dstalpha.alpha, bpmem.dstalpha.enable); PRIM_LOG("constalpha: alp=%d, en=%d", bpmem.dstalpha.alpha, bpmem.dstalpha.enable);
if(bp.changes & 0xFF) if(bp.changes & 0xFF)
PixelShaderManager::SetDestAlpha(bpmem.dstalpha); PixelShaderManager::SetDestAlpha();
if(bp.changes & 0x100) if(bp.changes & 0x100)
SetBlendMode(); SetBlendMode();
break; break;
@ -364,14 +364,14 @@ void BPWritten(const BPCmd& bp)
PRIM_LOG("alphacmp: ref0=%d, ref1=%d, comp0=%d, comp1=%d, logic=%d", bpmem.alpha_test.ref0, PRIM_LOG("alphacmp: ref0=%d, ref1=%d, comp0=%d, comp1=%d, logic=%d", bpmem.alpha_test.ref0,
bpmem.alpha_test.ref1, bpmem.alpha_test.comp0, bpmem.alpha_test.comp1, bpmem.alpha_test.logic); bpmem.alpha_test.ref1, bpmem.alpha_test.comp0, bpmem.alpha_test.comp1, bpmem.alpha_test.logic);
if(bp.changes & 0xFFFF) if(bp.changes & 0xFFFF)
PixelShaderManager::SetAlpha(bpmem.alpha_test); PixelShaderManager::SetAlpha();
if(bp.changes) if(bp.changes)
g_renderer->SetColorMask(); g_renderer->SetColorMask();
break; break;
case BPMEM_BIAS: // BIAS case BPMEM_BIAS: // BIAS
PRIM_LOG("ztex bias=0x%x", bpmem.ztex1.bias); PRIM_LOG("ztex bias=0x%x", bpmem.ztex1.bias);
if(bp.changes) if(bp.changes)
PixelShaderManager::SetZTextureBias(bpmem.ztex1.bias); PixelShaderManager::SetZTextureBias();
break; break;
case BPMEM_ZTEX2: // Z Texture type case BPMEM_ZTEX2: // Z Texture type
{ {
@ -636,9 +636,9 @@ void BPWritten(const BPCmd& bp)
// don't compare with changes! // don't compare with changes!
int num = (bp.address >> 1) & 0x3; int num = (bp.address >> 1) & 0x3;
if ((bp.address & 1) == 0) if ((bp.address & 1) == 0)
PixelShaderManager::SetColorChanged(bpmem.tevregs[num].low.type, num, false); PixelShaderManager::SetColorChanged(bpmem.tevregs[num].low.type, num);
else else
PixelShaderManager::SetColorChanged(bpmem.tevregs[num].high.type, num, true); PixelShaderManager::SetColorChanged(bpmem.tevregs[num].high.type, num);
} }
break; break;

71
Source/Core/VideoCommon/Src/PixelShaderManager.cpp
View File

@ -27,7 +27,35 @@ void PixelShaderManager::Dirty()
{ {
s_bFogRangeAdjustChanged = true; s_bFogRangeAdjustChanged = true;
nLightsChanged[0] = 0; nLightsChanged[1] = 0x80; nLightsChanged[0] = 0; nLightsChanged[1] = 0x80;
dirty = true;
SetColorChanged(0, 0);
SetColorChanged(0, 1);
SetColorChanged(0, 2);
SetColorChanged(0, 3);
SetColorChanged(1, 0);
SetColorChanged(1, 1);
SetColorChanged(1, 2);
SetColorChanged(1, 3);
SetAlpha();
SetDestAlpha();
SetZTextureBias();
SetViewportChanged();
SetIndTexScaleChanged(false);
SetIndTexScaleChanged(true);
SetIndMatrixChanged(0);
SetIndMatrixChanged(1);
SetIndMatrixChanged(2);
SetZTextureTypeChanged();
SetTexCoordChanged(0);
SetTexCoordChanged(1);
SetTexCoordChanged(2);
SetTexCoordChanged(3);
SetTexCoordChanged(4);
SetTexCoordChanged(5);
SetTexCoordChanged(6);
SetTexCoordChanged(7);
SetFogColorChanged();
SetFogParamChanged();
} }
void PixelShaderManager::Shutdown() void PixelShaderManager::Shutdown()
@ -111,34 +139,28 @@ void PixelShaderManager::SetConstants(u32 components)
// TODO: Move conversion out, only store the raw color value // TODO: Move conversion out, only store the raw color value
// and update it when the shader constant is set, only. // and update it when the shader constant is set, only.
// TODO: Conversion should be checked in the context of tev_fixes.. // TODO: Conversion should be checked in the context of tev_fixes..
void PixelShaderManager::SetColorChanged(int type, int num, bool high) void PixelShaderManager::SetColorChanged(int type, int num)
{ {
float4* c = type ? constants.kcolors : constants.colors; float4* c = type ? constants.kcolors : constants.colors;
if (!high) c[num][0] = bpmem.tevregs[num].low.a / 255.0f;
{ c[num][3] = bpmem.tevregs[num].low.b / 255.0f;
c[num][0] = bpmem.tevregs[num].low.a / 255.0f; c[num][2] = bpmem.tevregs[num].high.a / 255.0f;
c[num][3] = bpmem.tevregs[num].low.b / 255.0f; c[num][1] = bpmem.tevregs[num].high.b / 255.0f;
}
else
{
c[num][2] = bpmem.tevregs[num].high.a / 255.0f;
c[num][1] = bpmem.tevregs[num].high.b / 255.0f;
}
dirty = true; dirty = true;
PRIM_LOG("pixel %scolor%d: %f %f %f %f\n", type?"k":"", num, c[num][0], c[num][1], c[num][2], c[num][3]); PRIM_LOG("pixel %scolor%d: %f %f %f %f\n", type?"k":"", num, c[num][0], c[num][1], c[num][2], c[num][3]);
} }
void PixelShaderManager::SetAlpha(const AlphaTest& alpha) void PixelShaderManager::SetAlpha()
{ {
constants.alpha[0] = alpha.ref0 / 255.0f; constants.alpha[0] = bpmem.alpha_test.ref0 / 255.0f;
constants.alpha[1] = alpha.ref1 / 255.0f; constants.alpha[1] = bpmem.alpha_test.ref1 / 255.0f;
dirty = true; dirty = true;
} }
void PixelShaderManager::SetDestAlpha(const ConstantAlpha& alpha) void PixelShaderManager::SetDestAlpha()
{ {
constants.alpha[3] = alpha.alpha / 255.0f; constants.alpha[3] = bpmem.dstalpha.alpha / 255.0f;
dirty = true; dirty = true;
} }
@ -153,9 +175,9 @@ void PixelShaderManager::SetTexDims(int texmapid, u32 width, u32 height, u32 wra
constants.texdims[texmapid][1] = 1.0f/height; constants.texdims[texmapid][1] = 1.0f/height;
} }
void PixelShaderManager::SetZTextureBias(u32 bias) void PixelShaderManager::SetZTextureBias()
{ {
constants.zbias[1][3] = bias/16777215.0f; constants.zbias[1][3] = bpmem.ztex1.bias/16777215.0f;
dirty = true; dirty = true;
} }
@ -168,13 +190,12 @@ void PixelShaderManager::SetViewportChanged()
s_bFogRangeAdjustChanged = true; // TODO: Shouldn't be necessary with an accurate fog range adjust implementation s_bFogRangeAdjustChanged = true; // TODO: Shouldn't be necessary with an accurate fog range adjust implementation
} }
void PixelShaderManager::SetIndTexScaleChanged(u8 stagemask) void PixelShaderManager::SetIndTexScaleChanged(bool high)
{ {
bool high_stage = stagemask == 0x0c; constants.indtexscale[high][0] = bpmem.texscale[high].getScaleS(0);
constants.indtexscale[high_stage][0] = bpmem.texscale[high_stage].getScaleS(0); constants.indtexscale[high][1] = bpmem.texscale[high].getScaleT(0);
constants.indtexscale[high_stage][1] = bpmem.texscale[high_stage].getScaleT(0); constants.indtexscale[high][2] = bpmem.texscale[high].getScaleS(1);
constants.indtexscale[high_stage][2] = bpmem.texscale[high_stage].getScaleS(1); constants.indtexscale[high][3] = bpmem.texscale[high].getScaleT(1);
constants.indtexscale[high_stage][3] = bpmem.texscale[high_stage].getScaleT(1);
dirty = true; dirty = true;
} }

10
Source/Core/VideoCommon/Src/PixelShaderManager.h
View File

@ -26,16 +26,16 @@ public:
static void SetConstants(u32 components); // sets pixel shader constants static void SetConstants(u32 components); // sets pixel shader constants
// constant management, should be called after memory is committed // constant management, should be called after memory is committed
static void SetColorChanged(int type, int index, bool high); static void SetColorChanged(int type, int index);
static void SetAlpha(const AlphaTest& alpha); static void SetAlpha();
static void SetDestAlpha(const ConstantAlpha& alpha); static void SetDestAlpha();
static void SetTexDims(int texmapid, u32 width, u32 height, u32 wraps, u32 wrapt); static void SetTexDims(int texmapid, u32 width, u32 height, u32 wraps, u32 wrapt);
static void SetZTextureBias(u32 bias); static void SetZTextureBias();
static void SetViewportChanged(); static void SetViewportChanged();
static void SetIndMatrixChanged(int matrixidx); static void SetIndMatrixChanged(int matrixidx);
static void SetTevKSelChanged(int id); static void SetTevKSelChanged(int id);
static void SetZTextureTypeChanged(); static void SetZTextureTypeChanged();
static void SetIndTexScaleChanged(u8 stagemask); static void SetIndTexScaleChanged(bool high);
static void SetTexCoordChanged(u8 texmapid); static void SetTexCoordChanged(u8 texmapid);
static void SetFogColorChanged(); static void SetFogColorChanged();
static void SetFogParamChanged(); static void SetFogParamChanged();