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

SW/Tev: Replace Tev::SetRegColor with Tev::SetKonstColors

This commit is contained in:
Pokechu22 2021-12-26 13:24:47 -08:00
parent 3b9a048291
commit ae0fcd9a9f
5 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/VideoBackends/Software/Rasterizer.cpp
View File

@ -140,9 +140,9 @@ static inline int iround(float x)
return t; return t;
} }
void SetTevReg(int reg, int comp, s16 color) void SetTevKonstColors()
{ {
tev.SetRegColor(reg, comp, color); tev.SetKonstColors();
} }
static void Draw(s32 x, s32 y, s32 xi, s32 yi) static void Draw(s32 x, s32 y, s32 xi, s32 yi)

2
Source/Core/VideoBackends/Software/Rasterizer.h
View File

@ -17,7 +17,7 @@ void UpdateZSlope(const OutputVertexData* v0, const OutputVertexData* v1,
void DrawTriangleFrontFace(const OutputVertexData* v0, const OutputVertexData* v1, void DrawTriangleFrontFace(const OutputVertexData* v0, const OutputVertexData* v1,
const OutputVertexData* v2); const OutputVertexData* v2);
void SetTevReg(int reg, int comp, s16 color); void SetTevKonstColors();
struct RasterBlockPixel struct RasterBlockPixel
{ {

10
Source/Core/VideoBackends/Software/SWVertexLoader.cpp
View File

@ -67,15 +67,7 @@ void SWVertexLoader::DrawCurrentBatch(u32 base_index, u32 num_indices, u32 base_
g_renderer->BBoxFlush(); g_renderer->BBoxFlush();
m_setup_unit.Init(primitive_type); m_setup_unit.Init(primitive_type);
Rasterizer::SetTevKonstColors();
// set all states with are stored within video sw
for (int i = 0; i < 4; i++)
{
Rasterizer::SetTevReg(i, Tev::RED_C, PixelShaderManager::constants.kcolors[i][0]);
Rasterizer::SetTevReg(i, Tev::GRN_C, PixelShaderManager::constants.kcolors[i][1]);
Rasterizer::SetTevReg(i, Tev::BLU_C, PixelShaderManager::constants.kcolors[i][2]);
Rasterizer::SetTevReg(i, Tev::ALP_C, PixelShaderManager::constants.kcolors[i][3]);
}
for (u32 i = 0; i < m_index_generator.GetIndexLen(); i++) for (u32 i = 0; i < m_index_generator.GetIndexLen(); i++)
{ {

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

@ -740,7 +740,13 @@ void Tev::Draw()
EfbInterface::BlendTev(Position[0], Position[1], output); EfbInterface::BlendTev(Position[0], Position[1], output);
} }
void Tev::SetRegColor(int reg, int comp, s16 color) void Tev::SetKonstColors()
{ {
KonstantColors[reg][comp] = color; for (int i = 0; i < 4; i++)
{
KonstantColors[i].r = PixelShaderManager::constants.kcolors[i][0];
KonstantColors[i].g = PixelShaderManager::constants.kcolors[i][1];
KonstantColors[i].b = PixelShaderManager::constants.kcolors[i][2];
KonstantColors[i].a = PixelShaderManager::constants.kcolors[i][3];
}
} }

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

@ -226,7 +226,6 @@ public:
RED_C RED_C
}; };
void SetKonstColors();
void Draw(); void Draw();
void SetRegColor(int reg, int comp, s16 color);
}; };