citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

SwRasterizer/Lighting: Do not use global registers state in ComputeFragmentsColors.

This commit is contained in:
Subv 2017-06-28 12:35:35 -05:00 committed by wwylele
parent 7bc467e872
commit b8229a7684
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/video_core/swrasterizer/rasterizer.cpp
View File

@ -129,8 +129,8 @@ static float LookupLightingLut(const Pica::State::Lighting& lighting, size_t lut
} }
std::tuple<Math::Vec4<u8>, Math::Vec4<u8>> ComputeFragmentsColors( std::tuple<Math::Vec4<u8>, Math::Vec4<u8>> ComputeFragmentsColors(
const Math::Quaternion<float>& normquat, const Math::Vec3<float>& view) { const Pica::LightingRegs& lighting, const Math::Quaternion<float>& normquat,
const auto& lighting = g_state.regs.lighting; const Math::Vec3<float>& view) {
if (lighting.disable) if (lighting.disable)
return {Math::MakeVec<u8>(0, 0, 0, 0), Math::MakeVec<u8>(0, 0, 0, 0)}; return {Math::MakeVec<u8>(0, 0, 0, 0), Math::MakeVec<u8>(0, 0, 0, 0)};
@ -732,7 +732,7 @@ static void ProcessTriangleInternal(const Vertex& v0, const Vertex& v1, const Ve
Math::Vec4<u8> secondary_fragment_color; Math::Vec4<u8> secondary_fragment_color;
std::tie(primary_fragment_color, secondary_fragment_color) = std::tie(primary_fragment_color, secondary_fragment_color) =
ComputeFragmentsColors(normquat, fragment_position); ComputeFragmentsColors(g_state.regs.lighting, normquat, fragment_position);
for (unsigned tev_stage_index = 0; tev_stage_index < tev_stages.size(); for (unsigned tev_stage_index = 0; tev_stage_index < tev_stages.size();
++tev_stage_index) { ++tev_stage_index) {