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

kwin: Add overloads for setUniform() that take a location.

Browse source
This commit is contained in:
Fredrik Höglund 2011-02-04 19:57:19 +01:00
parent 859dadffd8
commit 8bc586e613
2 changed files with 63 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
lib/kwinglutils.cpp
View file

@ -854,60 +854,96 @@ void GLShader::unbind()
glUseProgram(0); glUseProgram(0);
} }
int GLShader::uniformLocation(const char* name) int GLShader::uniformLocation(const char *name)
{ {
int location = glGetUniformLocation(mProgram, name); int location = glGetUniformLocation(mProgram, name);
return location; return location;
} }
bool GLShader::setUniform(const char* name, float value) bool GLShader::setUniform(const char *name, float value)
{
const int location = uniformLocation(name);
return setUniform(location, value);
}
bool GLShader::setUniform(const char *name, int value)
{
const int location = uniformLocation(name);
return setUniform(location, value);
}
bool GLShader::setUniform(const char *name, const QVector2D& value)
{
const int location = uniformLocation(name);
return setUniform(location, value);
}
bool GLShader::setUniform(const char *name, const QVector3D& value)
{
const int location = uniformLocation(name);
return setUniform(location, value);
}
bool GLShader::setUniform(const char *name, const QVector4D& value)
{
const int location = uniformLocation(name);
return setUniform(location, value);
}
bool GLShader::setUniform(const char *name, const QMatrix4x4& value)
{
const int location = uniformLocation(name);
return setUniform(location, value);
}
bool GLShader::setUniform(const char *name, const QColor& color)
{
const int location = uniformLocation(name);
return setUniform(location, color);
}
bool GLShader::setUniform(int location, float value)
{ {
int location = uniformLocation(name);
if (location >= 0) { if (location >= 0) {
glUniform1f(location, value); glUniform1f(location, value);
} }
return (location >= 0); return (location >= 0);
} }
bool GLShader::setUniform(const char* name, int value) bool GLShader::setUniform(int location, int value)
{ {
int location = uniformLocation(name);
if (location >= 0) { if (location >= 0) {
glUniform1i(location, value); glUniform1i(location, value);
} }
return (location >= 0); return (location >= 0);
} }
bool GLShader::setUniform(const char* name, const QVector2D& value) bool GLShader::setUniform(int location, const QVector2D &value)
{ {
const int location = uniformLocation(name);
if (location >= 0) { if (location >= 0) {
glUniform2f(location, value.x(), value.y()); glUniform2fv(location, 1, (const GLfloat*)&value);
} }
return (location >= 0); return (location >= 0);
} }
bool GLShader::setUniform(const char* name, const QVector3D& value) bool GLShader::setUniform(int location, const QVector3D &value)
{ {
const int location = uniformLocation(name);
if (location >= 0) { if (location >= 0) {
glUniform3f(location, value.x(), value.y(), value.z()); glUniform3fv(location, 1, (const GLfloat*)&value);
} }
return (location >= 0); return (location >= 0);
} }
bool GLShader::setUniform(const char* name, const QVector4D& value) bool GLShader::setUniform(int location, const QVector4D &value)
{ {
const int location = uniformLocation(name);
if (location >= 0) { if (location >= 0) {
glUniform4f(location, value.x(), value.y(), value.z(), value.w()); glUniform4fv(location, 1, (const GLfloat*)&value);
} }
return (location >= 0); return (location >= 0);
} }
bool GLShader::setUniform(const char* name, const QMatrix4x4& value) bool GLShader::setUniform(int location, const QMatrix4x4 &value)
{ {
const int location = uniformLocation(name);
if (location >= 0) { if (location >= 0) {
GLfloat m[16]; GLfloat m[16];
const qreal *data = value.constData(); const qreal *data = value.constData();
@ -922,9 +958,8 @@ bool GLShader::setUniform(const char* name, const QMatrix4x4& value)
return (location >= 0); return (location >= 0);
} }
bool GLShader::setUniform(const char* name, const QColor& color) bool GLShader::setUniform(int location, const QColor &color)
{ {
const int location = uniformLocation(name);
if (location >= 0) { if (location >= 0) {
glUniform4f(location, color.redF(), color.greenF(), color.blueF(), color.alphaF()); glUniform4f(location, color.redF(), color.greenF(), color.blueF(), color.alphaF());
} }

10
lib/kwinglutils.h
View file

@ -252,6 +252,7 @@ public:
} }
int uniformLocation(const char* name); int uniformLocation(const char* name);
bool setUniform(const char* name, float value); bool setUniform(const char* name, float value);
bool setUniform(const char* name, int value); bool setUniform(const char* name, int value);
bool setUniform(const char* name, const QVector2D& value); bool setUniform(const char* name, const QVector2D& value);
@ -259,6 +260,15 @@ public:
bool setUniform(const char* name, const QVector4D& value); bool setUniform(const char* name, const QVector4D& value);
bool setUniform(const char* name, const QMatrix4x4& value); bool setUniform(const char* name, const QMatrix4x4& value);
bool setUniform(const char* name, const QColor& color); bool setUniform(const char* name, const QColor& color);
bool setUniform(int location, float value);
bool setUniform(int location, int value);
bool setUniform(int location, const QVector2D &value);
bool setUniform(int location, const QVector3D &value);
bool setUniform(int location, const QVector4D &value);
bool setUniform(int location, const QMatrix4x4 &value);
bool setUniform(int location, const QColor &value);
int attributeLocation(const char* name); int attributeLocation(const char* name);
bool setAttribute(const char* name, float value); bool setAttribute(const char* name, float value);
/** /**