libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-02-20 08:52:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some crashes when switching rendering mode.

Browse Source
This commit is contained in:
Unknown W. Brackets 2014-06-07 00:52:58 -07:00
parent 2696710dbd
commit cda98334f8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
GPU/GLES/Framebuffer.cpp
View File

@ -732,7 +732,7 @@ void FramebufferManager::DestroyFramebuf(VirtualFramebuffer *v) {
}
void FramebufferManager::RebindFramebuffer() {
if (currentRenderVfb_) {
if (currentRenderVfb_ && currentRenderVfb_->fbo) {
fbo_bind_as_render_target(currentRenderVfb_->fbo);
}
}
@ -1133,7 +1133,7 @@ void FramebufferManager::BindFramebufferColor(VirtualFramebuffer *framebuffer, b
copyInfo.fbo = renderCopy;
BlitFramebuffer_(&copyInfo, 0, 0, framebuffer, 0, 0, framebuffer->width, framebuffer->height, 0, false);
fbo_bind_as_render_target(currentRenderVfb_->fbo);
RebindFramebuffer();
fbo_bind_color_as_texture(renderCopy, 0);
} else {
fbo_bind_color_as_texture(framebuffer->fbo, 0);
@ -2036,7 +2036,7 @@ bool FramebufferManager::NotifyFramebufferCopy(u32 src, u32 dst, int size, bool
WARN_LOG_REPORT_ONCE(btucpy, G3D, "Memcpy fbo upload %08x -> %08x", src, dst);
if (g_Config.bBlockTransferGPU) {
const u8 *srcBase = Memory::GetPointerUnchecked(src);
if (useBufferedRendering_) {
if (useBufferedRendering_ && dstBuffer->fbo) {
fbo_bind_as_render_target(dstBuffer->fbo);
}
glViewport(0, 0, dstBuffer->renderWidth, dstBuffer->renderHeight);
@ -2045,8 +2045,8 @@ bool FramebufferManager::NotifyFramebufferCopy(u32 src, u32 dst, int size, bool
dstBuffer->dirtyAfterDisplay = true;
if ((gstate_c.skipDrawReason & SKIPDRAW_SKIPFRAME) == 0)
dstBuffer->reallyDirtyAfterDisplay = true;
if (currentRenderVfb_ && useBufferedRendering_) {
fbo_bind_as_render_target(currentRenderVfb_->fbo);
if (useBufferedRendering_) {
RebindFramebuffer();
} else {
fbo_unbind();
}
@ -2196,7 +2196,7 @@ void FramebufferManager::NotifyBlockTransferAfter(u32 dstBasePtr, int dstStride,
WARN_LOG_ONCE(btu, G3D, "Block transfer upload %08x -> %08x", srcBasePtr, dstBasePtr);
if (g_Config.bBlockTransferGPU) {
const u8 *srcBase = Memory::GetPointerUnchecked(srcBasePtr) + (srcX + srcY * srcStride) * bpp;
if (useBufferedRendering_) {
if (useBufferedRendering_ && dstBuffer->fbo) {
fbo_bind_as_render_target(dstBuffer->fbo);
}
int dstBpp = dstBuffer->format == GE_FORMAT_8888 ? 4 : 2;
@ -2206,8 +2206,8 @@ void FramebufferManager::NotifyBlockTransferAfter(u32 dstBasePtr, int dstStride,
dstBuffer->dirtyAfterDisplay = true;
if ((gstate_c.skipDrawReason & SKIPDRAW_SKIPFRAME) == 0)
dstBuffer->reallyDirtyAfterDisplay = true;
if (currentRenderVfb_ && useBufferedRendering_) {
fbo_bind_as_render_target(currentRenderVfb_->fbo);
if (useBufferedRendering_) {
RebindFramebuffer();
} else {
fbo_unbind();
}