From c75feb74bb6add43e1be9a42a9bf4bf205b97c39 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Mon, 31 Oct 2016 15:16:36 -0400 Subject: [PATCH 1/3] Don't build vtkm_rendering if we can't find opengl. --- CMake/VTKmConfigureComponents.cmake | 2 +- vtkm/rendering/CMakeLists.txt | 51 ++++++++++++++--------------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/CMake/VTKmConfigureComponents.cmake b/CMake/VTKmConfigureComponents.cmake index 1decc3098..1d7bab54e 100644 --- a/CMake/VTKmConfigureComponents.cmake +++ b/CMake/VTKmConfigureComponents.cmake @@ -235,7 +235,7 @@ macro(vtkm_configure_component_Rendering) vtkm_finish_configure_component(Rendering DEPENDENT_VARIABLES VTKm_ENABLE_RENDERING VTKm_Base_FOUND - ADD_LIBRARIES vtkm_rendering ${GLEW_LIBRARIES} + ADD_LIBRARIES vtkm_rendering ) endmacro(vtkm_configure_component_Rendering) diff --git a/vtkm/rendering/CMakeLists.txt b/vtkm/rendering/CMakeLists.txt index bf5146bd8..356d7f759 100644 --- a/vtkm/rendering/CMakeLists.txt +++ b/vtkm/rendering/CMakeLists.txt @@ -118,7 +118,7 @@ vtkm_configure_component_OpenGL() if(VTKm_OpenGL_FOUND) list(APPEND headers ${opengl_headers}) list(APPEND sources ${opengl_sources}) - + vtkm_configure_component_OSMesa() if(VTKm_OSMesa_FOUND) list(APPEND headers ${osmesa_headers}) @@ -130,36 +130,35 @@ if(VTKm_OpenGL_FOUND) list(APPEND headers ${egl_headers}) list(APPEND sources ${egl_sources}) endif() -endif() -if(VTKm_ENABLE_OSMESA AND NOT VTKm_OSMesa_FOUND) - message(SEND_ERROR "OSMesa was requested by not properly configured. -Either make sure the OSMesa headers and library are properly found or set -VTKm_ENABLE_OSMESA to OFF.") -endif() + if(VTKm_ENABLE_OSMESA AND NOT VTKm_OSMesa_FOUND) + message(SEND_ERROR "OSMesa was requested by not properly configured. + Either make sure the OSMesa headers and library are properly found or set + VTKm_ENABLE_OSMESA to OFF.") + endif() -vtkm_declare_headers(${headers}) + vtkm_declare_headers(${headers}) -if (VTKm_ENABLE_CUDA) - vtkm_library( - SOURCES ${sources} - CUDA - WRAP_FOR_CUDA ${device_sources} - ) -else() - vtkm_library( - SOURCES ${sources} - ) -endif() + if (VTKm_ENABLE_CUDA) + vtkm_library( + SOURCES ${sources} + CUDA + WRAP_FOR_CUDA ${device_sources} + ) + else() + vtkm_library( + SOURCES ${sources} + ) + endif() -# Subclasses need rendering library -vtkm_configure_component_Rendering() + # Subclasses need rendering library + vtkm_configure_component_Rendering() -add_subdirectory(internal) -add_subdirectory(raytracing) + add_subdirectory(internal) + add_subdirectory(raytracing) + #----------------------------------------------------------------------------- + add_subdirectory(testing) - -#----------------------------------------------------------------------------- -add_subdirectory(testing) +endif() #opengl found From cc8121d997032c0ad64b4caf8514ec89b9711694 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Mon, 31 Oct 2016 15:26:05 -0400 Subject: [PATCH 2/3] Fix uninitialized warnings from DecodePNG. --- vtkm/rendering/DecodePNG.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/vtkm/rendering/DecodePNG.cxx b/vtkm/rendering/DecodePNG.cxx index 3c4a86c3d..44a9b945d 100644 --- a/vtkm/rendering/DecodePNG.cxx +++ b/vtkm/rendering/DecodePNG.cxx @@ -301,6 +301,7 @@ int DecodePNG(std::vector& out_image, unsigned long& image_width, { error = 0; info.width = 0; info.height = 0; //changed if header read successfully + info.key_r = info.key_g = info.key_b = 0; if(size == 0 || in == 0) { error = 48; return; } //the given data is empty readPngHeader(&in[0], size); if(error) return; std::size_t pos = 33; //first byte of the first chunk after the header From 6d9dd7d233cb32275a652a7c46d6fe2fa2ef2099 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Mon, 31 Oct 2016 15:27:45 -0400 Subject: [PATCH 3/3] Correct conversion warning in VolumeRendererStructured --- vtkm/rendering/raytracing/VolumeRendererStructured.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtkm/rendering/raytracing/VolumeRendererStructured.h b/vtkm/rendering/raytracing/VolumeRendererStructured.h index b4f510d7d..b2144922c 100644 --- a/vtkm/rendering/raytracing/VolumeRendererStructured.h +++ b/vtkm/rendering/raytracing/VolumeRendererStructured.h @@ -221,7 +221,7 @@ public: //normalize scalar finalScalar = (finalScalar - MinScalar) * InverseDeltaScalar; - vtkm::Id colorIndex = vtkm::Id(finalScalar * ColorMapSize); + vtkm::Id colorIndex = static_cast(finalScalar) * ColorMapSize; //colorIndex = vtkm::Min(ColorMapSize, vtkm::Max(0,colorIndex)); vtkm::Vec sampleColor = ColorMap.Get(colorIndex); //sampleColor[3] = .05f;