yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make s_supportsUnpack a static member of GLTexturePrivate

Browse source
This commit is contained in:
Fredrik Höglund 2014-11-22 16:17:51 +01:00
parent edb0751cba
commit 854f66c164
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libkwineffects/kwingltexture.cpp
View file

@ -44,6 +44,7 @@ namespace KWin
bool GLTexturePrivate::sFramebufferObjectSupported = false; bool GLTexturePrivate::sFramebufferObjectSupported = false;
GLenum GLTexturePrivate::sTextureFormat = GL_RGBA; // custom dummy, GL_BGRA is not present on GLES GLenum GLTexturePrivate::sTextureFormat = GL_RGBA; // custom dummy, GL_BGRA is not present on GLES
bool GLTexturePrivate::s_supportsUnpack = false;
uint GLTexturePrivate::s_textureObjectCounter = 0; uint GLTexturePrivate::s_textureObjectCounter = 0;
uint GLTexturePrivate::s_fbo = 0; uint GLTexturePrivate::s_fbo = 0;
@ -159,12 +160,14 @@ void GLTexturePrivate::initStatic()
if (!GLPlatform::instance()->isGLES()) { if (!GLPlatform::instance()->isGLES()) {
sFramebufferObjectSupported = hasGLExtension(QByteArrayLiteral("GL_EXT_framebuffer_object")); sFramebufferObjectSupported = hasGLExtension(QByteArrayLiteral("GL_EXT_framebuffer_object"));
sTextureFormat = GL_BGRA; sTextureFormat = GL_BGRA;
s_supportsUnpack = true;
} else { } else {
sFramebufferObjectSupported = true; sFramebufferObjectSupported = true;
if (hasGLExtension(QByteArrayLiteral("GL_EXT_texture_format_BGRA8888"))) if (hasGLExtension(QByteArrayLiteral("GL_EXT_texture_format_BGRA8888")))
sTextureFormat = GL_BGRA_EXT; sTextureFormat = GL_BGRA_EXT;
else else
sTextureFormat = GL_RGBA; sTextureFormat = GL_RGBA;
s_supportsUnpack = hasGLExtension(QByteArrayLiteral("GL_EXT_unpack_subimage"));
} }
} }
@ -240,14 +243,11 @@ void GLTexture::update(const QImage &image, const QPoint &offset, const QRect &s
Q_D(GLTexture); Q_D(GLTexture);
static const bool s_supportsUnpack = GLPlatform::instance()->isGLES() ?
hasGLExtension(QByteArrayLiteral("GL_EXT_unpack_subimage")) : true;
int width = image.width(); int width = image.width();
int height = image.height(); int height = image.height();
QImage tmpImage; QImage tmpImage;
if (!src.isNull()) { if (!src.isNull()) {
if (s_supportsUnpack) { if (d->s_supportsUnpack) {
glPixelStorei(GL_UNPACK_ROW_LENGTH, image.width()); glPixelStorei(GL_UNPACK_ROW_LENGTH, image.width());
glPixelStorei(GL_UNPACK_SKIP_PIXELS, src.x()); glPixelStorei(GL_UNPACK_SKIP_PIXELS, src.x());
glPixelStorei(GL_UNPACK_SKIP_ROWS, src.y()); glPixelStorei(GL_UNPACK_SKIP_ROWS, src.y());
@ -265,7 +265,7 @@ void GLTexture::update(const QImage &image, const QPoint &offset, const QRect &s
checkGLError("update texture"); checkGLError("update texture");
unbind(); unbind();
setDirty(); setDirty();
if (!src.isNull() && s_supportsUnpack) { if (!src.isNull() && d->s_supportsUnpack) {
glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0); glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
glPixelStorei(GL_UNPACK_SKIP_ROWS, 0); glPixelStorei(GL_UNPACK_SKIP_ROWS, 0);

1
libkwineffects/kwingltexture_p.h
View file

@ -72,6 +72,7 @@ public:
static bool sFramebufferObjectSupported; static bool sFramebufferObjectSupported;
static GLenum sTextureFormat; static GLenum sTextureFormat;
static bool s_supportsUnpack;
static uint s_fbo; static uint s_fbo;
static uint s_textureObjectCounter; static uint s_textureObjectCounter;
private: private: