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

Code cleanup: fix warning and improve terminology.

Browse Source
This commit is contained in:
Brecht Van Lommel
2017-08-11 14:21:34 +02:00
parent a4bcdf5fb1
commit 85ad248c36
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/device/opencl/opencl.h
View File

@@ -543,7 +543,7 @@ protected:
private: private:
MemoryManager memory_manager; MemoryManager memory_manager;
friend MemoryManager; friend class MemoryManager;
struct tex_info_t { struct tex_info_t {
uint buffer, padding; uint buffer, padding;

4
intern/cycles/kernel/kernel_path.h
View File

@@ -356,7 +356,7 @@ ccl_device void kernel_path_indirect(KernelGlobals *kg,
* mainly due to the mixed in MIS that we use. gives too many unneeded * mainly due to the mixed in MIS that we use. gives too many unneeded
* shader evaluations, only need emission if we are going to terminate */ * shader evaluations, only need emission if we are going to terminate */
float probability = float probability =
path_state_terminate_probability(kg, path_state_continuation_probability(kg,
state, state,
throughput*num_samples); throughput*num_samples);
@@ -717,7 +717,7 @@ ccl_device_inline float kernel_path_integrate(KernelGlobals *kg,
/* path termination. this is a strange place to put the termination, it's /* path termination. this is a strange place to put the termination, it's
* mainly due to the mixed in MIS that we use. gives too many unneeded * mainly due to the mixed in MIS that we use. gives too many unneeded
* shader evaluations, only need emission if we are going to terminate */ * shader evaluations, only need emission if we are going to terminate */
float probability = path_state_terminate_probability(kg, &state, throughput); float probability = path_state_continuation_probability(kg, &state, throughput);
if(probability == 0.0f) { if(probability == 0.0f) {
break; break;

2
intern/cycles/kernel/kernel_path_branched.h
View File

@@ -558,7 +558,7 @@ ccl_device float kernel_branched_path_integrate(KernelGlobals *kg,
/* path termination. this is a strange place to put the termination, it's /* path termination. this is a strange place to put the termination, it's
* mainly due to the mixed in MIS that we use. gives too many unneeded * mainly due to the mixed in MIS that we use. gives too many unneeded
* shader evaluations, only need emission if we are going to terminate */ * shader evaluations, only need emission if we are going to terminate */
float probability = path_state_terminate_probability(kg, &state, throughput); float probability = path_state_continuation_probability(kg, &state, throughput);
if(probability == 0.0f) { if(probability == 0.0f) {
break; break;

2
intern/cycles/kernel/kernel_path_state.h
View File

@@ -156,7 +156,7 @@ ccl_device_inline uint path_state_ray_visibility(KernelGlobals *kg, PathState *s
return flag; return flag;
} }
ccl_device_inline float path_state_terminate_probability(KernelGlobals *kg, ccl_addr_space PathState *state, const float3 throughput) ccl_device_inline float path_state_continuation_probability(KernelGlobals *kg, ccl_addr_space PathState *state, const float3 throughput)
{ {
if(state->flag & PATH_RAY_TRANSPARENT) { if(state->flag & PATH_RAY_TRANSPARENT) {
/* Transparent rays are treated separately with own max bounces. */ /* Transparent rays are treated separately with own max bounces. */

8
intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
View File

@@ -224,19 +224,19 @@ ccl_device void kernel_holdout_emission_blurring_pathtermination_ao(
* shader evaluations, only need emission if we are going to terminate. * shader evaluations, only need emission if we are going to terminate.
*/ */
#ifndef __BRANCHED_PATH__ #ifndef __BRANCHED_PATH__
float probability = path_state_terminate_probability(kg, state, throughput); float probability = path_state_continuation_probability(kg, state, throughput);
#else #else
float probability = 1.0f; float probability = 1.0f;
if(!kernel_data.integrator.branched) { if(!kernel_data.integrator.branched) {
probability = path_state_terminate_probability(kg, state, throughput); probability = path_state_continuation_probability(kg, state, throughput);
} }
else if(IS_FLAG(ray_state, ray_index, RAY_BRANCHED_INDIRECT)) { else if(IS_FLAG(ray_state, ray_index, RAY_BRANCHED_INDIRECT)) {
int num_samples = kernel_split_state.branched_state[ray_index].num_samples; int num_samples = kernel_split_state.branched_state[ray_index].num_samples;
probability = path_state_terminate_probability(kg, state, throughput*num_samples); probability = path_state_continuation_probability(kg, state, throughput*num_samples);
} }
else if(state->flag & PATH_RAY_TRANSPARENT) { else if(state->flag & PATH_RAY_TRANSPARENT) {
probability = path_state_terminate_probability(kg, state, throughput); probability = path_state_continuation_probability(kg, state, throughput);
} }
#endif #endif