Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 14 additions & 28 deletions CSGOptiX/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ set(name CSGOptiX)
find_package(OptiX 7 REQUIRED)

set(SOURCES)
set(OPTIX_SOURCES)
set(OPTIX_PTX_SRC CSGOptiX7.cu)
set(OPTIX_PTX_TARGET CSGOptiX7_ptx)


list(APPEND SOURCES
Expand All @@ -25,33 +26,18 @@ list(APPEND HEADERS
CSGOPTIX_LOG.hh
)

list(APPEND OPTIX_SOURCES
CSGOptiX7.cu
Check.cu
)


message(STATUS "OPTIX_SOURCES : ${OPTIX_SOURCES} ")

set(_generated_PTX_files "")

foreach(cu_src IN LISTS OPTIX_SOURCES)
message(STATUS "Processing ${cu_src}")
add_library(${cu_src} OBJECT ${cu_src})
set_target_properties(${cu_src} PROPERTIES CUDA_PTX_COMPILATION ON)
target_include_directories(${cu_src} PUBLIC
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/CSG>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/sysrap>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/qudarap>)
target_compile_definitions(${cu_src} PUBLIC WITH_PRD WITH_SIMULATE WITH_SIMTRACE WITH_RENDER
OPTICKS_CSGOPTIX WITH_THRUST OPTICKS_CSG WITH_CONTIGUOUS WITH_S_BB CONFIG_Debug OPTICKS_SYSRAP WITH_CHILD
PLOG_LOCAL RNG_PHILOX DEBUG_TAG DEBUG_PIDX DEBUG_PIDXYZ OPTICKS_OKCONF OPTICKS_QUDARAP NVCC)
target_link_libraries(${cu_src} PUBLIC OptiX::OptiX)

list(APPEND _generated_PTX_files "${cu_src}.ptx")
endforeach()
add_library(${OPTIX_PTX_TARGET} OBJECT ${OPTIX_PTX_SRC})
set_target_properties(${OPTIX_PTX_TARGET} PROPERTIES CUDA_PTX_COMPILATION ON)
target_include_directories(${OPTIX_PTX_TARGET} PUBLIC
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/CSG>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/sysrap>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/qudarap>)
target_compile_definitions(${OPTIX_PTX_TARGET} PUBLIC WITH_PRD WITH_SIMULATE WITH_SIMTRACE WITH_RENDER
OPTICKS_CSGOPTIX WITH_THRUST OPTICKS_CSG WITH_CONTIGUOUS WITH_S_BB CONFIG_Debug OPTICKS_SYSRAP WITH_CHILD
PLOG_LOCAL RNG_PHILOX DEBUG_TAG DEBUG_PIDX DEBUG_PIDXYZ OPTICKS_OKCONF OPTICKS_QUDARAP NVCC)
target_link_libraries(${OPTIX_PTX_TARGET} PUBLIC OptiX::OptiX)

message(STATUS "_generated_PTX_files ${_generated_PTX_files}")
message(STATUS "Configured PTX build for ${OPTIX_PTX_SRC}")

add_library( ${name} SHARED ${SOURCES} ${HEADERS} )

Expand Down Expand Up @@ -84,7 +70,7 @@ target_include_directories( ${name} PUBLIC

target_link_libraries(${name} PUBLIC OptiX::OptiX CSG QUDARap SysRap gphox)

install(FILES $<TARGET_OBJECTS:CSGOptiX7.cu> DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(FILES $<TARGET_OBJECTS:${OPTIX_PTX_TARGET}> DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${name})

install(TARGETS ${name}
Expand Down
39 changes: 0 additions & 39 deletions CSGOptiX/Check.cu

This file was deleted.

2 changes: 0 additions & 2 deletions sysrap/SGLFW_Evt.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ and event rendering here.
./sysrap/tests/SGLFW_SOPTIX_Scene_test.cc
./sysrap/tests/SGLFW_Evt_test.cc
./sysrap/tests/SGLFW_Evt_test.sh
./sysrap/tests/tests.txt
./sysrap/SGLFW_Evt.h


Expand Down Expand Up @@ -128,4 +127,3 @@ inline std::string SGLFW_Evt::desc() const
return str ;
}


20 changes: 3 additions & 17 deletions sysrap/SOPTIX.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SOPTIX.rst : triangulated machinery
Overview
----------

The SOPTIX,SCUDA,SMesh,SGLFW structs were developed to learn how to
The SOPTIX, SCUDA, SMesh, SGLFW structs were developed to learn how to
implement a triangulated geometry workflow with the NVIDIA OptiX 7+ API
and also to implement interactive OpenGL rendering of the triangulated geometry.

Expand Down Expand Up @@ -60,28 +60,18 @@ tests
SGLFW_SOPTIX_Scene_test.{sh,cc}
interactive raytrace visualization of triangulated geometry::

~/o/sysrap/tests/SGLFW_SOPTIX_Scene_test.sh

sysrap/tests/SGLFW_SOPTIX_Scene_test.sh

SOPTIX_Scene_test.{sh,cc} SOPTIX_Scene_Encapsulated_test.cc
ppm non-interactive raytrace render of triangulated geometry
both non-encapsulated and encapsulated versions can be built
and run with the script::
~/o/sysrap/tests/SOPTIX_Scene_test.sh



SOPTIX_Module_test.{sh,cc}
TODO: CHECK
sysrap/tests/SOPTIX_Scene_test.sh

SOPTIX_Options_test.{sh,cc}
TODO: CHECK

SOPTIX_Pipeline_test.{sh,cc}
TODO: CHECK



SOPTIX_SBT::initHitgroup
---------------------------
Expand All @@ -99,7 +89,3 @@ Need nested loop like CSGOptiX/SBT.cc SBT::createHitgroup::
sub-SMesh

So need access to scene data to form the SBT




37 changes: 0 additions & 37 deletions sysrap/tests/SOPTIX_Module_test.cc

This file was deleted.

50 changes: 0 additions & 50 deletions sysrap/tests/SOPTIX_Module_test.sh

This file was deleted.

39 changes: 0 additions & 39 deletions sysrap/tests/SOPTIX_Pipeline_test.cc

This file was deleted.

50 changes: 0 additions & 50 deletions sysrap/tests/SOPTIX_Pipeline_test.sh

This file was deleted.

Loading
Loading