Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-19 18:45:43 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'update_interop_to_use_CopyInto'

Browse Source 
711b7122 Remove warnings from CopyInto with MSVC.
763691a7 Update TransferToOpenGL to use ArrayHandle::CopyInto.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !328
This commit is contained in:
Robert Maynard 2016-01-26 16:07:23 -05:00 committed by Kitware Robot
commit b09fb3edf5
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
vtkm/opengl/internal/TransferToOpenGL.h
View File

@ -52,16 +52,18 @@ void CopyFromHandle(
static_cast<GLsizeiptr>(sizeof(ValueType)) *
static_cast<GLsizeiptr>(numberOfValues);
//Copy the data from its specialized Storage container to a basic storage
vtkm::cont::ArrayHandle<ValueType, vtkm::cont::StorageTagBasic> tmpHandle;
vtkm::cont::DeviceAdapterAlgorithm<DeviceAdapterTag>::Copy(handle, tmpHandle);
//Copy the data from its specialized Storage container to a basic heap alloc
ValueType* temporaryStorage = new ValueType[numberOfValues];
//Synchronize the arrays to ensure the most current data is available in the
//control environment
tmpHandle.SyncControlArray();
//Note that the temporary ArrayHandle is no longer valid after this call
ValueType* temporaryStorage = tmpHandle.Internals->ControlArray.StealArray();
#ifdef VTKM_MSVC
#pragma warning(disable:4244)
#pragma warning(disable:4996)
#endif
handle.CopyInto(temporaryStorage, DeviceAdapterTag());
#ifdef VTKM_MSVC
#pragma warning(default:4996)
#pragma warning(default:4244)
#endif
//Determine if we need to reallocate the buffer
state.SetSize(size);
@ -89,7 +91,7 @@ void CopyFromHandle(
{
//Specialization given that we are use an C allocated array storage tag
//that allows us to directly hook into the data. We pull the data
//back to the control enviornment using PerpareForInput and give an iterator
//back to the control environment using PerpareForInput and give an iterator
//from the portal to OpenGL to upload to the rendering system
//This also works because we know that this class isn't used for cuda interop,
//instead we are specialized