Skip to content
Snippets Groups Projects
Commit d6da179a authored by Ken Martin's avatar Ken Martin
Browse files

More minor fixes

parent efc7e9f0
Branches
No related tags found
No related merge requests found
......@@ -170,6 +170,7 @@ void vtkOpenGLRenderWindow::ReleaseGraphicsResources()
vtkErrorMacro("Leaked for texture object: " << const_cast<vtkTextureObject *>(found->first));
}
}
this->Initialized = false;
}
// ----------------------------------------------------------------------------
......@@ -1889,6 +1890,7 @@ void vtkOpenGLRenderWindow::SaveGLState()
// For now just query the active texture unit
if (this->Initialized)
{
this->MakeCurrent();
glGetIntegerv(GL_ACTIVE_TEXTURE, &this->GLStateIntegers["GL_ACTIVE_TEXTURE"]);
// GetTextureUnitManager() will create a new texture unit
......
......@@ -536,9 +536,6 @@ void vtkOpenGLProjectedTetrahedraMapper::ProjectTetrahedra(vtkRenderer *renderer
// after mucking about with FBO bindings be sure
// we're saving the default fbo attributes/blend function
glPushAttrib(GL_COLOR_BUFFER_BIT);
vtkOpenGLCheckErrorMacro("failed at glPushAttrib");
this->AllocateFBOResources(renderer);
if (this->UseFloatingPointFrameBuffer
......@@ -1123,7 +1120,6 @@ void vtkOpenGLProjectedTetrahedraMapper::ProjectTetrahedra(vtkRenderer *renderer
}
// Restore the blend function.
glPopAttrib();
vtkOpenGLCheckErrorMacro("failed at glPopAttrib");
glDepthMask(GL_TRUE);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment