isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-02-03 04:21:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolve color buffer before trying to download it

Browse Source
This commit is contained in:
Anders Jenbo 2025-07-23 18:11:06 +02:00
parent f9c3a984ef
commit 430ecbf938
2 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
miniwin/src/d3drm/backends/opengles3/renderer.cpp
View File

@ -303,6 +303,10 @@ OpenGLES3Renderer::OpenGLES3Renderer(
maxSamples maxSamples
); );
if (m_msaa > 1) {
glGenFramebuffers(1, &m_resolveFBO);
}
m_virtualWidth = width; m_virtualWidth = width;
m_virtualHeight = height; m_virtualHeight = height;
ViewportTransform viewportTransform = {1.0f, 0.0f, 0.0f}; ViewportTransform viewportTransform = {1.0f, 0.0f, 0.0f};
@ -362,6 +366,21 @@ OpenGLES3Renderer::~OpenGLES3Renderer()
{ {
SDL_DestroySurface(m_renderedImage); SDL_DestroySurface(m_renderedImage);
glDeleteProgram(m_shaderProgram); glDeleteProgram(m_shaderProgram);
if (m_colorTarget) {
glDeleteRenderbuffers(1, &m_colorTarget);
}
if (m_resolveColor) {
glDeleteRenderbuffers(1, &m_resolveColor);
}
if (m_depthTarget) {
glDeleteRenderbuffers(1, &m_depthTarget);
}
if (m_depthTarget) {
glDeleteFramebuffers(1, &m_resolveFBO);
}
glDeleteFramebuffers(1, &m_fbo);
SDL_GL_DestroyContext(m_context); SDL_GL_DestroyContext(m_context);
} }
@ -633,6 +652,10 @@ void OpenGLES3Renderer::Resize(int width, int height, const ViewportTransform& v
glDeleteRenderbuffers(1, &m_colorTarget); glDeleteRenderbuffers(1, &m_colorTarget);
m_depthTarget = 0; m_depthTarget = 0;
} }
if (m_resolveColor) {
glDeleteRenderbuffers(1, &m_resolveColor);
m_resolveColor = 0;
}
if (m_depthTarget) { if (m_depthTarget) {
glDeleteRenderbuffers(1, &m_depthTarget); glDeleteRenderbuffers(1, &m_depthTarget);
m_colorTarget = 0; m_colorTarget = 0;
@ -661,6 +684,22 @@ void OpenGLES3Renderer::Resize(int width, int height, const ViewportTransform& v
glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24, width, height); glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24, width, height);
} }
glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, m_depthTarget); glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, m_depthTarget);
if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
SDL_Log("FBO is not complete!");
}
if (m_msaa > 1) {
glBindFramebuffer(GL_FRAMEBUFFER, m_resolveFBO);
glGenRenderbuffers(1, &m_resolveColor);
glBindRenderbuffer(GL_RENDERBUFFER, m_resolveColor);
glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, width, height);
glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, m_resolveColor);
if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
SDL_Log("Resolve FBO is not complete!");
}
}
glBindFramebuffer(GL_FRAMEBUFFER, m_fbo);
glViewport(0, 0, m_width, m_height); glViewport(0, 0, m_width, m_height);
} }
@ -688,6 +727,7 @@ void OpenGLES3Renderer::Flip()
glBindFramebuffer(GL_READ_FRAMEBUFFER, m_fbo); glBindFramebuffer(GL_READ_FRAMEBUFFER, m_fbo);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
glBlitFramebuffer(0, 0, m_width, m_height, 0, 0, m_width, m_height, GL_COLOR_BUFFER_BIT, GL_NEAREST); glBlitFramebuffer(0, 0, m_width, m_height, 0, 0, m_width, m_height, GL_COLOR_BUFFER_BIT, GL_NEAREST);
glBindFramebuffer(GL_FRAMEBUFFER, 0);
SDL_GL_SwapWindow(DDWindow); SDL_GL_SwapWindow(DDWindow);
glFrontFace(GL_CW); glFrontFace(GL_CW);
@ -786,7 +826,16 @@ void OpenGLES3Renderer::Download(SDL_Surface* target)
{ {
glFinish(); glFinish();
glBindFramebuffer(GL_FRAMEBUFFER, m_fbo); if (m_msaa > 1) {
glBindFramebuffer(GL_READ_FRAMEBUFFER, m_fbo);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_resolveFBO);
glBlitFramebuffer(0, 0, m_width, m_height, 0, 0, m_width, m_height, GL_COLOR_BUFFER_BIT, GL_NEAREST);
glBindFramebuffer(GL_FRAMEBUFFER, m_resolveFBO);
}
else {
glBindFramebuffer(GL_FRAMEBUFFER, m_fbo);
}
glReadPixels(0, 0, m_width, m_height, GL_RGBA, GL_UNSIGNED_BYTE, m_renderedImage->pixels); glReadPixels(0, 0, m_width, m_height, GL_RGBA, GL_UNSIGNED_BYTE, m_renderedImage->pixels);
SDL_Rect srcRect = { SDL_Rect srcRect = {

2
miniwin/src/internal/d3drmrenderer_opengles3.h
View File

@ -74,7 +74,9 @@ class OpenGLES3Renderer : public Direct3DRMRenderer {
SDL_GLContext m_context; SDL_GLContext m_context;
uint32_t m_msaa; uint32_t m_msaa;
GLuint m_fbo; GLuint m_fbo;
GLuint m_resolveFBO = 0;
GLuint m_colorTarget; GLuint m_colorTarget;
GLuint m_resolveColor = 0;
GLuint m_depthTarget; GLuint m_depthTarget;
GLuint m_shaderProgram; GLuint m_shaderProgram;
GLuint m_dummyTexture; GLuint m_dummyTexture;