Commit 8ef02395 authored by David E. DeMarle's avatar David E. DeMarle

Merge branch 'two_minor_fixes' into release

Change-Id: Ie49e0bf618796d2c38d34eb05cf2e139fd0797d3
parents 8a9b68b3 409b4c5e
......@@ -74,12 +74,8 @@ void vtkOpenGLSphereMapper::ReplaceShaderValues(std::string &VSSource,
"uniform float invertedDepth;\n"
"uniform int cameraParallel;\n"
"varying float radiusVC;\n"
"varying vec3 centerVC;\n";
if (lightComplexity < 2)
{
replacement += "uniform mat4 VCDCMatrix;\n";
}
"varying vec3 centerVC;\n"
"uniform mat4 VCDCMatrix;\n";
substitute(FSSource,"//VTK::Normal::Dec",replacement);
substitute(FSSource,"//VTK::Normal::Impl",
......
......@@ -76,12 +76,8 @@ void vtkOpenGLStickMapper::ReplaceShaderValues(std::string &VSSource,
"varying float radiusVC;\n"
"varying vec3 orientVC;\n"
"varying float lengthVC;\n"
"varying vec3 centerVC;\n";
if (lightComplexity < 2)
{
replacement += "uniform mat4 VCDCMatrix;\n";
}
"varying vec3 centerVC;\n"
"uniform mat4 VCDCMatrix;\n";
substitute(FSSource,"//VTK::Normal::Dec",replacement);
......
......@@ -232,11 +232,11 @@ bool vtkShaderProgram::Link()
if (isCompiled == 0)
{
GLint length(0);
glGetShaderiv(static_cast<GLuint>(this->Handle), GL_INFO_LOG_LENGTH, &length);
glGetProgramiv(static_cast<GLuint>(this->Handle), GL_INFO_LOG_LENGTH, &length);
if (length > 1)
{
char *logMessage = new char[length];
glGetShaderInfoLog(static_cast<GLuint>(this->Handle), length, NULL, logMessage);
glGetProgramInfoLog(static_cast<GLuint>(this->Handle), length, NULL, logMessage);
this->Error = logMessage;
delete[] logMessage;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment