Skip to content

Update OptiX logging and results getter #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tobre1 merged 5 commits into from
Dec 15, 2025
Merged

Update OptiX logging and results getter #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ac7fa92
Add optix compile log option
tobre1 Dec 11, 2025
ca8b798
Formatting
tobre1 Dec 11, 2025
0ba15c1
Update CPM
tobre1 Dec 11, 2025
ae11e6f
Get result vector
tobre1 Dec 11, 2025
898c45a
Get results seperated
tobre1 Dec 11, 2025
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
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
project(
ViennaRay
LANGUAGES CXX
VERSION 3.8.5)
VERSION 3.9.1)

# --------------------------------------------------------------------------------------------------------
# Library switches
Expand Down Expand Up @@ -98,7 +98,7 @@ include("cmake/cpm.cmake")

CPMAddPackage(
NAME ViennaCore
VERSION 1.7.4
VERSION 1.8.0
GIT_REPOSITORY "https://github.com/ViennaTools/ViennaCore"
OPTIONS "VIENNACORE_USE_GPU ${VIENNARAY_USE_GPU}")

Expand Down
4 changes: 2 additions & 2 deletions cmake/cpm.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#
# SPDX-FileCopyrightText: Copyright (c) 2019-2023 Lars Melchior and contributors

set(CPM_DOWNLOAD_VERSION 0.40.5)
set(CPM_HASH_SUM "c46b876ae3b9f994b4f05a4c15553e0485636862064f1fcc9d8b4f832086bc5d")
set(CPM_DOWNLOAD_VERSION 0.42.0)
set(CPM_HASH_SUM "2020b4fc42dba44817983e06342e682ecfc3d2f484a581f11cc5731fbe4dce8a")

if(CPM_SOURCE_CACHE)
set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
Expand Down
7 changes: 4 additions & 3 deletions gpu/include/raygDiskGeometry.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace viennaray::gpu {

using namespace viennacore;

template <int D> struct DiskGeometry {
struct DiskGeometry {
// geometry
CudaBuffer geometryPointBuffer;
CudaBuffer geometryNormalBuffer;
Expand All @@ -26,6 +26,7 @@ template <int D> struct DiskGeometry {
CudaBuffer asBuffer;

/// build acceleration structure from triangle mesh
template <int D>
void buildAccel(DeviceContext &context, const DiskMesh &mesh,
LaunchParams &launchParams, const bool ignoreBoundary,
float sourceOffset) {
Expand Down Expand Up @@ -99,7 +100,7 @@ template <int D> struct DiskGeometry {
diskInput[0].customPrimitiveArray.sbtIndexOffsetStrideInBytes = 0;

// ------------------------- boundary input -------------------------
auto boundaryMesh = makeBoundary(mesh);
auto boundaryMesh = makeBoundary<D>(mesh);
// upload the model to the device: the builder
boundaryPointBuffer.allocUpload(boundaryMesh.nodes);
boundaryNormalBuffer.allocUpload(boundaryMesh.normals);
Expand Down Expand Up @@ -194,7 +195,7 @@ template <int D> struct DiskGeometry {
launchParams.traversable = asHandle;
}

DiskMesh makeBoundary(const DiskMesh &passedMesh) {
template <int D> DiskMesh makeBoundary(const DiskMesh &passedMesh) {
DiskMesh boundaryMesh;

Vec3Df bbMin = passedMesh.minimumExtent;
Expand Down
Loading