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

kwin: Static member variables shouldn't have the m prefix.

Browse source
This commit is contained in:
Fredrik Höglund 2011-02-04 17:30:36 +01:00 committed by Marco Martin
parent cf58a57cf4
commit 5cbd1d458b
2 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
lib/kwinglutils.cpp
View file

@ -357,9 +357,9 @@ void popMatrix()
// GLTexture
//****************************************
bool GLTexture::mNPOTTextureSupported = false;
bool GLTexture::mFramebufferObjectSupported = false;
bool GLTexture::mSaturationSupported = false;
bool GLTexture::sNPOTTextureSupported = false;
bool GLTexture::sFramebufferObjectSupported = false;
bool GLTexture::sSaturationSupported = false;
GLTexture::GLTexture()
{
@ -432,13 +432,13 @@ void GLTexture::init()
void GLTexture::initStatic()
{
#ifdef KWIN_HAVE_OPENGLES
mNPOTTextureSupported = true;
mFramebufferObjectSupported = true;
mSaturationSupported = true;
sNPOTTextureSupported = true;
sFramebufferObjectSupported = true;
sSaturationSupported = true;
#else
mNPOTTextureSupported = hasGLExtension("GL_ARB_texture_non_power_of_two");
mFramebufferObjectSupported = hasGLExtension("GL_EXT_framebuffer_object");
mSaturationSupported = ((hasGLExtension("GL_ARB_texture_env_crossbar")
sNPOTTextureSupported = hasGLExtension("GL_ARB_texture_non_power_of_two");
sFramebufferObjectSupported = hasGLExtension("GL_EXT_framebuffer_object");
sSaturationSupported = ((hasGLExtension("GL_ARB_texture_env_crossbar")
&& hasGLExtension("GL_ARB_texture_env_dot3")) || hasGLVersion(1, 4))
&& (glTextureUnitsCount >= 4) && glActiveTexture != NULL;
#endif
@ -813,18 +813,18 @@ QImage GLTexture::convertToGLFormat(const QImage& img) const
// GLShader
//****************************************
bool GLShader::mFragmentShaderSupported = false;
bool GLShader::mVertexShaderSupported = false;
bool GLShader::sFragmentShaderSupported = false;
bool GLShader::sVertexShaderSupported = false;
void GLShader::initStatic()
{
#ifdef KWIN_HAVE_OPENGLES
mFragmentShaderSupported = mVertexShaderSupported = true;
sFragmentShaderSupported = sVertexShaderSupported = true;
#else
mFragmentShaderSupported = mVertexShaderSupported =
sFragmentShaderSupported = sVertexShaderSupported =
hasGLExtension("GL_ARB_shader_objects") && hasGLExtension("GL_ARB_shading_language_100");
mVertexShaderSupported &= hasGLExtension("GL_ARB_vertex_shader");
mFragmentShaderSupported &= hasGLExtension("GL_ARB_fragment_shader");
sVertexShaderSupported &= hasGLExtension("GL_ARB_vertex_shader");
sFragmentShaderSupported &= hasGLExtension("GL_ARB_fragment_shader");
#endif
}
@ -1382,14 +1382,14 @@ void ShaderManager::resetShader(ShaderType type)
}
/*** GLRenderTarget ***/
bool GLRenderTarget::mSupported = false;
bool GLRenderTarget::sSupported = false;
void GLRenderTarget::initStatic()
{
#ifdef KWIN_HAVE_OPENGLES
mSupported = true;
sSupported = true;
#else
mSupported = hasGLExtension("GL_EXT_framebuffer_object") && glFramebufferTexture2D;
sSupported = hasGLExtension("GL_EXT_framebuffer_object") && glFramebufferTexture2D;
#endif
}
@ -1401,7 +1401,7 @@ GLRenderTarget::GLRenderTarget(GLTexture* color)
mTexture = color;
// Make sure FBO is supported
if (mSupported && mTexture && !mTexture->isNull()) {
if (sSupported && mTexture && !mTexture->isNull()) {
initFBO();
} else
kError(1212) << "Render targets aren't supported!" << endl;

24
lib/kwinglutils.h
View file

@ -249,13 +249,13 @@ public:
static void initStatic();
static bool NPOTTextureSupported() {
return mNPOTTextureSupported;
return sNPOTTextureSupported;
}
static bool framebufferObjectSupported() {
return mFramebufferObjectSupported;
return sFramebufferObjectSupported;
}
static bool saturationSupported() {
return mSaturationSupported;
return sSaturationSupported;
}
protected:
@ -278,9 +278,9 @@ private:
GLVertexBuffer* m_vbo;
QSize m_cachedSize;
static bool mNPOTTextureSupported;
static bool mFramebufferObjectSupported;
static bool mSaturationSupported;
static bool sNPOTTextureSupported;
static bool sFramebufferObjectSupported;
static bool sSaturationSupported;
Q_DISABLE_COPY(GLTexture)
};
@ -317,10 +317,10 @@ public:
static void initStatic();
static bool fragmentShaderSupported() {
return mFragmentShaderSupported;
return sFragmentShaderSupported;
}
static bool vertexShaderSupported() {
return mVertexShaderSupported;
return sVertexShaderSupported;
}
@ -336,8 +336,8 @@ protected:
private:
unsigned int mProgram;
bool mValid;
static bool mFragmentShaderSupported;
static bool mVertexShaderSupported;
static bool sFragmentShaderSupported;
static bool sVertexShaderSupported;
float mTextureWidth;
float mTextureHeight;
friend class ShaderManager;
@ -520,7 +520,7 @@ public:
static void initStatic();
static bool supported() {
return mSupported;
return sSupported;
}
@ -529,7 +529,7 @@ protected:
private:
static bool mSupported;
static bool sSupported;
GLTexture* mTexture;
bool mValid;