diff --git a/vtkm/cont/ArrayHandleSwizzle.h b/vtkm/cont/ArrayHandleSwizzle.h index 027e03fb9..3e09dd71a 100644 --- a/vtkm/cont/ArrayHandleSwizzle.h +++ b/vtkm/cont/ArrayHandleSwizzle.h @@ -386,6 +386,15 @@ VTKM_CONT ArrayHandleSwizzle make_ArrayHandleSwizzle( { return ArrayHandleSwizzle(array, map); } + +template +VTKM_CONT ArrayHandleSwizzle +make_ArrayHandleSwizzle(const ArrayHandleType& array, + vtkm::IdComponent swizzleIndex0, + SwizzleIndexTypes... swizzleIndices) +{ + return make_ArrayHandleSwizzle(array, vtkm::make_Vec(swizzleIndex0, swizzleIndices...)); +} } } // namespace vtkm::cont diff --git a/vtkm/cont/testing/UnitTestArrayHandleSwizzle.cxx b/vtkm/cont/testing/UnitTestArrayHandleSwizzle.cxx index 2e35116f9..8317f6886 100644 --- a/vtkm/cont/testing/UnitTestArrayHandleSwizzle.cxx +++ b/vtkm/cont/testing/UnitTestArrayHandleSwizzle.cxx @@ -327,7 +327,7 @@ void TestComponentMapValidator() bool error = false; try { - vtkm::cont::make_ArrayHandleSwizzle(dummy, vtkm::make_Vec(0, 1, 2, 1)); + vtkm::cont::make_ArrayHandleSwizzle(dummy, 0, 1, 2, 1); error = true; } catch (vtkm::cont::ErrorBadValue& e) @@ -338,7 +338,7 @@ void TestComponentMapValidator() try { - vtkm::cont::make_ArrayHandleSwizzle(dummy, vtkm::make_Vec(0, 1, 2, -1)); + vtkm::cont::make_ArrayHandleSwizzle(dummy, 0, 1, 2, -1); error = true; } catch (vtkm::cont::ErrorBadValue& e) @@ -349,7 +349,7 @@ void TestComponentMapValidator() try { - vtkm::cont::make_ArrayHandleSwizzle(dummy, vtkm::make_Vec(0, 1, 2, 5)); + vtkm::cont::make_ArrayHandleSwizzle(dummy, 0, 1, 2, 5); error = true; } catch (vtkm::cont::ErrorBadValue& e)