ilusha/pbrt-v4
1
0
Fork 0
mirror of https://github.com/mmp/pbrt-v4 synced 2026-09-26 16:20:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

Merge pull request #521 from gonsolo/noseven

Browse source 
Three more occurrences of OPTIX7.
This commit is contained in:
Matt Pharr 2025-12-08 14:30:32 -08:00 • committed by GitHub
commit 8c19f30455
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/ci-gpu.yml vendored
View file

@ -77,13 +77,13 @@ jobs:
if: ${{ matrix.os == 'windows-latest' }} if: ${{ matrix.os == 'windows-latest' }}
run: | run: |
cd build cd build
cmake .. -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT"/scripts/buildsystems/vcpkg.cmake -DPBRT_USE_PREGENERATED_RGB_TO_SPECTRUM_TABLES=True -DPBRT_OPTIX7_PATH=../optix/${{ matrix.optix }} -DPBRT_GPU_SHADER_MODEL=sm_80 cmake .. -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT"/scripts/buildsystems/vcpkg.cmake -DPBRT_USE_PREGENERATED_RGB_TO_SPECTRUM_TABLES=True -DPBRT_OPTIX_PATH=../optix/${{ matrix.optix }} -DPBRT_GPU_SHADER_MODEL=sm_80
- name: Configure (Linux) - name: Configure (Linux)
if: ${{ matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-24.04' }} if: ${{ matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-24.04' }}
run: | run: |
cd build cd build
cmake .. -DPBRT_USE_PREGENERATED_RGB_TO_SPECTRUM_TABLES=True -DPBRT_OPTIX7_PATH=../optix/${{ matrix.optix }} -DPBRT_GPU_SHADER_MODEL=sm_80 cmake .. -DPBRT_USE_PREGENERATED_RGB_TO_SPECTRUM_TABLES=True -DPBRT_OPTIX_PATH=../optix/${{ matrix.optix }} -DPBRT_GPU_SHADER_MODEL=sm_80
- name: Build - name: Build
# We need to limit the number of jobs so that it doesn't OOM # We need to limit the number of jobs so that it doesn't OOM

2
README.md
View file

@ -206,7 +206,7 @@ later. Both Linux and Windows are supported.
The build scripts automatically attempt to find a CUDA compiler, looking in The build scripts automatically attempt to find a CUDA compiler, looking in
the usual places; the cmake output will indicate whether it was successful. the usual places; the cmake output will indicate whether it was successful.
It is necessary to manually set the cmake `PBRT_OPTIX7_PATH` configuration It is necessary to manually set the cmake `PBRT_OPTIX_PATH` configuration
option to point at an OptiX installation. By default, the GPU shader model option to point at an OptiX installation. By default, the GPU shader model
that pbrt targets is set automatically based on the GPU in the system. that pbrt targets is set automatically based on the GPU in the system.
Alternatively, the `PBRT_GPU_SHADER_MODEL` option can be set manually Alternatively, the `PBRT_GPU_SHADER_MODEL` option can be set manually