forked from bartvdbraak/blender
Cleanup: compiler warnings
This commit is contained in:
parent
fd477e738d
commit
b698fe1e04
@ -120,7 +120,7 @@ void PathTraceWorkGPU::alloc_integrator_soa()
|
||||
* TODO: store float3 in separate XYZ arrays. */
|
||||
#define KERNEL_STRUCT_BEGIN(name) for (int array_index = 0;; array_index++) {
|
||||
#define KERNEL_STRUCT_MEMBER(parent_struct, type, name, feature) \
|
||||
if ((kernel_features & feature) && (integrator_state_gpu_.parent_struct.name == nullptr)) { \
|
||||
if ((kernel_features & (feature)) && (integrator_state_gpu_.parent_struct.name == nullptr)) { \
|
||||
device_only_memory<type> *array = new device_only_memory<type>(device_, \
|
||||
"integrator_state_" #name); \
|
||||
array->alloc_to_device(max_num_paths_); \
|
||||
@ -128,7 +128,7 @@ void PathTraceWorkGPU::alloc_integrator_soa()
|
||||
integrator_state_gpu_.parent_struct.name = (type *)array->device_pointer; \
|
||||
}
|
||||
#define KERNEL_STRUCT_ARRAY_MEMBER(parent_struct, type, name, feature) \
|
||||
if ((kernel_features & feature) && \
|
||||
if ((kernel_features & (feature)) && \
|
||||
(integrator_state_gpu_.parent_struct[array_index].name == nullptr)) { \
|
||||
device_only_memory<type> *array = new device_only_memory<type>(device_, \
|
||||
"integrator_state_" #name); \
|
||||
|
@ -270,7 +270,7 @@ void Integrator::tag_update(Scene *scene, uint32_t flag)
|
||||
}
|
||||
}
|
||||
|
||||
uint Integrator::get_kernel_features(const Scene *scene) const
|
||||
uint Integrator::get_kernel_features() const
|
||||
{
|
||||
uint kernel_features = 0;
|
||||
|
||||
|
@ -102,7 +102,7 @@ class Integrator : public Node {
|
||||
|
||||
void tag_update(Scene *scene, uint32_t flag);
|
||||
|
||||
uint get_kernel_features(const Scene *scene) const;
|
||||
uint get_kernel_features() const;
|
||||
|
||||
AdaptiveSampling get_adaptive_sampling() const;
|
||||
DenoiseParams get_denoise_params() const;
|
||||
|
@ -522,7 +522,7 @@ void Scene::update_kernel_features()
|
||||
}
|
||||
|
||||
kernel_features |= film->get_kernel_features(this);
|
||||
kernel_features |= integrator->get_kernel_features(this);
|
||||
kernel_features |= integrator->get_kernel_features();
|
||||
|
||||
dscene.data.kernel_features = kernel_features;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user