aboutsummaryrefslogtreecommitdiff
path: root/src/video_core/swrasterizer/rasterizer.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2017-08-30 21:07:30 -0400
committerGitHub <noreply@github.com>2017-08-30 21:07:30 -0400
commitf0e461bf6f9d38c35c581e75731ac80fca3f3172 (patch)
tree0a54a98595c313afd9002ed9964c94255a88abc4 /src/video_core/swrasterizer/rasterizer.cpp
parent75cd28a7cc1c73e1be1fc72d4b86b267cbb79081 (diff)
parent17c6104d2afda7bf354c454f87561a3dbdf524e3 (diff)
Merge pull request #2891 from wwylele/sw-bump
SwRasterizer/Lighting: implement bump mapping
Diffstat (limited to 'src/video_core/swrasterizer/rasterizer.cpp')
-rw-r--r--src/video_core/swrasterizer/rasterizer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/swrasterizer/rasterizer.cpp b/src/video_core/swrasterizer/rasterizer.cpp
index fdc1df199..862135614 100644
--- a/src/video_core/swrasterizer/rasterizer.cpp
+++ b/src/video_core/swrasterizer/rasterizer.cpp
@@ -437,8 +437,8 @@ static void ProcessTriangleInternal(const Vertex& v0, const Vertex& v1, const Ve
GetInterpolatedAttribute(v0.view.y, v1.view.y, v2.view.y).ToFloat32(),
GetInterpolatedAttribute(v0.view.z, v1.view.z, v2.view.z).ToFloat32(),
};
- std::tie(primary_fragment_color, secondary_fragment_color) =
- ComputeFragmentsColors(g_state.regs.lighting, g_state.lighting, normquat, view);
+ std::tie(primary_fragment_color, secondary_fragment_color) = ComputeFragmentsColors(
+ g_state.regs.lighting, g_state.lighting, normquat, view, texture_color);
}
for (unsigned tev_stage_index = 0; tev_stage_index < tev_stages.size();