From b7720cd1562ac017530a5c502bb570228629e77d Mon Sep 17 00:00:00 2001 From: Alex Foster <123afoster@gmail.com> Date: Fri, 10 Feb 2023 17:52:18 -0800 Subject: [PATCH] use GL_TEXTURE_2D in scaling textures for #234 --- src/engine/render/renderlights.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/engine/render/renderlights.cpp b/src/engine/render/renderlights.cpp index 61b97623b..3c255bbed 100644 --- a/src/engine/render/renderlights.cpp +++ b/src/engine/render/renderlights.cpp @@ -194,9 +194,9 @@ void GBuffer::setupscale(int sw, int sh, int w, int h) } glBindFramebuffer(GL_FRAMEBUFFER, scalefbo[i]); - createtexture(scaletex[i], sw, i ? h : sh, nullptr, 3, gscalecubic || !gscalenearest ? 1 : 0, GL_RGB, GL_TEXTURE_RECTANGLE); + createtexture(scaletex[i], sw, i ? h : sh, nullptr, 3, gscalecubic || !gscalenearest ? 1 : 0, GL_RGB, GL_TEXTURE_2D); - glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_RECTANGLE, scaletex[i], 0); + glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, scaletex[i], 0); if(!i) { gbuf.bindgdepth(); @@ -232,22 +232,22 @@ void GBuffer::doscale(GLuint outfbo) const { glBindFramebuffer(GL_FRAMEBUFFER, scalefbo[1]); glViewport(0, 0, gw, hudh); - glBindTexture(GL_TEXTURE_RECTANGLE, scaletex[0]); + glBindTexture(GL_TEXTURE_2D, scaletex[0]); SETSHADER(scalecubicy); - screenquad(gw, gh); + screenquad(1, 1); glBindFramebuffer(GL_FRAMEBUFFER, outfbo); glViewport(0, 0, hudw, hudh); - glBindTexture(GL_TEXTURE_RECTANGLE, scaletex[1]); + glBindTexture(GL_TEXTURE_2D, scaletex[1]); SETSHADER(scalecubicx); - screenquad(gw, hudh); + screenquad(1, 1); } else { glBindFramebuffer(GL_FRAMEBUFFER, outfbo); glViewport(0, 0, hudw, hudh); - glBindTexture(GL_TEXTURE_RECTANGLE, scaletex[0]); + glBindTexture(GL_TEXTURE_2D, scaletex[0]); SETSHADER(scalelinear); - screenquad(gw, gh); + screenquad(1, 1); } endtimer(scaletimer);