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

Remove the saturation support checks

Browse source 
We no longer use texture environment parameters to control saturation.
This commit is contained in:
Fredrik Höglund 2014-11-22 15:14:07 +01:00
parent 978a5e10f3
commit 181afc85fe
3 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libkwineffects/kwingltexture.cpp
View file

@ -44,7 +44,6 @@ namespace KWin
bool GLTexturePrivate::sNPOTTextureSupported = false; bool GLTexturePrivate::sNPOTTextureSupported = false;
bool GLTexturePrivate::sFramebufferObjectSupported = false; bool GLTexturePrivate::sFramebufferObjectSupported = false;
bool GLTexturePrivate::sSaturationSupported = 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
uint GLTexturePrivate::s_textureObjectCounter = 0; uint GLTexturePrivate::s_textureObjectCounter = 0;
uint GLTexturePrivate::s_fbo = 0; uint GLTexturePrivate::s_fbo = 0;
@ -162,14 +161,10 @@ void GLTexturePrivate::initStatic()
if (!GLPlatform::instance()->isGLES()) { if (!GLPlatform::instance()->isGLES()) {
sNPOTTextureSupported = hasGLExtension(QByteArrayLiteral("GL_ARB_texture_non_power_of_two")); sNPOTTextureSupported = hasGLExtension(QByteArrayLiteral("GL_ARB_texture_non_power_of_two"));
sFramebufferObjectSupported = hasGLExtension(QByteArrayLiteral("GL_EXT_framebuffer_object")); sFramebufferObjectSupported = hasGLExtension(QByteArrayLiteral("GL_EXT_framebuffer_object"));
sSaturationSupported = ((hasGLExtension(QByteArrayLiteral("GL_ARB_texture_env_crossbar"))
&& hasGLExtension(QByteArrayLiteral("GL_ARB_texture_env_dot3"))) || hasGLVersion(1, 4))
&& (glTextureUnitsCount >= 4) && glActiveTexture != nullptr;
sTextureFormat = GL_BGRA; sTextureFormat = GL_BGRA;
} else { } else {
sNPOTTextureSupported = true; sNPOTTextureSupported = true;
sFramebufferObjectSupported = true; sFramebufferObjectSupported = true;
sSaturationSupported = 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
@ -181,7 +176,6 @@ void GLTexturePrivate::cleanup()
{ {
sNPOTTextureSupported = false; sNPOTTextureSupported = false;
sFramebufferObjectSupported = false; sFramebufferObjectSupported = false;
sSaturationSupported = false;
sTextureFormat = GL_RGBA; // custom dummy, GL_BGRA is not present on GLES sTextureFormat = GL_RGBA; // custom dummy, GL_BGRA is not present on GLES
} }
@ -611,9 +605,4 @@ bool GLTexture::framebufferObjectSupported()
return GLTexturePrivate::sFramebufferObjectSupported; return GLTexturePrivate::sFramebufferObjectSupported;
} }
bool GLTexture::saturationSupported()
{
return GLTexturePrivate::sSaturationSupported;
}
} // namespace KWin } // namespace KWin

1
libkwineffects/kwingltexture.h
View file

@ -106,7 +106,6 @@ public:
static bool NPOTTextureSupported(); static bool NPOTTextureSupported();
static bool framebufferObjectSupported(); static bool framebufferObjectSupported();
static bool saturationSupported();
protected: protected:
QExplicitlySharedDataPointer<GLTexturePrivate> d_ptr; QExplicitlySharedDataPointer<GLTexturePrivate> d_ptr;

1
libkwineffects/kwingltexture_p.h
View file

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