From 11f9e4c95d1e30005240f6e00204faa93bb315db Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 29 Dec 2016 17:50:31 +0300 Subject: Use power of two texture sizes in all OpenGL modes (even with rectangular textures) --- src/resources/openglimagehelper.cpp | 14 +++----------- src/resources/safeopenglimagehelper.cpp | 14 +++----------- 2 files changed, 6 insertions(+), 22 deletions(-) (limited to 'src') diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp index 06c40388b..38e1a6e9a 100644 --- a/src/resources/openglimagehelper.cpp +++ b/src/resources/openglimagehelper.cpp @@ -132,17 +132,9 @@ Image *OpenGLImageHelper::createTextSurface(SDL_Surface *const tmpImage, int OpenGLImageHelper::powerOfTwo(const int input) { - int value; - if (mTextureType == GL_TEXTURE_2D) - { - value = 1; - while (value < input && value < mTextureSize) - value <<= 1; - } - else - { - value = input; - } + int value = 1; + while (value < input && value < mTextureSize) + value <<= 1; return value >= mTextureSize ? mTextureSize : value; } diff --git a/src/resources/safeopenglimagehelper.cpp b/src/resources/safeopenglimagehelper.cpp index d83c1b711..0256e81ea 100644 --- a/src/resources/safeopenglimagehelper.cpp +++ b/src/resources/safeopenglimagehelper.cpp @@ -130,17 +130,9 @@ Image *SafeOpenGLImageHelper::createTextSurface(SDL_Surface *const tmpImage, int SafeOpenGLImageHelper::powerOfTwo(const int input) { - int value; - if (mTextureType == GL_TEXTURE_2D) - { - value = 1; - while (value < input && value < mTextureSize) - value <<= 1; - } - else - { - value = input; - } + int value = 1; + while (value < input && value < mTextureSize) + value <<= 1; return value >= mTextureSize ? mTextureSize : value; } -- cgit v1.2.3-60-g2f50