thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BACKENDS: Move nextHigher2() into common/algorithm.h

Browse source
This commit is contained in:
Cameron Cawley 2019-12-14 12:13:09 +00:00 • committed by Filippos Karapetis
parent 97b4ee93f1
commit c3c3137ab3
3 changed files with 22 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

18
backends/graphics/opengl/texture.cpp
View file

@ -26,25 +26,13 @@
#include "backends/graphics/opengl/pipelines/clut8.h"
#include "backends/graphics/opengl/framebuffer.h"
#include "common/algorithm.h"
#include "common/endian.h"
#include "common/rect.h"
#include "common/textconsole.h"
namespace OpenGL {
static GLuint nextHigher2(GLuint v) {
if (v == 0)
return 1;
v--;
v |= v >> 1;
v |= v >> 2;
v |= v >> 4;
v |= v >> 8;
v |= v >> 16;
return ++v;
}
GLTexture::GLTexture(GLenum glIntFormat, GLenum glFormat, GLenum glType)
: _glIntFormat(glIntFormat), _glFormat(glFormat), _glType(glType),
_width(0), _height(0), _logicalWidth(0), _logicalHeight(0),
@ -107,8 +95,8 @@ void GLTexture::setSize(uint width, uint height) {
const uint oldHeight = _height;
if (!g_context.NPOTSupported) {
_width = nextHigher2(width);
_height = nextHigher2(height);
_width = Common::nextHigher2(width);
_height = Common::nextHigher2(height);
} else {
_width = width;
_height = height;