Commit Graph

2346 Commits

Author SHA1 Message Date
Dave Pugmire
827bf10795 compiler warnings. 2016-10-04 12:43:04 -04:00
Dave Pugmire
668e8115af Fix compiler warnings. 2016-10-04 11:59:00 -04:00
Dave Pugmire
c4bd8913c2 Use a new worklet to map vertex colors through a colormap. 2016-09-28 14:23:18 -04:00
Dave Pugmire
515a374490 Merge branch 'master' into 'master'
color mapping is now a worklet



See merge request !6
2016-09-28 11:49:14 -04:00
Mark Kim
0ace430746 Merge branch 'master' of gitlab.kitware.com:dpugmire/vtk-m 2016-09-28 10:59:27 -04:00
Mark Kim
f2a6d8d5e3 Change the for loop that converts color to Worklet. 2016-09-28 10:57:05 -04:00
Dave Pugmire
c99fe8b65e Remove rendering tests that have been moved to subdirectories.
Fix a compile error in canvas constructor in the GLFW test.
2016-09-27 14:04:28 -04:00
Dave Pugmire
46e976e918 Merge branch 'master' into 'master'
vbos and other things

VBOs are in.

See merge request !5
2016-09-26 16:50:23 -04:00
Mark Kim
4e73280175 General Rendering needs glew now. 2016-09-26 16:24:24 -04:00
Mark Kim
a41e0f28df Merge branch 'master' of gitlab.kitware.com:vtk/vtk-m 2016-09-26 16:12:19 -04:00
Mark Kim
2db35b0041 Removed extraneous debug output. 2016-09-26 15:09:41 -04:00
Robert Maynard
600b7dc069 Merge topic 'correct_duplicate_trailing_semilcolon_warnings'
248ec04d Correct double trailing semicolons with VTKM_IS_TOPOLOGY_ELEMENT_TAG

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !564
2016-09-26 08:30:38 -04:00
Robert Maynard
248ec04db7 Correct double trailing semicolons with VTKM_IS_TOPOLOGY_ELEMENT_TAG 2016-09-23 16:38:52 -04:00
Robert Maynard
8cb295d6ca Merge topic 'yet_another_cuda_cxx11_flag_pass'
346133d1 Make sure we don't duplicate commands to NVCC.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !563
2016-09-23 16:37:17 -04:00
Robert Maynard
346133d195 Make sure we don't duplicate commands to NVCC.
The previous attempt at using caching to prevent duplicate commands, failed
when you tried to build VTK-m itself and had examples turned on. Now we
just don't add the std=c++11 option if it already exists.
2016-09-23 10:09:32 -04:00
Mark Kim
5827473abb Merge branch 'master' of gitlab.kitware.com:dpugmire/vtk-m 2016-09-23 09:46:48 -04:00
Dave Pugmire
7a2874cf44 Add 1D support for uniform and rectilinear data. 2016-09-23 09:00:40 -04:00
Mark Kim
9100a58da4 glew undefs GLAPI and GLAPIENTRY. osmesa.h needs them. 2016-09-22 16:44:52 -04:00
Mark Kim
4076aef075 Ubuntu 16.04's OSMesa version 11.2.0 is compiled without gallium/llvmpipe, so it doesn't support GLSL 1.3 or higher. 2016-09-22 16:25:41 -04:00
Robert Maynard
71b20353cd Merge topic 'require_cmake_3_3'
314d91a5 Explicitly require CMake 3.3 and a C++11 Compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !544
2016-09-22 16:03:33 -04:00
Kenneth Moreland
30de41271e Merge topic 'build-rendering-to-enable-rendering'
4b838263 Fix uninitialized variable warning in structured volume renderer
1e819c33 Remove uninitialized value warnings from PNGDecode
c1de0e07 Change VTKm_BUILD_RENDERING to VTKm_ENABLE_RENDERING

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !553
2016-09-22 15:40:36 -04:00
Robert Maynard
31ea9e3693 Merge topic 'cache_nvcc_flags_state_modification'
43651c55 Make sure we don't duplicate commands to NVCC.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !558
2016-09-22 14:01:14 -04:00
Kenneth Moreland
4b83826345 Fix uninitialized variable warning in structured volume renderer
One of the dashboard was complaining that the bottomLeft variable might
have been used uninitialized because it got set in a condition above it.
In fact, that condition is always true the first during the first
iteration, but it is not worth fighting the compiler over it. Instead,
just initialize the value of bottomLeft when it is constructed.
2016-09-22 09:52:12 -06:00
Kenneth Moreland
1e819c335f Remove uninitialized value warnings from PNGDecode
One of the dashboard compilers found a code path in PNGDecode where if
given a buffer too short for a header the info.width and info.height
were not initialized but their values still returned to the calling
function. This case does not really matter since an error is also
returned, but still technically incorrect. Fixed the problem by
initializing the width and height to 0 (which could help anyway if the
error is not properly checked).
2016-09-22 09:43:24 -06:00
Matt Larsen
f0660990c6 Merge topic 'fix/vtk_reader_strings_fields'
2fbb9324 Merge branch 'fix/vtk_reader_strings_fields' of https://gitlab.kitware.com/mclarsen/vtk-m into fix/vtk_reader_strings_fields
69d4ced2 Fixing typo
a564ca0f Casting size_t
0015e315 Adding static cast to suppress warnings
d9bd4cb6 Adding else statement
f6234001 Adding support in the vtk data set reader for skipping strings in field data
7ccd0d9e Fixing typo
c687e06f Casting size_t
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !560
2016-09-22 11:17:18 -04:00
Matt Larsen
2fbb9324a6 Merge branch 'fix/vtk_reader_strings_fields' of https://gitlab.kitware.com/mclarsen/vtk-m into fix/vtk_reader_strings_fields 2016-09-21 14:14:55 -07:00
Matt Larsen
69d4ced2ac Fixing typo 2016-09-21 14:14:27 -07:00
Matt Larsen
a564ca0f3e Casting size_t 2016-09-21 14:14:26 -07:00
Matt Larsen
0015e3150b Adding static cast to suppress warnings 2016-09-21 14:14:26 -07:00
Matt Larsen
d9bd4cb698 Adding else statement 2016-09-21 14:14:26 -07:00
Matt Larsen
f623400151 Adding support in the vtk data set reader for skipping strings in field data 2016-09-21 14:14:26 -07:00
Kenneth Moreland
c1de0e0746 Change VTKm_BUILD_RENDERING to VTKm_ENABLE_RENDERING
This makes the name more consistent with the names of the other VTK-m
CMake options.

Also changed the default to be ON. I do not see a big downside to
compiling the rendering library most of the time.
2016-09-21 14:38:00 -06:00
Robert Maynard
314d91a5f3 Explicitly require CMake 3.3 and a C++11 Compiler
We need to bump our minimum CMake version to get support for C++11
flags on certain compilers.
2016-09-21 16:24:54 -04:00
Robert Maynard
43651c55bc Make sure we don't duplicate commands to NVCC.
When you called find_package multiple times with VTK-m components such as CUDA
would continuously append to variables, causing a variable to have the same
parameter listed multiple times.
2016-09-21 16:22:52 -04:00
Robert Maynard
fa3c2b8986 Merge topic 'properly_handle_host_compiler_being_c_compiler'
c8726814 Make VTKmDetectCUDAVersion work with C compilers.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !561
2016-09-21 16:22:38 -04:00
Robert Maynard
c8726814b8 Make VTKmDetectCUDAVersion work with C compilers. 2016-09-21 16:00:57 -04:00
Matt Larsen
7ccd0d9e7f Fixing typo 2016-09-21 08:54:26 -07:00
Matt Larsen
c687e06f0d Casting size_t 2016-09-21 08:40:38 -07:00
Matt Larsen
7b28ff93a6 Adding static cast to suppress warnings 2016-09-21 08:33:09 -07:00
Matt Larsen
84779eb457 Adding else statement 2016-09-21 08:19:10 -07:00
Matt Larsen
2975cf4867 Adding support in the vtk data set reader for skipping strings in field data 2016-09-21 08:16:43 -07:00
Dave Pugmire
c4a78d952c Merge branch 'master' into 'master'
Fix compile errors. decl for memcpy required.



See merge request !556
2016-09-20 11:17:29 -04:00
Dave Pugmire
a12b5eeae3 Fix compile errors. decl for memcpy required. 2016-09-20 11:03:25 -04:00
Robert Maynard
5c7c546c86 Merge branch 'properly_cache_cuda_native_flags' into 'master'
Properly cache the results of CUDA native detection.

I found some issues when using VTK-m from inside VTK. The issues where
that on reconfigures the device architectures flags where dropped by the
caching mechanism.

See merge request !555
2016-09-19 16:30:03 -04:00
Robert Maynard
462a1b0882 Properly cache the results of CUDA native detection.
I found some issues when using VTK-m from inside VTK. The issues where
that on reconfigures the device architectures flags where dropped by the
caching mechanism.
2016-09-19 14:58:18 -04:00
Kenneth Moreland
0ca69cf65f Merge topic 'osmesa-option'
123bc8b6 Add a configuration error if OSMesa was not found
0a61085d Do not load OpenGL libraries if OSMesa already loaded
640e92c7 Add VTKm_ENABLE_OSMESA option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !548
2016-09-17 10:11:55 -04:00
Mark Kim
e59fc37f90 Merge topic 'master'
7cfc1199 Demo.cxx: MapperRayTracer is no longer a templated class. UnitTestMapperEGL.cxx: MapperGL is no longer a templated class. UnitTestMapperGLFW.cxx: strmp needs cstring rendering/CMakeLists.txt: need to append egl_sources to sources.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !552
2016-09-16 09:02:06 -04:00
Kenneth Moreland
9446ecd145 Merge topic 'hide-glfw'
b3e1e8f9 Make GLFW CMake configure vars advanced

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !554
2016-09-15 15:25:25 -04:00
Mark Kim
c99c05b6f0 Change glfw unit test to also test vbo uploading. 2016-09-15 13:56:50 -04:00
Mark Kim
bb7fe4ad8e It's possible that the length of shader compiler message to be less than
or equal to zero. If we don't check for that, it'll spit out garbage.
2016-09-15 13:55:16 -04:00