diff options
| author | tfarley <tfarleygithub@gmail.com> | 2015-05-29 21:54:53 -0400 |
|---|---|---|
| committer | tfarley <tfarleygithub@gmail.com> | 2015-06-08 19:18:20 -0400 |
| commit | 66b0d799ee0e22e07ca9a409d42bafe790695f3c (patch) | |
| tree | c668e0500c940d30490baf156b045a3d350d6ab6 /src | |
| parent | 5025b35563873091eb3638bdae6b3380b3c1e290 (diff) | |
Render-to-texture flush, interval math fix
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/math_util.h | 2 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 14 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/common/math_util.h b/src/common/math_util.h index 4b0910741e..d44b06e746 100644 --- a/src/common/math_util.h +++ b/src/common/math_util.h @@ -12,7 +12,7 @@ namespace MathUtil { inline bool IntervalsIntersect(unsigned start0, unsigned length0, unsigned start1, unsigned length1) { - return (std::max(start0, start1) <= std::min(start0 + length0, start1 + length1)); + return (std::max(start0, start1) < std::min(start0 + length0, start1 + length1)); } template<typename T> diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 3396d72ccc..faab77ff56 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -217,7 +217,19 @@ void RasterizerOpenGL::DrawTriangles() { vertex_batch.clear(); - // TODO: Flush the resource cache at the current depth and color framebuffer addresses for render-to-texture + // Flush the resource cache at the current depth and color framebuffer addresses for render-to-texture + const auto& regs = Pica::g_state.regs; + + PAddr cur_fb_color_addr = regs.framebuffer.GetColorBufferPhysicalAddress(); + u32 cur_fb_color_size = Pica::Regs::BytesPerColorPixel(regs.framebuffer.color_format) + * regs.framebuffer.GetWidth() * regs.framebuffer.GetHeight(); + + PAddr cur_fb_depth_addr = regs.framebuffer.GetDepthBufferPhysicalAddress(); + u32 cur_fb_depth_size = Pica::Regs::BytesPerDepthPixel(regs.framebuffer.depth_format) + * regs.framebuffer.GetWidth() * regs.framebuffer.GetHeight(); + + res_cache.NotifyFlush(cur_fb_color_addr, cur_fb_color_size); + res_cache.NotifyFlush(cur_fb_depth_addr, cur_fb_depth_size); } void RasterizerOpenGL::CommitFramebuffer() { |