diff options
| author | 2016-11-29 16:51:53 -0500 | |
|---|---|---|
| committer | 2016-11-29 16:51:53 -0500 | |
| commit | aea9a91100e4b80edc8c70d610c102eb2d76dd1f (patch) | |
| tree | a0258781fb72ee27758442eff3d6b6634cf3b1ee /src/video_core/rasterizer.cpp | |
| parent | Merge pull request #2196 from Subv/system_mode (diff) | |
| download | yuzu-aea9a91100e4b80edc8c70d610c102eb2d76dd1f.tar.gz yuzu-aea9a91100e4b80edc8c70d610c102eb2d76dd1f.tar.xz yuzu-aea9a91100e4b80edc8c70d610c102eb2d76dd1f.zip | |
Build: Fixed a few warnings.
Diffstat (limited to 'src/video_core/rasterizer.cpp')
| -rw-r--r-- | src/video_core/rasterizer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/rasterizer.cpp b/src/video_core/rasterizer.cpp index 6c4bbed33..f81f529b6 100644 --- a/src/video_core/rasterizer.cpp +++ b/src/video_core/rasterizer.cpp | |||
| @@ -562,9 +562,9 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0, const Shader | |||
| 562 | }; | 562 | }; |
| 563 | 563 | ||
| 564 | if ((texture.config.wrap_s == Regs::TextureConfig::ClampToBorder && | 564 | if ((texture.config.wrap_s == Regs::TextureConfig::ClampToBorder && |
| 565 | (s < 0 || s >= texture.config.width)) || | 565 | (s < 0 || static_cast<u32>(s) >= texture.config.width)) || |
| 566 | (texture.config.wrap_t == Regs::TextureConfig::ClampToBorder && | 566 | (texture.config.wrap_t == Regs::TextureConfig::ClampToBorder && |
| 567 | (t < 0 || t >= texture.config.height))) { | 567 | (t < 0 || static_cast<u32>(t) >= texture.config.height))) { |
| 568 | auto border_color = texture.config.border_color; | 568 | auto border_color = texture.config.border_color; |
| 569 | texture_color[i] = {border_color.r, border_color.g, border_color.b, | 569 | texture_color[i] = {border_color.r, border_color.g, border_color.b, |
| 570 | border_color.a}; | 570 | border_color.a}; |
| @@ -947,7 +947,7 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0, const Shader | |||
| 947 | // Blend the fog | 947 | // Blend the fog |
| 948 | for (unsigned i = 0; i < 3; i++) { | 948 | for (unsigned i = 0; i < 3; i++) { |
| 949 | combiner_output[i] = | 949 | combiner_output[i] = |
| 950 | fog_factor * combiner_output[i] + (1.0f - fog_factor) * fog_color[i]; | 950 | static_cast<u8>(fog_factor * combiner_output[i] + (1.0f - fog_factor) * fog_color[i]); |
| 951 | } | 951 | } |
| 952 | } | 952 | } |
| 953 | 953 | ||