summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2017-06-28 19:34:16 +0200
committerwwylele <wwylele@gmail.com>2017-07-11 18:39:15 +0200
commit7bc467e8725c6751eb44ea45ff2203af8692cda1 (patch)
treebcc21b0d48574dad3c8036905b3fe179f6e39640 /src
parentSwRasterizer/Lighting: Fixed a bug where the distance attenuation bias was being set to the dist atten scale. (diff)
downloadyuzu-7bc467e8725c6751eb44ea45ff2203af8692cda1.tar
yuzu-7bc467e8725c6751eb44ea45ff2203af8692cda1.tar.gz
yuzu-7bc467e8725c6751eb44ea45ff2203af8692cda1.tar.bz2
yuzu-7bc467e8725c6751eb44ea45ff2203af8692cda1.tar.lz
yuzu-7bc467e8725c6751eb44ea45ff2203af8692cda1.tar.xz
yuzu-7bc467e8725c6751eb44ea45ff2203af8692cda1.tar.zst
yuzu-7bc467e8725c6751eb44ea45ff2203af8692cda1.zip
Diffstat (limited to 'src')
-rw-r--r--src/video_core/pica_state.h2
-rw-r--r--src/video_core/swrasterizer/rasterizer.cpp33
2 files changed, 22 insertions, 13 deletions
diff --git a/src/video_core/pica_state.h b/src/video_core/pica_state.h
index 2d23d34e6..864a2c9e6 100644
--- a/src/video_core/pica_state.h
+++ b/src/video_core/pica_state.h
@@ -79,7 +79,7 @@ struct State {
std::array<ColorDifferenceEntry, 256> color_diff_table;
} proctex;
- struct {
+ struct Lighting {
union LutEntry {
// Used for raw access
u32 raw;
diff --git a/src/video_core/swrasterizer/rasterizer.cpp b/src/video_core/swrasterizer/rasterizer.cpp
index 48ed8ccbf..b69f7b692 100644
--- a/src/video_core/swrasterizer/rasterizer.cpp
+++ b/src/video_core/swrasterizer/rasterizer.cpp
@@ -115,12 +115,15 @@ static std::tuple<float24, float24, PAddr> ConvertCubeCoord(float24 u, float24 v
return std::make_tuple(x / z * half + half, y / z * half + half, addr);
}
-float LookupLightingLut(size_t lut_index, u8 index, float delta) {
- ASSERT_MSG(lut_index < g_state.lighting.luts.size(), "Out of range lut");
- ASSERT_MSG(index < g_state.lighting.luts[0].size(), "Out of range index");
+static float LookupLightingLut(const Pica::State::Lighting& lighting, size_t lut_index, u8 index,
+ float delta) {
+ ASSERT_MSG(lut_index < lighting.luts.size(), "Out of range lut");
+ ASSERT_MSG(index < lighting.luts[0].size(), "Out of range index");
- float lut_value = g_state.lighting.luts[lut_index][index].ToFloat();
- float lut_diff = g_state.lighting.luts[lut_index][index].DiffToFloat();
+ const auto& lut = lighting.luts[lut_index][index];
+
+ float lut_value = lut.ToFloat();
+ float lut_diff = lut.DiffToFloat();
return lut_value + lut_diff * delta;
}
@@ -184,7 +187,7 @@ std::tuple<Math::Vec4<u8>, Math::Vec4<u8>> ComputeFragmentsColors(
u8 lutindex =
static_cast<u8>(MathUtil::Clamp(std::floor(sample_loc * 256.f), 0.0f, 255.0f));
float delta = sample_loc * 256 - lutindex;
- dist_atten = LookupLightingLut(lut, lutindex, delta);
+ dist_atten = LookupLightingLut(g_state.lighting, lut, lutindex, delta);
}
float clamp_highlights = 1.0f;
@@ -260,7 +263,8 @@ std::tuple<Math::Vec4<u8>, Math::Vec4<u8>> ComputeFragmentsColors(
d0_lut_value =
scale *
- LookupLightingLut(static_cast<size_t>(LightingRegs::LightingSampler::Distribution0),
+ LookupLightingLut(g_state.lighting,
+ static_cast<size_t>(LightingRegs::LightingSampler::Distribution0),
index, delta);
}
@@ -280,7 +284,8 @@ std::tuple<Math::Vec4<u8>, Math::Vec4<u8>> ComputeFragmentsColors(
refl_value.x =
scale *
- LookupLightingLut(static_cast<size_t>(LightingRegs::LightingSampler::ReflectRed),
+ LookupLightingLut(g_state.lighting,
+ static_cast<size_t>(LightingRegs::LightingSampler::ReflectRed),
index, delta);
} else {
refl_value.x = 1.0f;
@@ -300,7 +305,8 @@ std::tuple<Math::Vec4<u8>, Math::Vec4<u8>> ComputeFragmentsColors(
refl_value.y =
scale *
- LookupLightingLut(static_cast<size_t>(LightingRegs::LightingSampler::ReflectGreen),
+ LookupLightingLut(g_state.lighting,
+ static_cast<size_t>(LightingRegs::LightingSampler::ReflectGreen),
index, delta);
} else {
refl_value.y = refl_value.x;
@@ -320,7 +326,8 @@ std::tuple<Math::Vec4<u8>, Math::Vec4<u8>> ComputeFragmentsColors(
refl_value.z =
scale *
- LookupLightingLut(static_cast<size_t>(LightingRegs::LightingSampler::ReflectBlue),
+ LookupLightingLut(g_state.lighting,
+ static_cast<size_t>(LightingRegs::LightingSampler::ReflectBlue),
index, delta);
} else {
refl_value.z = refl_value.x;
@@ -341,7 +348,8 @@ std::tuple<Math::Vec4<u8>, Math::Vec4<u8>> ComputeFragmentsColors(
d1_lut_value =
scale *
- LookupLightingLut(static_cast<size_t>(LightingRegs::LightingSampler::Distribution1),
+ LookupLightingLut(g_state.lighting,
+ static_cast<size_t>(LightingRegs::LightingSampler::Distribution1),
index, delta);
}
@@ -362,7 +370,8 @@ std::tuple<Math::Vec4<u8>, Math::Vec4<u8>> ComputeFragmentsColors(
float lut_value =
scale *
- LookupLightingLut(static_cast<size_t>(LightingRegs::LightingSampler::Fresnel),
+ LookupLightingLut(g_state.lighting,
+ static_cast<size_t>(LightingRegs::LightingSampler::Fresnel),
index, delta);
// Enabled for diffuse lighting alpha component