Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit b9b7753

Browse files
committedJul 9, 2023
Replace GLM with tcnn's vector math, bugfixes and extra bindings
1 parent 8ff8075 commit b9b7753

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+2023
-2319
lines changed
 

‎.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,3 @@
2828
[submodule "dependencies/OpenXR-SDK"]
2929
path = dependencies/OpenXR-SDK
3030
url = https://github.com/KhronosGroup/OpenXR-SDK.git
31-
[submodule "dependencies/glm"]
32-
path = dependencies/glm
33-
url = https://github.com/g-truc/glm

‎CMakeLists.txt

+4-6
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ if (MSVC)
5454
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_CRT_SECURE_NO_WARNINGS")
5555
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP24")
5656
else()
57-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fms-extensions")
5857
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
5958
endif()
6059

@@ -76,7 +75,6 @@ if (MSVC)
7675
else()
7776
list(APPEND CUDA_NVCC_FLAGS "-Xcompiler=-Wno-float-conversion")
7877
list(APPEND CUDA_NVCC_FLAGS "-Xcompiler=-fno-strict-aliasing")
79-
list(APPEND CUDA_NVCC_FLAGS "-Xcompiler=-fms-extensions")
8078
list(APPEND CUDA_NVCC_FLAGS "-Xcompiler=-fPIC")
8179
endif()
8280
list(APPEND CUDA_NVCC_FLAGS "--extended-lambda")
@@ -203,7 +201,6 @@ endif(NGP_BUILD_WITH_GUI)
203201
list(APPEND NGP_INCLUDE_DIRECTORIES
204202
"dependencies"
205203
"dependencies/filesystem"
206-
"dependencies/glm"
207204
"dependencies/nanovdb"
208205
"dependencies/NaturalSort"
209206
"dependencies/tinylogger"
@@ -261,8 +258,7 @@ endif()
261258
list(APPEND NGP_SOURCES
262259
${GUI_SOURCES}
263260
src/camera_path.cu
264-
src/common.cu
265-
src/common_device.cu
261+
src/common_host.cu
266262
src/marching_cubes.cu
267263
src/nerf_loader.cu
268264
src/render_buffer.cu
@@ -273,7 +269,7 @@ list(APPEND NGP_SOURCES
273269
src/testbed_volume.cu
274270
src/thread_pool.cpp
275271
src/tinyexr_wrapper.cu
276-
src/tinyobj_loader_wrapper.cpp
272+
src/tinyobj_loader_wrapper.cu
277273
src/triangle_bvh.cu
278274
)
279275

@@ -284,6 +280,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_BINARY_DIR})
284280
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR})
285281

286282
get_filename_component(CUDA_COMPILER_BIN "${CMAKE_CUDA_COMPILER}" DIRECTORY)
283+
get_filename_component(CUDA_DIR "${CUDA_COMPILER_BIN}" DIRECTORY)
284+
set(CUDA_INCLUDE "${CUDA_DIR}/include")
287285

288286
if (NGP_OPTIX)
289287
add_library(optix_program OBJECT

0 commit comments

Comments
 (0)
Please sign in to comment.