Skip to content

Make the OpenGL (Classic) renderer work on OpenGL 3.1 #2642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FireNX70 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make the OpenGL (Classic) renderer work on OpenGL 3.1 #2642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f059f66
Request OpenGL 3.1 instead of 3.2
FireNX70 Apr 27, 2026
9649a5e
Replace glFramebufferTexture calls with glFramebufferTexture2D
FireNX70 Apr 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/GPU2D_OpenGL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ bool GLRenderer2D::Init()
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, sz[0], sz[1], 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);

glBindFramebuffer(GL_FRAMEBUFFER, AllBGLayerFB[l]);
glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, AllBGLayerTex[l], 0);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, AllBGLayerTex[l], 0);
glDrawBuffer(GL_COLOR_ATTACHMENT0);

l++;
Expand All @@ -300,7 +300,7 @@ bool GLRenderer2D::Init()

glGenFramebuffers(1, &SpriteFB);
glBindFramebuffer(GL_FRAMEBUFFER, SpriteFB);
glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, SpriteTex, 0);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, SpriteTex, 0);
glDrawBuffer(GL_COLOR_ATTACHMENT0);

// generate texture to hold final (upscaled) sprites
Expand Down Expand Up @@ -472,14 +472,14 @@ void GLRenderer2D::SetScaleFactor(int scale)
glBindFramebuffer(GL_FRAMEBUFFER, OBJLayerFB);
glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, OBJLayerTex, 0, 0);
glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, OBJLayerTex, 0, 1);
glFramebufferTexture(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, OBJDepthTex, 0);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, OBJDepthTex, 0);
glDrawBuffers(2, fbassign2);

glBindTexture(GL_TEXTURE_2D, OutputTex);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, ScreenW, ScreenH, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);

glBindFramebuffer(GL_FRAMEBUFFER, OutputFB);
glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, OutputTex, 0);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, OutputTex, 0);
glDrawBuffer(GL_COLOR_ATTACHMENT0);
}

Expand Down
6 changes: 3 additions & 3 deletions src/GPU3D_OpenGL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,9 +357,9 @@ void GLRenderer3D::SetRenderSettings(int scale, bool betterpolygons) noexcept
GLenum fbassign[2] = {GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1};

glBindFramebuffer(GL_FRAMEBUFFER, MainFramebuffer);
glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, ColorBufferTex, 0);
glFramebufferTexture(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, DepthBufferTex, 0);
glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, AttrBufferTex, 0);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, ColorBufferTex, 0);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, DepthBufferTex, 0);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, GL_TEXTURE_2D, AttrBufferTex, 0);
glDrawBuffers(2, fbassign);

glBindFramebuffer(GL_FRAMEBUFFER, 0);
Expand Down
2 changes: 1 addition & 1 deletion src/GPU_OpenGL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ bool GLRenderer::Init()

glGenFramebuffers(1, &CaptureSyncFB);
glBindFramebuffer(GL_FRAMEBUFFER, CaptureSyncFB);
glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, CaptureSyncTex, 0);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, CaptureSyncTex, 0);
glDrawBuffer(GL_COLOR_ATTACHMENT0);
glReadBuffer(GL_COLOR_ATTACHMENT0);

Expand Down
2 changes: 1 addition & 1 deletion src/frontend/qt_sdl/Screen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,7 +900,7 @@ bool ScreenPanelGL::createContext()
{
std::array<GL::Context::Version, 2> versionsToTry = {
GL::Context::Version{GL::Context::Profile::Core, 4, 3},
GL::Context::Version{GL::Context::Profile::Core, 3, 2}};
GL::Context::Version{GL::Context::Profile::Core, 3, 1}};
if (windowinfo.has_value())
if ((glContext = GL::Context::Create(*windowinfo, versionsToTry)))
glContext->DoneCurrent();
Expand Down
Loading