Merge branch 'next_release'

Author: jeffamstutz

CMakeLists.txt

@@ -46,7 +46,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
-project(VisRTX VERSION 0.6.0 LANGUAGES C CXX)
+project(VisRTX VERSION 0.6.1 LANGUAGES C CXX)
 
 include(GNUInstallDirs)
 
@@ -71,7 +71,7 @@ endif()
 
 # ANARI-SDK
 set(ANARI_REQUIRED_VERSION 0.7.0)
-find_package(anari ${ANARI_REQUIRED_VERSION} EXACT REQUIRED)
+find_package(anari ${ANARI_REQUIRED_VERSION} REQUIRED)
 
 # CUDA
 find_package(CUDAToolkit 11.3.1)

cmake/VisRTXConfig.cmake.in

@@ -31,7 +31,7 @@
 
 include(CMakeFindDependencyMacro)
 
-find_dependency(anari @ANARI_REQUIRED_VERSION@ EXACT)
+find_dependency(anari @ANARI_REQUIRED_VERSION@)
 
 include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@_Exports.cmake")
 

devices/gl/CMakeLists.txt

@@ -27,6 +27,8 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+include(GenerateExportHeader)
+
 set(CMAKE_CXX_STANDARD 11)
 
 project(anari_library_visgl LANGUAGES CXX)
@@ -87,23 +89,39 @@ add_library(${PROJECT_NAME} SHARED
   src/glad/src/gl.c
 )
 
+generate_export_header(${PROJECT_NAME}
+  EXPORT_MACRO_NAME "VISGL_DEVICE_INTERFACE"
+)
+
 target_include_directories(${PROJECT_NAME}
 PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
-  generated
-  src
-  src/glad/include
-  src/egl/
-  src/glx/
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/generated>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/glad/include>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/egl>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/glx>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
 )
 
 target_link_libraries(${PROJECT_NAME}
 PUBLIC
   anari::anari
-  OpenGL::OpenGL
   Threads::Threads
 )
 
+if(WIN32)
+  target_link_libraries(${PROJECT_NAME}
+  PUBLIC
+    OpenGL::GL
+  )
+else()
+  target_link_libraries(${PROJECT_NAME}
+  PUBLIC
+    OpenGL::OpenGL
+  )
+endif()
+
 if(OpenGL_EGL_FOUND)
   target_sources(${PROJECT_NAME} PRIVATE
     src/egl/egl_context.cpp
@@ -130,7 +148,7 @@ if(OpenGL_GLX_FOUND AND X11_FOUND)
   )
   target_include_directories(${PROJECT_NAME}
   PUBLIC
-    X11_INCLUDE_DIR
+    ${X11_INCLUDE_DIR}
   )
 
   target_compile_definitions(${PROJECT_NAME}
@@ -144,8 +162,36 @@ PRIVATE
   "anari_library_visgl_EXPORTS"
 )
 
+if (MSVC)
+  target_compile_options(${PROJECT_NAME}
+  PRIVATE
+    "/bigobj"
+  )
+endif()
+
 install(TARGETS ${PROJECT_NAME}
+  EXPORT VisGL_Exports
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
+
+if (VISRTX_USE_SOVERSION)
+  set_target_properties(${PROJECT_NAME}
+      PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
+
+  install(TARGETS ${PROJECT_NAME}
+    EXPORT VisGL_Exports
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+      NAMELINK_SKIP
+    # on Windows put the dlls into bin
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    # ... and the import lib into the devel package
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  )
+endif()
+
+install(EXPORT VisGL_Exports
+  DESTINATION ${VISRTX_CMAKE_INSTALL_DESTINATION}
+  NAMESPACE VisGL::
+)

devices/gl/src/ConcurrentArray.h

@@ -36,6 +36,10 @@
 #include <atomic>
 #include <mutex>
 
+#ifdef _WIN32
+#include <intrin.h>
+#endif
+
 // This is an array of exponentially growing chunks
 // Only addition of elements needs to be protected
 // by a lock while elements remain accessible even
@@ -52,7 +56,22 @@ class ConcurrentArray
 
   static uint64_t msb(uint64_t x)
   {
+#ifdef _WIN64
+    unsigned long index;
+    _BitScanReverse64(&index, x);
+    return index;
+#elif defined(_WIN32)
+    unsigned long index;
+    if (x >> 32) {
+      _BitScanReverse(&index, x >> 32);
+      return index + 32;
+    } else {
+      _BitScanReverse(&index, x);
+      return index;
+    }
+#else
     return UINT64_C(63) - __builtin_clzll(x);
+#endif
   }
   static uint64_t block(uint64_t i)
   {

devices/gl/src/VisGLLibrary.cpp

@@ -31,22 +31,7 @@
 
 #include "VisGLDevice.h"
 #include "anari/backend/LibraryImpl.h"
-
-#ifdef _WIN32
-#ifdef DEVICE_STATIC_DEFINE
-#define DEVICE_INTERFACE
-#else
-#ifdef anari_library_VisGL_EXPORTS
-#define DEVICE_INTERFACE __declspec(dllexport)
-#else
-#define DEVICE_INTERFACE __declspec(dllimport)
-#endif
-#endif
-#elif defined __GNUC__
-#define DEVICE_INTERFACE __attribute__((__visibility__("default")))
-#else
-#define DEVICE_INTERFACE
-#endif
+#include "anari_library_visgl_export.h"
 
 namespace visgl {
 
@@ -82,7 +67,7 @@ const char **VisGLLibrary::getDeviceExtensions(const char * /*deviceType*/)
 
 // Define library entrypoint //////////////////////////////////////////////////
 
-extern "C" DEVICE_INTERFACE ANARI_DEFINE_LIBRARY_ENTRYPOINT(
+extern "C" VISGL_DEVICE_INTERFACE ANARI_DEFINE_LIBRARY_ENTRYPOINT(
     visgl, handle, scb, scbPtr)
 {
   return (ANARILibrary) new visgl::VisGLLibrary(handle, scb, scbPtr);

devices/rtx/VisRTXDevice.cpp

@@ -418,11 +418,11 @@ VisRTXDevice::VisRTXDevice(ANARILibrary l) : helium::BaseDevice(l)
 
 VisRTXDevice::~VisRTXDevice()
 {
-  if (m_state.get() == nullptr)
-    return;
-
   reportMessage(ANARI_SEVERITY_DEBUG, "destroying VisRTX device");
 
+  if (!m_initialized)
+    return;
+
   auto &state = *deviceState();
 
   clearCommitBuffer();

devices/rtx/optix_visrtx.h

@@ -47,6 +47,10 @@
 #include <stdexcept>
 #include <vector>
 
+#ifdef OPAQUE
+#undef OPAQUE
+#endif
+
 constexpr int PAYLOAD_VALUES = 5;
 constexpr int ATTRIBUTE_VALUES = 4;