Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Fix a few type casting warnings

Browse Source 
Stumbled over the `integrate_surface_volume_only_bounce` kernel
function not returning the right type. The others too showed up as
warnings when building Cycles as a standalone which didn't have
those warnings disabled.

Differential Revision: https://developer.blender.org/D14558
This commit is contained in:
Patrick Mours
2022-04-05 17:30:01 +02:00
parent f60cffad38
commit e513687288
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/kernel/integrator/shade_surface.h
View File

@@ -346,8 +346,8 @@ ccl_device_forceinline int integrate_surface_bsdf_bssrdf_bounce(
} }
#ifdef __VOLUME__ #ifdef __VOLUME__
ccl_device_forceinline bool integrate_surface_volume_only_bounce(IntegratorState state, ccl_device_forceinline int integrate_surface_volume_only_bounce(IntegratorState state,
ccl_private ShaderData *sd) ccl_private ShaderData *sd)
{ {
if (!path_state_volume_next(state)) { if (!path_state_volume_next(state)) {
return LABEL_NONE; return LABEL_NONE;

2
intern/cycles/scene/geometry.cpp
View File

@@ -180,7 +180,7 @@ bool Geometry::has_true_displacement() const
} }
void Geometry::compute_bvh( void Geometry::compute_bvh(
Device *device, DeviceScene *dscene, SceneParams *params, Progress *progress, int n, int total) Device *device, DeviceScene *dscene, SceneParams *params, Progress *progress, size_t n, size_t total)
{ {
if (progress->get_cancel()) if (progress->get_cancel())
return; return;

4
intern/cycles/scene/geometry.h
View File

@@ -110,8 +110,8 @@ class Geometry : public Node {
DeviceScene *dscene, DeviceScene *dscene,
SceneParams *params, SceneParams *params,
Progress *progress, Progress *progress,
int n, size_t n,
int total); size_t total);
virtual PrimitiveType primitive_type() const = 0; virtual PrimitiveType primitive_type() const = 0;

2
intern/cycles/session/merge.cpp
View File

@@ -531,7 +531,7 @@ static void read_layer_samples(vector<MergeImage> &images,
current_layer_samples.total = 0; current_layer_samples.total = 0;
current_layer_samples.per_pixel.resize(in_spec.width * in_spec.height); current_layer_samples.per_pixel.resize(in_spec.width * in_spec.height);
std::fill( std::fill(
current_layer_samples.per_pixel.begin(), current_layer_samples.per_pixel.end(), 0); current_layer_samples.per_pixel.begin(), current_layer_samples.per_pixel.end(), 0.0f);
} }
if (layer.has_sample_pass) { if (layer.has_sample_pass) {