GameOfLife example always uses the proper device adapter

Previously the example would only time using the serial device
adapter, which wouldn't work when the user explicitly specified
a device on the command line.
This commit is contained in:
Robert Maynard 2019-04-17 14:57:51 -04:00
parent 6c5c197a37
commit d3d66a3312

@ -214,7 +214,7 @@ struct RenderGameOfLife
vtkm::Vec<float, 3> spacing(0.0075f, 0.0075f, 0.0f);
vtkm::cont::ArrayHandleUniformPointCoordinates coords(dimensions, origin, spacing);
vtkm::interop::TransferToOpenGL(coords, this->VBOState, vtkm::cont::DeviceAdapterTagSerial());
vtkm::interop::TransferToOpenGL(coords, this->VBOState);
}
void render(vtkm::cont::DataSet& data)
@ -250,7 +250,7 @@ struct RenderGameOfLife
}
};
vtkm::cont::Timer gTimer{ vtkm::cont::DeviceAdapterTagSerial() };
vtkm::cont::Timer gTimer;
vtkm::cont::DataSet* gData = nullptr;
GameOfLife* gFilter = nullptr;
RenderGameOfLife* gRenderer = nullptr;