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

VBO uses ShaderManager to get current bound shader

icc-effect-5.14.5
Martin Gräßlin 2010-12-11 11:10:53 +01:00
parent 753df55973
commit 910ba17444
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/kwinglutils.cpp
View File

@ -1547,17 +1547,12 @@ void GLVertexBufferPrivate::corePainting( const QRegion& region, GLenum primitiv
glEnableVertexAttribArray( 1 );
}
// TODO: have this information available somewhere useable
GLint currentProgram;
glGetIntegerv( GL_CURRENT_PROGRAM, &currentProgram );
GLint vertexAttrib = glGetAttribLocation( currentProgram, "vertex" );
GLint texAttrib = glGetAttribLocation( currentProgram, "texCoord" );
GLShader *shader = ShaderManager::instance()->getBoundShader();
GLint vertexAttrib = shader->attributeLocation("vertex");
GLint texAttrib = shader->attributeLocation("texCoord" );
if (useColor) {
GLint colorLocation = glGetUniformLocation(currentProgram, "geometryColor");
if (colorLocation != 0) {
glUniform4f(colorLocation, color.redF(), color.greenF(), color.blueF(), color.alphaF());
}
shader->setUniform("geometryColor", color);
}
glBindBuffer( GL_ARRAY_BUFFER, buffers[ 0 ] );