diff options
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/device/queue.h | 2 | ||||
-rw-r--r-- | intern/cycles/integrator/path_trace_work_cpu.h | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/integrator/guiding.h | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/integrator/state_template.h | 12 | ||||
-rw-r--r-- | intern/cycles/kernel/integrator/volume_shader.h | 4 | ||||
-rw-r--r-- | intern/ghost/GHOST_C-api.h | 2 | ||||
-rw-r--r-- | intern/ghost/GHOST_ISystem.h | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_System.h | 4 |
8 files changed, 16 insertions, 16 deletions
diff --git a/intern/cycles/device/queue.h b/intern/cycles/device/queue.h index e9a7a9d8701..1d6a8d736b7 100644 --- a/intern/cycles/device/queue.h +++ b/intern/cycles/device/queue.h @@ -174,7 +174,7 @@ class DeviceQueue { /* Accumulated execution time for combinations of kernels launched together. */ map<DeviceKernelMask, double> stats_kernel_time_; /* If it is true, then a performance statistics in the debugging logs will have focus on kernels - * and an explicitqueue synchronization will be added after each kernel execution. */ + * and an explicit queue synchronization will be added after each kernel execution. */ bool is_per_kernel_performance_; }; diff --git a/intern/cycles/integrator/path_trace_work_cpu.h b/intern/cycles/integrator/path_trace_work_cpu.h index 7adb00b4d9d..e50ba8721d9 100644 --- a/intern/cycles/integrator/path_trace_work_cpu.h +++ b/intern/cycles/integrator/path_trace_work_cpu.h @@ -52,9 +52,9 @@ class PathTraceWorkCPU : public PathTraceWork { virtual void cryptomatte_postproces() override; #ifdef WITH_PATH_GUIDING - /* Intializes the per-thread guiding kernel data. The function sets the pointers to the + /* Initializes the per-thread guiding kernel data. The function sets the pointers to the * global guiding field and the sample data storage as well es initializes the per-thread - * guided sampling distrubtions (e.g., SurfaceSamplingDistribution and + * guided sampling distributions (e.g., SurfaceSamplingDistribution and * VolumeSamplingDistribution). */ void guiding_init_kernel_globals(void *guiding_field, void *sample_data_storage, diff --git a/intern/cycles/kernel/integrator/guiding.h b/intern/cycles/kernel/integrator/guiding.h index 5d09e5ceac4..5904b69b046 100644 --- a/intern/cycles/kernel/integrator/guiding.h +++ b/intern/cycles/kernel/integrator/guiding.h @@ -298,7 +298,7 @@ ccl_device_forceinline void guiding_record_volume_emission(KernelGlobals kg, /* Adds a pseudo path vertex/segment when intersecting a virtual light source. * (e.g., area, sphere, or disk light). This call is often followed * a call of guiding_record_surface_emission, if the intersected light source - * emits light in the direction of tha path. */ + * emits light in the direction of the path. */ ccl_device_forceinline void guiding_record_light_surface_segment( KernelGlobals kg, IntegratorState state, ccl_private const Intersection *ccl_restrict isect) { diff --git a/intern/cycles/kernel/integrator/state_template.h b/intern/cycles/kernel/integrator/state_template.h index 760c2f80521..610621f0abe 100644 --- a/intern/cycles/kernel/integrator/state_template.h +++ b/intern/cycles/kernel/integrator/state_template.h @@ -47,8 +47,8 @@ KERNEL_STRUCT_MEMBER(path, float, min_ray_pdf, KERNEL_FEATURE_PATH_TRACING) KERNEL_STRUCT_MEMBER(path, float, continuation_probability, KERNEL_FEATURE_PATH_TRACING) /* Throughput. */ KERNEL_STRUCT_MEMBER(path, PackedSpectrum, throughput, KERNEL_FEATURE_PATH_TRACING) -/* Factor to multiple with throughput to get remove any guiding pdfs. - * Such throughput without guiding pdfs is used for Russian rouletter termination. */ +/* Factor to multiple with throughput to get remove any guiding PDFS. + * Such throughput without guiding PDFS is used for Russian roulette termination. */ KERNEL_STRUCT_MEMBER(path, float, unguided_throughput, KERNEL_FEATURE_PATH_GUIDING) /* Ratio of throughput to distinguish diffuse / glossy / transmission render passes. */ KERNEL_STRUCT_MEMBER(path, PackedSpectrum, pass_diffuse_weight, KERNEL_FEATURE_LIGHT_PASSES) @@ -117,17 +117,17 @@ KERNEL_STRUCT_MEMBER(guiding, uint64_t, path_segment, KERNEL_FEATURE_PATH_GUIDIN /* If surface guiding is enabled */ KERNEL_STRUCT_MEMBER(guiding, bool, use_surface_guiding, KERNEL_FEATURE_PATH_GUIDING) /* Random number used for additional guiding decisions (e.g., cache query, selection to use guiding - * or bsdf sampling) */ + * or BSDF sampling) */ KERNEL_STRUCT_MEMBER(guiding, float, sample_surface_guiding_rand, KERNEL_FEATURE_PATH_GUIDING) /* The probability to use surface guiding (i.e., diffuse sampling prob * guiding prob)*/ KERNEL_STRUCT_MEMBER(guiding, float, surface_guiding_sampling_prob, KERNEL_FEATURE_PATH_GUIDING) -/* Probability of sampling a bssrdf closure instead of a bsdf closure*/ +/* Probability of sampling a BSSRDF closure instead of a BSDF closure*/ KERNEL_STRUCT_MEMBER(guiding, float, bssrdf_sampling_prob, KERNEL_FEATURE_PATH_GUIDING) /* If volume guiding is enabled */ KERNEL_STRUCT_MEMBER(guiding, bool, use_volume_guiding, KERNEL_FEATURE_PATH_GUIDING) /* Random number used for additional guiding decisions (e.g., cache query, selection to use guiding - * or bsdf sampling) */ + * or BSDF sampling) */ KERNEL_STRUCT_MEMBER(guiding, float, sample_volume_guiding_rand, KERNEL_FEATURE_PATH_GUIDING) -/* The probability to use surface guiding (i.e., diffuse sampling prob * guiding prob)*/ +/* The probability to use surface guiding (i.e., diffuse sampling prob * guiding prob). */ KERNEL_STRUCT_MEMBER(guiding, float, volume_guiding_sampling_prob, KERNEL_FEATURE_PATH_GUIDING) KERNEL_STRUCT_END(guiding) diff --git a/intern/cycles/kernel/integrator/volume_shader.h b/intern/cycles/kernel/integrator/volume_shader.h index d3cfa58db96..0ff968723a1 100644 --- a/intern/cycles/kernel/integrator/volume_shader.h +++ b/intern/cycles/kernel/integrator/volume_shader.h @@ -111,8 +111,8 @@ ccl_device_inline void volume_shader_prepare_guiding(KernelGlobals kg, const float volume_guiding_probability = kernel_data.integrator.volume_guiding_probability; float rand_phase_guiding = path_state_rng_1D(kg, rng_state, PRNG_VOLUME_PHASE_GUIDING); - /* If we have more than one ohase function we select one random based on its - * sample weight to caclulate the product distribution for guiding. */ + /* If we have more than one phase function we select one random based on its + * sample weight to calculate the product distribution for guiding. */ int phase_id = 0; float phase_weight = 1.0f; diff --git a/intern/ghost/GHOST_C-api.h b/intern/ghost/GHOST_C-api.h index 9da7d314052..c9d18be750d 100644 --- a/intern/ghost/GHOST_C-api.h +++ b/intern/ghost/GHOST_C-api.h @@ -741,7 +741,7 @@ extern unsigned int GHOST_GetContextDefaultOpenGLFramebuffer(GHOST_ContextHandle extern unsigned int GHOST_GetDefaultOpenGLFramebuffer(GHOST_WindowHandle windowhandle); /** - * Use multitouch gestures if supported. + * Use multi-touch gestures if supported. * \param systemhandle: The handle to the system. * \param use: Enable or disable. */ diff --git a/intern/ghost/GHOST_ISystem.h b/intern/ghost/GHOST_ISystem.h index 05ed089809a..0bf540bd4b6 100644 --- a/intern/ghost/GHOST_ISystem.h +++ b/intern/ghost/GHOST_ISystem.h @@ -422,7 +422,7 @@ class GHOST_ISystem { virtual GHOST_TSuccess getButtonState(GHOST_TButton mask, bool &isDown) const = 0; /** - * Enable multitouch gestures if supported. + * Enable multi-touch gestures if supported. * \param use: Enable or disable. */ virtual void setMultitouchGestures(const bool use) = 0; diff --git a/intern/ghost/intern/GHOST_System.h b/intern/ghost/intern/GHOST_System.h index 7a22e2aa259..810f828a8a1 100644 --- a/intern/ghost/intern/GHOST_System.h +++ b/intern/ghost/intern/GHOST_System.h @@ -240,7 +240,7 @@ class GHOST_System : public GHOST_ISystem { GHOST_TSuccess getButtonState(GHOST_TButton mask, bool &isDown) const; /** - * Enable multitouch gestures if supported. + * Enable multi-touch gestures if supported. * \param use: Enable or disable. */ void setMultitouchGestures(const bool use); @@ -408,7 +408,7 @@ class GHOST_System : public GHOST_ISystem { /** Settings of the display before the display went full-screen. */ GHOST_DisplaySetting m_preFullScreenSetting; - /* Use multitouch gestures? */ + /* Use multi-touch gestures? */ bool m_multitouchGestures; /** Which tablet API to use. */ |