leesonw/blender-cluster
0
0
Fork 0
forked from blender/blender
Code Pull Requests 2 Activity

Merge latest distributed renderering changes from GHE master-cluster into master-cluster on blender.org #1

Merged
William Leeson merged 13 commits from master-cluster_sync_from_ghe_patch into master-cluster 2023-03-31 17:26:02 +02:00
Conversation 0 Commits 13 Files Changed 77 +13 -7
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b9e05b976b - Show all commits

4
intern/cycles/cluster_rendering/libcluster/denoising/denoising_context.cpp
View File

@ -1,4 +1,6 @@
#include "../cuda_context_provider.h" #ifdef WITH_CUDA
#include "../cuda_context_provider.h"
#endif
#include "denoising_context.h" #include "denoising_context.h"
#include "master_oidn_denoiser.h" #include "master_oidn_denoiser.h"
#ifdef WITH_OPTIX #ifdef WITH_OPTIX

12
intern/cycles/cluster_rendering/libcluster/server_image_buffer.cpp
View File

@ -5,6 +5,7 @@
#include <tbb/parallel_for.h> #include <tbb/parallel_for.h>
#ifdef WITH_CUDA
#ifdef WITH_CUDA_DYNLOAD #ifdef WITH_CUDA_DYNLOAD
#include <cuew.h> #include <cuew.h>
// Do not use CUDA SDK headers when using CUEW // Do not use CUDA SDK headers when using CUEW
@ -14,13 +15,13 @@
#else #else
#include <cuda.h> #include <cuda.h>
#endif #endif
#ifdef WITH_CUDA
#include "compression/nv_decoder.h" #include "compression/nv_decoder.h"
#include "compression/nv_encoder.h" #include "compression/nv_encoder.h"
#endif #endif
#include "compression/turbojpeg_compressor.h" #include "compression/turbojpeg_compressor.h"
#include "cuda_context_provider.h" #ifdef WITH_CUDA
#include "cuda_context_provider.h"
#endif
#include "./utils/timer.h" // for time_dt #include "./utils/timer.h" // for time_dt
#include "denoising/denoising_context.h" #include "denoising/denoising_context.h"
#ifdef WITH_OPTIX #ifdef WITH_OPTIX
@ -28,8 +29,9 @@
#endif #endif
#include "server_image_buffer.h" #include "server_image_buffer.h"
#include "server_image.h" #include "server_image.h"
#ifdef WITH_CUDA
#include "../libcluster_cuda_kernels/gpu_image_utils.h" #include "../libcluster_cuda_kernels/gpu_image_utils.h"
#endif
namespace cgr_libcluster { namespace cgr_libcluster {

2
source/blender/makesrna/intern/rna_scene.c
View File

@ -6280,11 +6280,13 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
0, 0,
"OpenImageDenoise", "OpenImageDenoise",
"Master denoises images with Intel Open Image Denoise"}, "Master denoises images with Intel Open Image Denoise"},
#ifdef WITH_OPTX
{MASTER_DENOISER_OPTIX, {MASTER_DENOISER_OPTIX,
"OPTIX", "OPTIX",
0, 0,
"OptiX", "OptiX",
"Master denoises images with NVIDIA OptiX AI-Accelerated denoiser"}, "Master denoises images with NVIDIA OptiX AI-Accelerated denoiser"},
#endif
{MASTER_DENOISER_BARCELONA, {MASTER_DENOISER_BARCELONA,
"BARCELONA", "BARCELONA",
0, 0,