summaryrefslogtreecommitdiff
path: root/src/video_core/rasterizer.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2016-11-29 23:23:22 -0500
committerGravatar GitHub2016-11-29 23:23:22 -0500
commitcf5b8483fc53ca3b4919d231045348625a507d05 (patch)
tree53ec57b3f82f9326fb629836b99f267b6c421ba1 /src/video_core/rasterizer.cpp
parentUpdate dynarmic to the latest version (#2234) (diff)
parentBuild: Fixed a few warnings. (diff)
downloadyuzu-cf5b8483fc53ca3b4919d231045348625a507d05.tar.gz
yuzu-cf5b8483fc53ca3b4919d231045348625a507d05.tar.xz
yuzu-cf5b8483fc53ca3b4919d231045348625a507d05.zip
Merge pull request #2233 from Subv/warnings
Build: Fixed a few warnings.
Diffstat (limited to 'src/video_core/rasterizer.cpp')
-rw-r--r--src/video_core/rasterizer.cpp6
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