Merge topic 'Fix-MapperGL-PrepForExec-DispatcherMapField'

4416f8554 Fixing ColorTable::PrepareForExecution and DispatcherMapField

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2028
This commit is contained in:
Robert Maynard 2020-04-03 13:57:47 +00:00 committed by Kitware Robot
commit e7754ca854

@ -166,10 +166,11 @@ struct MapColorAndVerticesInvokeFunctor
{
VTKM_IS_DEVICE_ADAPTER_TAG(Device);
vtkm::cont::Token token;
MapColorAndVertices worklet(
this->ColorTable.PrepareForExecution(device), this->SMin, this->SDiff);
vtkm::worklet::DispatcherMapField<MapColorAndVertices, Device> dispatcher(worklet);
this->ColorTable.PrepareForExecution(device, token), this->SMin, this->SDiff);
vtkm::worklet::DispatcherMapField<MapColorAndVertices> dispatcher(worklet);
dispatcher.SetDevice(Device{});
vtkm::cont::ArrayHandleIndex indexArray(this->TriangleIndices.GetNumberOfValues());
dispatcher.Invoke(indexArray,