archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-07 23:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

GL: try to skip incorrectly prepared FBO's.

Browse source
This commit is contained in:
O1L 2017-02-04 17:44:40 +03:00 • committed by Ivan
parent bf33a1827c
commit a809f33418
4 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rpcs3/Emu/RSX/GL/GLGSRender.cpp
View file

@ -191,6 +191,9 @@ void GLGSRender::begin()
init_buffers(); init_buffers();
if (!draw_fbo.check())
return;
std::chrono::time_point<steady_clock> then = steady_clock::now(); std::chrono::time_point<steady_clock> then = steady_clock::now();
bool color_mask_b = rsx::method_registers.color_mask_b(); bool color_mask_b = rsx::method_registers.color_mask_b();
@ -377,7 +380,7 @@ namespace
void GLGSRender::end() void GLGSRender::end()
{ {
if (!draw_fbo) if (!draw_fbo || !draw_fbo.check())
{ {
rsx::thread::end(); rsx::thread::end();
return; return;

8
rpcs3/Emu/RSX/GL/GLHelpers.cpp
View file

@ -1,5 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "GLHelpers.h" #include "GLHelpers.h"
#include "Utilities/Log.h"
namespace gl namespace gl
{ {
@ -84,15 +85,18 @@ namespace gl
return m_id != 0; return m_id != 0;
} }
void fbo::check() const bool fbo::check() const
{ {
save_binding_state save(*this); save_binding_state save(*this);
GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER); GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
if (status != GL_FRAMEBUFFER_COMPLETE) if (status != GL_FRAMEBUFFER_COMPLETE)
{ {
fmt::throw_exception<std::logic_error>("0x%04x", status); LOG_ERROR(RSX, "FBO check failed: 0x%04x", status);
return false;
} }
return true;
} }
void fbo::recreate() void fbo::recreate()

2
rpcs3/Emu/RSX/GL/GLHelpers.h
View file

@ -1768,7 +1768,7 @@ namespace gl
void bind_as(target target_) const; void bind_as(target target_) const;
void remove(); void remove();
bool created() const; bool created() const;
void check() const; bool check() const;
void recreate(); void recreate();
void draw_buffer(const attachment& buffer) const; void draw_buffer(const attachment& buffer) const;

3
rpcs3/Emu/RSX/GL/GLRenderTargets.cpp
View file

@ -114,7 +114,8 @@ void GLGSRender::init_buffers(bool skip_reading)
__glcheck draw_fbo.depth = *std::get<1>(m_rtts.m_bound_depth_stencil); __glcheck draw_fbo.depth = *std::get<1>(m_rtts.m_bound_depth_stencil);
} }
__glcheck draw_fbo.check(); if (!draw_fbo.check())
return;
//HACK: read_buffer shouldn't be there //HACK: read_buffer shouldn't be there
switch (rsx::method_registers.surface_color_target()) switch (rsx::method_registers.surface_color_target())