vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Shader optimizations. Patch provided by Robin Burchell. 

svn path=/trunk/KDE/kdebase/workspace/; revision=1007918
icc-effect-5.14.5
Lucas Murray 2009-08-06 13:57:09 +00:00
parent 0883f7eda0
commit 3db33763cf
2 changed files with 14 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lib/kwinglutils.cpp
View File

@ -732,7 +732,6 @@ void GLShader::initStatic()
GLShader::GLShader(const QString& vertexfile, const QString& fragmentfile)
{
mValid = false;
mVariableLocations = 0;
mProgram = 0;
mTextureWidth = -1.0f;
mTextureHeight = -1.0f;
@ -742,12 +741,6 @@ GLShader::GLShader(const QString& vertexfile, const QString& fragmentfile)
GLShader::~GLShader()
{
if(mVariableLocations)
{
mVariableLocations->clear();
delete mVariableLocations;
}
if(mProgram)
{
glDeleteProgram(mProgram);
@ -878,8 +871,6 @@ bool GLShader::load(const QString& vertexsource, const QString& fragmentsource)
kDebug(1212) << "Shader linking log:"<< log;
delete[] log;
mVariableLocations = new QHash<QString, int>;
mValid = true;
return true;
}
@ -894,21 +885,13 @@ void GLShader::unbind()
glUseProgram(0);
}
int GLShader::uniformLocation(const QString& name)
int GLShader::uniformLocation(const char* name)
{
if(!mVariableLocations)
{
return -1;
}
if(!mVariableLocations->contains(name))
{
int location = glGetUniformLocation(mProgram, name.toLatin1().data());
mVariableLocations->insert(name, location);
}
return mVariableLocations->value(name);
int location = glGetUniformLocation(mProgram, name);
return location;
}
bool GLShader::setUniform(const QString& name, float value)
bool GLShader::setUniform(const char* name, float value)
{
int location = uniformLocation(name);
if(location >= 0)
@ -918,7 +901,7 @@ bool GLShader::setUniform(const QString& name, float value)
return (location >= 0);
}
bool GLShader::setUniform(const QString& name, int value)
bool GLShader::setUniform(const char* name, int value)
{
int location = uniformLocation(name);
if(location >= 0)
@ -928,21 +911,13 @@ bool GLShader::setUniform(const QString& name, int value)
return (location >= 0);
}
int GLShader::attributeLocation(const QString& name)
int GLShader::attributeLocation(const char* name)
{
if(!mVariableLocations)
{
return -1;
}
if(!mVariableLocations->contains(name))
{
int location = glGetAttribLocation(mProgram, name.toLatin1().data());
mVariableLocations->insert(name, location);
}
return mVariableLocations->value(name);
int location = glGetAttribLocation(mProgram, name);
return location;
}
bool GLShader::setAttribute(const QString& name, float value)
bool GLShader::setAttribute(const char* name, float value)
{
int location = attributeLocation(name);
if(location >= 0)

11
lib/kwinglutils.h
View File

@ -213,11 +213,11 @@ class KWIN_EXPORT GLShader
void bind();
void unbind();
int uniformLocation(const QString& name);
bool setUniform(const QString& name, float value);
bool setUniform(const QString& name, int value);
int attributeLocation(const QString& name);
bool setAttribute(const QString& name, float value);
int uniformLocation(const char* name);
bool setUniform(const char* name, float value);
bool setUniform(const char* name, int value);
int attributeLocation(const char* name);
bool setAttribute(const char* name, float value);
void setTextureWidth( float width );
void setTextureHeight( float height );
@ -237,7 +237,6 @@ class KWIN_EXPORT GLShader
private:
unsigned int mProgram;
bool mValid;
QHash< QString, int >* mVariableLocations;
static bool mFragmentShaderSupported;
static bool mVertexShaderSupported;
float mTextureWidth;