diff --git a/src/GPU2D_OpenGL.cpp b/src/GPU2D_OpenGL.cpp index b823658e8a..546be80b21 100644 --- a/src/GPU2D_OpenGL.cpp +++ b/src/GPU2D_OpenGL.cpp @@ -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++; @@ -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 @@ -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); } diff --git a/src/GPU3D_OpenGL.cpp b/src/GPU3D_OpenGL.cpp index 7bd208b6fd..cb7c238dbd 100644 --- a/src/GPU3D_OpenGL.cpp +++ b/src/GPU3D_OpenGL.cpp @@ -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); diff --git a/src/GPU_OpenGL.cpp b/src/GPU_OpenGL.cpp index 48533694e9..b5a1493476 100644 --- a/src/GPU_OpenGL.cpp +++ b/src/GPU_OpenGL.cpp @@ -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); diff --git a/src/frontend/qt_sdl/Screen.cpp b/src/frontend/qt_sdl/Screen.cpp index 3413496ffb..217db3800c 100755 --- a/src/frontend/qt_sdl/Screen.cpp +++ b/src/frontend/qt_sdl/Screen.cpp @@ -900,7 +900,7 @@ bool ScreenPanelGL::createContext() { std::array 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();