From e69da79dc00db42411354d36c28e30f840191acf Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 18 Jul 2018 15:03:30 +0200 Subject: loplugin:constantparam Change-Id: I8e2e9009f0a70d2fa390e03688a988ac935d5f36 Reviewed-on: https://gerrit.libreoffice.org/57643 Tested-by: Jenkins Reviewed-by: Noel Grandin --- vcl/source/opengl/OpenGLHelper.cxx | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) (limited to 'vcl/source/opengl') diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index 06c24a597c2b..267c1c58f415 100644 --- a/vcl/source/opengl/OpenGLHelper.cxx +++ b/vcl/source/opengl/OpenGLHelper.cxx @@ -643,7 +643,7 @@ std::ostream& operator<<(std::ostream& rStrm, const glm::mat4& rMatrix) } void OpenGLHelper::createFramebuffer(long nWidth, long nHeight, GLuint& nFramebufferId, - GLuint& nRenderbufferDepthId, GLuint& nRenderbufferColorId, bool bRenderbuffer) + GLuint& nRenderbufferDepthId, GLuint& nRenderbufferColorId) { OpenGLZone aZone; @@ -653,29 +653,18 @@ void OpenGLHelper::createFramebuffer(long nWidth, long nHeight, GLuint& nFramebu glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, nWidth, nHeight); glBindRenderbuffer(GL_RENDERBUFFER, 0); - if(bRenderbuffer) - { - // create a renderbuffer for color attachment - glGenRenderbuffers(1, &nRenderbufferColorId); - glBindRenderbuffer(GL_RENDERBUFFER, nRenderbufferColorId); - glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, nWidth, nHeight); - glBindRenderbuffer(GL_RENDERBUFFER, 0); - } - else - { - glGenTextures(1, &nRenderbufferColorId); - glBindTexture(GL_TEXTURE_2D, nRenderbufferColorId); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, nWidth, nHeight, 0, - GL_RGBA, GL_UNSIGNED_BYTE, nullptr); - glBindTexture(GL_TEXTURE_2D, 0); - - glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, - GL_TEXTURE_2D, nRenderbufferColorId, 0); - } + glGenTextures(1, &nRenderbufferColorId); + glBindTexture(GL_TEXTURE_2D, nRenderbufferColorId); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, nWidth, nHeight, 0, + GL_RGBA, GL_UNSIGNED_BYTE, nullptr); + glBindTexture(GL_TEXTURE_2D, 0); + + glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, + GL_TEXTURE_2D, nRenderbufferColorId, 0); // create a framebuffer object and attach renderbuffer glGenFramebuffers(1, &nFramebufferId); -- cgit