hwpplayer1/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

SwRasterizer/Lighting: Move the lighting enable check outside the ComputeFragmentsColors function.

Browse source
This commit is contained in:
Subv 2017-06-28 12:37:14 -05:00 committed by wwylele
parent b8229a7684
commit 7526af5e52
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/video_core/swrasterizer/rasterizer.cpp
View file

@ -132,9 +132,6 @@ std::tuple<Math::Vec4<u8>, Math::Vec4<u8>> ComputeFragmentsColors(
const Pica::LightingRegs& lighting, const Math::Quaternion<float>& normquat, const Pica::LightingRegs& lighting, const Math::Quaternion<float>& normquat,
const Math::Vec3<float>& view) { const Math::Vec3<float>& view) {
if (lighting.disable)
return {Math::MakeVec<u8>(0, 0, 0, 0), Math::MakeVec<u8>(0, 0, 0, 0)};
// TODO(Subv): Bump mapping // TODO(Subv): Bump mapping
Math::Vec3<float> surface_normal = {0.0f, 0.0f, 1.0f}; Math::Vec3<float> surface_normal = {0.0f, 0.0f, 1.0f};
@ -728,11 +725,13 @@ static void ProcessTriangleInternal(const Vertex& v0, const Vertex& v1, const Ve
regs.texturing.tev_combiner_buffer_color.a, regs.texturing.tev_combiner_buffer_color.a,
}; };
Math::Vec4<u8> primary_fragment_color; Math::Vec4<u8> primary_fragment_color = {0, 0, 0, 0};
Math::Vec4<u8> secondary_fragment_color; Math::Vec4<u8> secondary_fragment_color = {0, 0, 0, 0};
std::tie(primary_fragment_color, secondary_fragment_color) = if (!g_state.regs.lighting.disable) {
ComputeFragmentsColors(g_state.regs.lighting, normquat, fragment_position); std::tie(primary_fragment_color, secondary_fragment_color) =
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) {