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
3 changed files with 13 additions and 7 deletions
Showing only changes of commit b9e05b976b - Show all commits

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 "master_oidn_denoiser.h"
#ifdef WITH_OPTIX

View File

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

View File

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