diff options
| author |  bunnei | 2017-08-30 21:07:30 -0400 |
|---|---|---|
| committer |  GitHub | 2017-08-30 21:07:30 -0400 |
| commit | f0e461bf6f9d38c35c581e75731ac80fca3f3172 (patch) | |
| tree | 0a54a98595c313afd9002ed9964c94255a88abc4 /src/video_core/swrasterizer/rasterizer.cpp | |
| parent | Merge pull request #2899 from wwylele/touch-refactor (diff) | |
| parent | gl_rasterizer/lighting: more accurate CP formula (diff) | |
| download | yuzu-f0e461bf6f9d38c35c581e75731ac80fca3f3172.tar.gz yuzu-f0e461bf6f9d38c35c581e75731ac80fca3f3172.tar.xz yuzu-f0e461bf6f9d38c35c581e75731ac80fca3f3172.zip | |
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.cpp | 4 |
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 | |||
| 437 | GetInterpolatedAttribute(v0.view.y, v1.view.y, v2.view.y).ToFloat32(), | 437 | GetInterpolatedAttribute(v0.view.y, v1.view.y, v2.view.y).ToFloat32(), |
| 438 | GetInterpolatedAttribute(v0.view.z, v1.view.z, v2.view.z).ToFloat32(), | 438 | GetInterpolatedAttribute(v0.view.z, v1.view.z, v2.view.z).ToFloat32(), |
| 439 | }; | 439 | }; |
| 440 | std::tie(primary_fragment_color, secondary_fragment_color) = | 440 | std::tie(primary_fragment_color, secondary_fragment_color) = ComputeFragmentsColors( |
| 441 | ComputeFragmentsColors(g_state.regs.lighting, g_state.lighting, normquat, view); | 441 | g_state.regs.lighting, g_state.lighting, normquat, view, texture_color); |
| 442 | } | 442 | } |
| 443 | 443 | ||
| 444 | for (unsigned tev_stage_index = 0; tev_stage_index < tev_stages.size(); | 444 | for (unsigned tev_stage_index = 0; tev_stage_index < tev_stages.size(); |