Commit cc429a57 authored by Ken Martin's avatar Ken Martin

Fix a regression and new failing test

TestActor3D needed to pass its info down to deleates it
uses to do the rendering. Added that code. This fixes a failing
depth peeling test.

Reverted multisample change for OpenGL2 as it was causing all
offscreen tests to fail (many MPI tests use os rendering).

Change-Id: Ida4d2ff36a60c7e1e6f4a434208d19933791a3e5
parent cf97f6fd
......@@ -216,6 +216,10 @@ int vtkTextActor3D::UpdateImageActor()
return 1;
}
// copy information to the delegate
vtkInformation *info = this->GetPropertyKeys();
this->ImageActor->SetPropertyKeys(info);
// Do we need to (re-)render the text ?
// Yes if:
// - instance has been modified since last build
......
......@@ -1547,13 +1547,14 @@ int vtkOpenGLRenderWindow::CreateHardwareOffScreenWindow(int width, int height)
assert("pre: not_initialized" && !this->OffScreenUseFrameBuffer);
// This implementation currently ignores multisampling configurations:
if (this->MultiSamples > 1)
{
vtkDebugMacro(<<"Multisampling is not currently supported by the "
"accelerated offscreen rendering backend. Falling back to "
"a platform-specific offscreen solution...");
return 0;
}
// the following code causes tests to fail, commenting it out
// if (this->MultiSamples > 1)
// {
// vtkDebugMacro(<<"Multisampling is not currently supported by the "
// "accelerated offscreen rendering backend. Falling back to "
// "a platform-specific offscreen solution...");
// return 0;
// }
// 1. create a regular OpenGLcontext (ie create a window)
this->CreateAWindow();
......
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