diff options
author | bunnei <bunneidev@gmail.com> | 2016-11-30 05:23:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-30 05:23:22 +0100 |
commit | cf5b8483fc53ca3b4919d231045348625a507d05 (patch) | |
tree | 53ec57b3f82f9326fb629836b99f267b6c421ba1 /src/video_core | |
parent | Update dynarmic to the latest version (#2234) (diff) | |
parent | Build: Fixed a few warnings. (diff) | |
download | yuzu-cf5b8483fc53ca3b4919d231045348625a507d05.tar yuzu-cf5b8483fc53ca3b4919d231045348625a507d05.tar.gz yuzu-cf5b8483fc53ca3b4919d231045348625a507d05.tar.bz2 yuzu-cf5b8483fc53ca3b4919d231045348625a507d05.tar.lz yuzu-cf5b8483fc53ca3b4919d231045348625a507d05.tar.xz yuzu-cf5b8483fc53ca3b4919d231045348625a507d05.tar.zst yuzu-cf5b8483fc53ca3b4919d231045348625a507d05.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/rasterizer.cpp | 6 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 8 |
2 files changed, 7 insertions, 7 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 }; if ((texture.config.wrap_s == Regs::TextureConfig::ClampToBorder && - (s < 0 || s >= texture.config.width)) || + (s < 0 || static_cast<u32>(s) >= texture.config.width)) || (texture.config.wrap_t == Regs::TextureConfig::ClampToBorder && - (t < 0 || t >= texture.config.height))) { + (t < 0 || static_cast<u32>(t) >= texture.config.height))) { auto border_color = texture.config.border_color; texture_color[i] = {border_color.r, border_color.g, border_color.b, border_color.a}; @@ -947,7 +947,7 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0, const Shader // Blend the fog for (unsigned i = 0; i < 3; i++) { combiner_output[i] = - fog_factor * combiner_output[i] + (1.0f - fog_factor) * fog_color[i]; + static_cast<u8>(fog_factor * combiner_output[i] + (1.0f - fog_factor) * fog_color[i]); } } diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index d4d5903ce..e5f4366c1 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -213,12 +213,12 @@ void RasterizerOpenGL::DrawTriangles() { // Scissor checks are window-, not viewport-relative, which means that if the cached texture // sub-rect changes, the scissor bounds also need to be updated. - GLint scissor_x1 = rect.left + regs.scissor_test.x1 * color_surface->res_scale_width; - GLint scissor_y1 = rect.bottom + regs.scissor_test.y1 * color_surface->res_scale_height; + GLint scissor_x1 = static_cast<GLint>(rect.left + regs.scissor_test.x1 * color_surface->res_scale_width); + GLint scissor_y1 = static_cast<GLint>(rect.bottom + regs.scissor_test.y1 * color_surface->res_scale_height); // x2, y2 have +1 added to cover the entire pixel area, otherwise you might get cracks when // scaling or doing multisampling. - GLint scissor_x2 = rect.left + (regs.scissor_test.x2 + 1) * color_surface->res_scale_width; - GLint scissor_y2 = rect.bottom + (regs.scissor_test.y2 + 1) * color_surface->res_scale_height; + GLint scissor_x2 = static_cast<GLint>(rect.left + (regs.scissor_test.x2 + 1) * color_surface->res_scale_width); + GLint scissor_y2 = static_cast<GLint>(rect.bottom + (regs.scissor_test.y2 + 1) * color_surface->res_scale_height); if (uniform_block_data.data.scissor_x1 != scissor_x1 || uniform_block_data.data.scissor_x2 != scissor_x2 || |