summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp7
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer_cache.cpp4
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer_cache.h3
3 files changed, 6 insertions, 8 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index 546e86532..51e50cbcf 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -332,8 +332,6 @@ std::pair<Surface, Surface> RasterizerOpenGL::ConfigureFramebuffers(bool using_c
332 // TODO(bunnei): Implement this 332 // TODO(bunnei): Implement this
333 const bool has_stencil = false; 333 const bool has_stencil = false;
334 334
335 const MathUtil::Rectangle<s32> viewport_rect{regs.viewport_transform[0].GetRect()};
336
337 const bool write_color_fb = 335 const bool write_color_fb =
338 state.color_mask.red_enabled == GL_TRUE || state.color_mask.green_enabled == GL_TRUE || 336 state.color_mask.red_enabled == GL_TRUE || state.color_mask.green_enabled == GL_TRUE ||
339 state.color_mask.blue_enabled == GL_TRUE || state.color_mask.alpha_enabled == GL_TRUE; 337 state.color_mask.blue_enabled == GL_TRUE || state.color_mask.alpha_enabled == GL_TRUE;
@@ -346,9 +344,10 @@ std::pair<Surface, Surface> RasterizerOpenGL::ConfigureFramebuffers(bool using_c
346 Surface depth_surface; 344 Surface depth_surface;
347 MathUtil::Rectangle<u32> surfaces_rect; 345 MathUtil::Rectangle<u32> surfaces_rect;
348 std::tie(color_surface, depth_surface, surfaces_rect) = 346 std::tie(color_surface, depth_surface, surfaces_rect) =
349 res_cache.GetFramebufferSurfaces(using_color_fb, using_depth_fb, viewport_rect); 347 res_cache.GetFramebufferSurfaces(using_color_fb, using_depth_fb);
350 348
351 MathUtil::Rectangle<u32> draw_rect{ 349 const MathUtil::Rectangle<s32> viewport_rect{regs.viewport_transform[0].GetRect()};
350 const MathUtil::Rectangle<u32> draw_rect{
352 static_cast<u32>(std::clamp<s32>(static_cast<s32>(surfaces_rect.left) + viewport_rect.left, 351 static_cast<u32>(std::clamp<s32>(static_cast<s32>(surfaces_rect.left) + viewport_rect.left,
353 surfaces_rect.left, surfaces_rect.right)), // Left 352 surfaces_rect.left, surfaces_rect.right)), // Left
354 static_cast<u32>(std::clamp<s32>(static_cast<s32>(surfaces_rect.bottom) + viewport_rect.top, 353 static_cast<u32>(std::clamp<s32>(static_cast<s32>(surfaces_rect.bottom) + viewport_rect.top,
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
index f6efce818..04ebdbaf9 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
@@ -609,8 +609,8 @@ Surface RasterizerCacheOpenGL::GetTextureSurface(const Tegra::Texture::FullTextu
609 return GetSurface(SurfaceParams::CreateForTexture(config)); 609 return GetSurface(SurfaceParams::CreateForTexture(config));
610} 610}
611 611
612SurfaceSurfaceRect_Tuple RasterizerCacheOpenGL::GetFramebufferSurfaces( 612SurfaceSurfaceRect_Tuple RasterizerCacheOpenGL::GetFramebufferSurfaces(bool using_color_fb,
613 bool using_color_fb, bool using_depth_fb, const MathUtil::Rectangle<s32>& viewport) { 613 bool using_depth_fb) {
614 const auto& regs = Core::System::GetInstance().GPU().Maxwell3D().regs; 614 const auto& regs = Core::System::GetInstance().GPU().Maxwell3D().regs;
615 615
616 // TODO(bunnei): This is hard corded to use just the first render buffer 616 // TODO(bunnei): This is hard corded to use just the first render buffer
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.h b/src/video_core/renderer_opengl/gl_rasterizer_cache.h
index 26e2ee203..8a0ba64e8 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer_cache.h
+++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.h
@@ -634,8 +634,7 @@ public:
634 Surface GetTextureSurface(const Tegra::Texture::FullTextureInfo& config); 634 Surface GetTextureSurface(const Tegra::Texture::FullTextureInfo& config);
635 635
636 /// Get the color and depth surfaces based on the framebuffer configuration 636 /// Get the color and depth surfaces based on the framebuffer configuration
637 SurfaceSurfaceRect_Tuple GetFramebufferSurfaces(bool using_color_fb, bool using_depth_fb, 637 SurfaceSurfaceRect_Tuple GetFramebufferSurfaces(bool using_color_fb, bool using_depth_fb);
638 const MathUtil::Rectangle<s32>& viewport);
639 638
640 /// Flushes the surface to Switch memory 639 /// Flushes the surface to Switch memory
641 void FlushSurface(const Surface& surface); 640 void FlushSurface(const Surface& surface);