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

SW/Tev: Use EnumMap for Reg

This commit is contained in:
Pokechu22 2021-12-21 18:03:47 -08:00
parent 2db7569463
commit b02992548e
2 changed files with 49 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Source/Core/VideoBackends/Software/Tev.cpp
View File

@ -120,7 +120,7 @@ void Tev::DrawColorRegular(const TevStageCombiner::ColorCombiner& cc, const Inpu
temp;
result = result >> m_ScaleRShiftLUT[u32(cc.scale.Value())];
Reg[u32(cc.dest.Value())][i] = result;
Reg[cc.dest][i] = result;
}
}
@ -157,9 +157,9 @@ void Tev::DrawColorCompare(const TevStageCombiner::ColorCombiner& cc, const Inpu
}
if (cc.comparison == TevComparison::GT)
Reg[u32(cc.dest.Value())][i] = inputs[i].d + ((a > b) ? inputs[i].c : 0);
Reg[cc.dest][i] = inputs[i].d + ((a > b) ? inputs[i].c : 0);
else
Reg[u32(cc.dest.Value())][i] = inputs[i].d + ((a == b) ? inputs[i].c : 0);
Reg[cc.dest][i] = inputs[i].d + ((a == b) ? inputs[i].c : 0);
}
}
@ -179,7 +179,7 @@ void Tev::DrawAlphaRegular(const TevStageCombiner::AlphaCombiner& ac, const Inpu
temp;
result = result >> m_ScaleRShiftLUT[u32(ac.scale.Value())];
Reg[u32(ac.dest.Value())].a = result;
Reg[ac.dest].a = result;
}
void Tev::DrawAlphaCompare(const TevStageCombiner::AlphaCombiner& ac, const InputRegType inputs[4])
@ -213,9 +213,9 @@ void Tev::DrawAlphaCompare(const TevStageCombiner::AlphaCombiner& ac, const Inpu
}
if (ac.comparison == TevComparison::GT)
Reg[u32(ac.dest.Value())].a = inputs[ALP_C].d + ((a > b) ? inputs[ALP_C].c : 0);
Reg[ac.dest].a = inputs[ALP_C].d + ((a > b) ? inputs[ALP_C].c : 0);
else
Reg[u32(ac.dest.Value())].a = inputs[ALP_C].d + ((a == b) ? inputs[ALP_C].c : 0);
Reg[ac.dest].a = inputs[ALP_C].d + ((a == b) ? inputs[ALP_C].c : 0);
}
static bool AlphaCompare(int alpha, int ref, CompareMode comp)
@ -422,10 +422,10 @@ void Tev::Draw()
// initial color values
for (int i = 0; i < 4; i++)
{
Reg[i].r = PixelShaderManager::constants.colors[i][0];
Reg[i].g = PixelShaderManager::constants.colors[i][1];
Reg[i].b = PixelShaderManager::constants.colors[i][2];
Reg[i].a = PixelShaderManager::constants.colors[i][3];
Reg[static_cast<TevOutput>(i)].r = PixelShaderManager::constants.colors[i][0];
Reg[static_cast<TevOutput>(i)].g = PixelShaderManager::constants.colors[i][1];
Reg[static_cast<TevOutput>(i)].b = PixelShaderManager::constants.colors[i][2];
Reg[static_cast<TevOutput>(i)].a = PixelShaderManager::constants.colors[i][3];
}
for (unsigned int stageNum = 0; stageNum < bpmem.genMode.numindstages; stageNum++)
@ -552,15 +552,15 @@ void Tev::Draw()
if (cc.clamp)
{
Reg[u32(cc.dest.Value())].r = Clamp255(Reg[u32(cc.dest.Value())].r);
Reg[u32(cc.dest.Value())].g = Clamp255(Reg[u32(cc.dest.Value())].g);
Reg[u32(cc.dest.Value())].b = Clamp255(Reg[u32(cc.dest.Value())].b);
Reg[cc.dest].r = Clamp255(Reg[cc.dest].r);
Reg[cc.dest].g = Clamp255(Reg[cc.dest].g);
Reg[cc.dest].b = Clamp255(Reg[cc.dest].b);
}
else
{
Reg[u32(cc.dest.Value())].r = Clamp1024(Reg[u32(cc.dest.Value())].r);
Reg[u32(cc.dest.Value())].g = Clamp1024(Reg[u32(cc.dest.Value())].g);
Reg[u32(cc.dest.Value())].b = Clamp1024(Reg[u32(cc.dest.Value())].b);
Reg[cc.dest].r = Clamp1024(Reg[cc.dest].r);
Reg[cc.dest].g = Clamp1024(Reg[cc.dest].g);
Reg[cc.dest].b = Clamp1024(Reg[cc.dest].b);
}
if (ac.bias != TevBias::Compare)
@ -569,14 +569,15 @@ void Tev::Draw()
DrawAlphaCompare(ac, inputs);
if (ac.clamp)
Reg[u32(ac.dest.Value())].a = Clamp255(Reg[u32(ac.dest.Value())].a);
Reg[ac.dest].a = Clamp255(Reg[ac.dest].a);
else
Reg[u32(ac.dest.Value())].a = Clamp1024(Reg[u32(ac.dest.Value())].a);
Reg[ac.dest].a = Clamp1024(Reg[ac.dest].a);
#if ALLOW_TEV_DUMPS
if (g_ActiveConfig.bDumpTevStages)
{
u8 stage[4] = {(u8)Reg[0].r, (u8)Reg[0].g, (u8)Reg[0].b, (u8)Reg[0].a};
u8 stage[4] = {(u8)Reg[cc.dest].r, (u8)Reg[cc.dest].g, (u8)Reg[cc.dest].b,
(u8)Reg[ac.dest].a};
DebugUtil::DrawTempBuffer(stage, DIRECT + stageNum);
}
#endif
@ -585,10 +586,10 @@ void Tev::Draw()
// convert to 8 bits per component
// the results of the last tev stage are put onto the screen,
// regardless of the used destination register - TODO: Verify!
const u32 color_index = u32(bpmem.combiners[bpmem.genMode.numtevstages].colorC.dest.Value());
const u32 alpha_index = u32(bpmem.combiners[bpmem.genMode.numtevstages].alphaC.dest.Value());
u8 output[4] = {(u8)Reg[alpha_index].a, (u8)Reg[color_index].r, (u8)Reg[color_index].g,
(u8)Reg[color_index].b};
const auto& color_index = bpmem.combiners[bpmem.genMode.numtevstages].colorC.dest;
const auto& alpha_index = bpmem.combiners[bpmem.genMode.numtevstages].alphaC.dest;
u8 output[4] = {(u8)Reg[alpha_index].a, (u8)Reg[color_index].b, (u8)Reg[color_index].g,
(u8)Reg[color_index].r};
if (!TevAlphaTest(output[ALP_C]))
return;

50
Source/Core/VideoBackends/Software/Tev.h
View File

@ -102,7 +102,7 @@ class Tev
};
// color order: ABGR
std::array<TevColor, 4> Reg;
Common::EnumMap<TevColor, TevOutput::Color2> Reg;
std::array<TevColor, 4> KonstantColors;
TevColor TexColor;
TevColor RasColor;
@ -124,32 +124,32 @@ class Tev
TextureCoordinateType TexCoord;
const Common::EnumMap<TevColorRef, TevColorArg::Zero> m_ColorInputLUT{
TevColorRef::Color(Reg[0]), // prev.rgb
TevColorRef::Alpha(Reg[0]), // prev.aaa
TevColorRef::Color(Reg[1]), // c0.rgb
TevColorRef::Alpha(Reg[1]), // c0.aaa
TevColorRef::Color(Reg[2]), // c1.rgb
TevColorRef::Alpha(Reg[2]), // c1.aaa
TevColorRef::Color(Reg[3]), // c2.rgb
TevColorRef::Alpha(Reg[3]), // c2.aaa
TevColorRef::Color(TexColor), // tex.rgb
TevColorRef::Alpha(TexColor), // tex.aaa
TevColorRef::Color(RasColor), // ras.rgb
TevColorRef::Alpha(RasColor), // ras.aaa
TevColorRef::All(V1), // one
TevColorRef::All(V1_2), // half
TevColorRef::Color(StageKonst), // konst
TevColorRef::All(V0), // zero
TevColorRef::Color(Reg[TevOutput::Prev]), // prev.rgb
TevColorRef::Alpha(Reg[TevOutput::Prev]), // prev.aaa
TevColorRef::Color(Reg[TevOutput::Color0]), // c0.rgb
TevColorRef::Alpha(Reg[TevOutput::Color0]), // c0.aaa
TevColorRef::Color(Reg[TevOutput::Color1]), // c1.rgb
TevColorRef::Alpha(Reg[TevOutput::Color1]), // c1.aaa
TevColorRef::Color(Reg[TevOutput::Color2]), // c2.rgb
TevColorRef::Alpha(Reg[TevOutput::Color2]), // c2.aaa
TevColorRef::Color(TexColor), // tex.rgb
TevColorRef::Alpha(TexColor), // tex.aaa
TevColorRef::Color(RasColor), // ras.rgb
TevColorRef::Alpha(RasColor), // ras.aaa
TevColorRef::All(V1), // one
TevColorRef::All(V1_2), // half
TevColorRef::Color(StageKonst), // konst
TevColorRef::All(V0), // zero
};
const Common::EnumMap<TevAlphaRef, TevAlphaArg::Zero> m_AlphaInputLUT{
TevAlphaRef(Reg[0]), // prev
TevAlphaRef(Reg[1]), // c0
TevAlphaRef(Reg[2]), // c1
TevAlphaRef(Reg[3]), // c2
TevAlphaRef(TexColor), // tex
TevAlphaRef(RasColor), // ras
TevAlphaRef(StageKonst), // konst
TevAlphaRef(V0), // zero
TevAlphaRef(Reg[TevOutput::Prev]), // prev
TevAlphaRef(Reg[TevOutput::Color0]), // c0
TevAlphaRef(Reg[TevOutput::Color1]), // c1
TevAlphaRef(Reg[TevOutput::Color2]), // c2
TevAlphaRef(TexColor), // tex
TevAlphaRef(RasColor), // ras
TevAlphaRef(StageKonst), // konst
TevAlphaRef(V0), // zero
};
const Common::EnumMap<TevKonstRef, KonstSel::K3_A> m_KonstLUT{
TevKonstRef::Value(V1), // 1