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

VideoCommon: De-globalize PixelShaderManager class.

Browse Source
This commit is contained in:
Admiral H. Curtiss
2022-12-27 17:42:02 +01:00
parent 529909fe90
commit 725bd64ec2
22 changed files with 197 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,9 @@
#include "Common/ChunkFile.h"
#include "Common/CommonTypes.h"
#include "Core/System.h"
#include "VideoBackends/Software/EfbInterface.h"
#include "VideoBackends/Software/SWBoundingBox.h"
#include "VideoBackends/Software/TextureSampler.h"
@ -396,13 +399,16 @@ void Tev::Draw()
INCSTAT(g_stats.this_frame.tev_pixels_in);
auto& system = Core::System::GetInstance();
auto& pixel_shader_manager = system.GetPixelShaderManager();
// initial color values
for (int i = 0; i < 4; i++)
{
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];
Reg[static_cast<TevOutput>(i)].r = pixel_shader_manager.constants.colors[i][0];
Reg[static_cast<TevOutput>(i)].g = pixel_shader_manager.constants.colors[i][1];
Reg[static_cast<TevOutput>(i)].b = pixel_shader_manager.constants.colors[i][2];
Reg[static_cast<TevOutput>(i)].a = pixel_shader_manager.constants.colors[i][3];
}
for (unsigned int stageNum = 0; stageNum < bpmem.genMode.numindstages; stageNum++)
@ -694,11 +700,14 @@ void Tev::Draw()
void Tev::SetKonstColors()
{
auto& system = Core::System::GetInstance();
auto& pixel_shader_manager = system.GetPixelShaderManager();
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];
KonstantColors[i].r = pixel_shader_manager.constants.kcolors[i][0];
KonstantColors[i].g = pixel_shader_manager.constants.kcolors[i][1];
KonstantColors[i].b = pixel_shader_manager.constants.kcolors[i][2];
KonstantColors[i].a = pixel_shader_manager.constants.kcolors[i][3];
}
}