summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwwylele <wwylele@gmail.com>2016-11-30 17:52:53 +0100
committerGitHub <noreply@github.com>2016-11-30 17:52:53 +0100
commit6034399bf97958e1cf5a53014986884d8cfc8733 (patch)
tree2753254465dadeb3be1e9fb55ac5ff861910a54b
parentMerge pull request #1820 from mailwl/service-ver (diff)
parentClangFormat: Fixed the clang-format errors (diff)
downloadyuzu-6034399bf97958e1cf5a53014986884d8cfc8733.tar
yuzu-6034399bf97958e1cf5a53014986884d8cfc8733.tar.gz
yuzu-6034399bf97958e1cf5a53014986884d8cfc8733.tar.bz2
yuzu-6034399bf97958e1cf5a53014986884d8cfc8733.tar.lz
yuzu-6034399bf97958e1cf5a53014986884d8cfc8733.tar.xz
yuzu-6034399bf97958e1cf5a53014986884d8cfc8733.tar.zst
yuzu-6034399bf97958e1cf5a53014986884d8cfc8733.zip
-rw-r--r--src/video_core/rasterizer.cpp4
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp12
2 files changed, 10 insertions, 6 deletions
diff --git a/src/video_core/rasterizer.cpp b/src/video_core/rasterizer.cpp
index f81f529b6..b9f5d4533 100644
--- a/src/video_core/rasterizer.cpp
+++ b/src/video_core/rasterizer.cpp
@@ -946,8 +946,8 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0, const Shader
// Blend the fog
for (unsigned i = 0; i < 3; i++) {
- combiner_output[i] =
- static_cast<u8>(fog_factor * combiner_output[i] + (1.0f - fog_factor) * fog_color[i]);
+ combiner_output[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 e5f4366c1..1b734aaa5 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -213,12 +213,16 @@ 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 = 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);
+ 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 = 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);
+ 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 ||