[Bf-blender-cvs] [b36ad7a] cycles_kernel_split: Cycles kernel split: Move address space specification to KernelGlobals typedef
Sergey Sharybin
noreply at git.blender.org
Thu May 7 10:41:14 CEST 2015
Commit: b36ad7a3bb7484e31e99a9460275bdbadcb40d97
Author: Sergey Sharybin
Date: Thu May 7 13:39:43 2015 +0500
Branches: cycles_kernel_split
https://developer.blender.org/rBb36ad7a3bb7484e31e99a9460275bdbadcb40d97
Cycles kernel split: Move address space specification to KernelGlobals typedef
This way we don't need to add ccl_addr_space specification all over the kernel
for KernelGlobals.
===================================================================
M intern/cycles/kernel/closure/bsdf.h
M intern/cycles/kernel/closure/bsdf_microfacet.h
M intern/cycles/kernel/geom/geom_attribute.h
M intern/cycles/kernel/geom/geom_bvh.h
M intern/cycles/kernel/geom/geom_bvh_shadow.h
M intern/cycles/kernel/geom/geom_bvh_subsurface.h
M intern/cycles/kernel/geom/geom_bvh_traversal.h
M intern/cycles/kernel/geom/geom_bvh_volume.h
M intern/cycles/kernel/geom/geom_curve.h
M intern/cycles/kernel/geom/geom_motion_curve.h
M intern/cycles/kernel/geom/geom_motion_triangle.h
M intern/cycles/kernel/geom/geom_object.h
M intern/cycles/kernel/geom/geom_primitive.h
M intern/cycles/kernel/geom/geom_qbvh.h
M intern/cycles/kernel/geom/geom_qbvh_traversal.h
M intern/cycles/kernel/geom/geom_triangle.h
M intern/cycles/kernel/geom/geom_triangle_intersect.h
M intern/cycles/kernel/geom/geom_volume.h
M intern/cycles/kernel/kernel_Background_BufferUpdate.cl
M intern/cycles/kernel/kernel_DataInit.cl
M intern/cycles/kernel/kernel_DirectLighting.cl
M intern/cycles/kernel/kernel_Holdout_Emission_Blurring_Pathtermination_AO.cl
M intern/cycles/kernel/kernel_LampEmission.cl
M intern/cycles/kernel/kernel_NextIterationSetUp.cl
M intern/cycles/kernel/kernel_SceneIntersect.cl
M intern/cycles/kernel/kernel_ShaderEval.cl
M intern/cycles/kernel/kernel_ShadowBlocked.cl
M intern/cycles/kernel/kernel_accumulate.h
M intern/cycles/kernel/kernel_camera.h
M intern/cycles/kernel/kernel_debug.h
M intern/cycles/kernel/kernel_emission.h
M intern/cycles/kernel/kernel_globals.h
M intern/cycles/kernel/kernel_light.h
M intern/cycles/kernel/kernel_passes.h
M intern/cycles/kernel/kernel_path.h
M intern/cycles/kernel/kernel_path_state.h
M intern/cycles/kernel/kernel_path_surface.h
M intern/cycles/kernel/kernel_path_volume.h
M intern/cycles/kernel/kernel_projection.h
M intern/cycles/kernel/kernel_random.h
M intern/cycles/kernel/kernel_shader.h
M intern/cycles/kernel/kernel_shadow.h
M intern/cycles/kernel/kernel_subsurface.h
M intern/cycles/kernel/kernel_volume.h
M intern/cycles/kernel/svm/svm.h
M intern/cycles/kernel/svm/svm_attribute.h
M intern/cycles/kernel/svm/svm_blackbody.h
M intern/cycles/kernel/svm/svm_brick.h
M intern/cycles/kernel/svm/svm_camera.h
M intern/cycles/kernel/svm/svm_checker.h
M intern/cycles/kernel/svm/svm_closure.h
M intern/cycles/kernel/svm/svm_displace.h
M intern/cycles/kernel/svm/svm_geometry.h
M intern/cycles/kernel/svm/svm_hsv.h
M intern/cycles/kernel/svm/svm_image.h
M intern/cycles/kernel/svm/svm_magic.h
M intern/cycles/kernel/svm/svm_mapping.h
M intern/cycles/kernel/svm/svm_math.h
M intern/cycles/kernel/svm/svm_mix.h
M intern/cycles/kernel/svm/svm_musgrave.h
M intern/cycles/kernel/svm/svm_noisetex.h
M intern/cycles/kernel/svm/svm_normal.h
M intern/cycles/kernel/svm/svm_ramp.h
M intern/cycles/kernel/svm/svm_sepcomb_hsv.h
M intern/cycles/kernel/svm/svm_sky.h
M intern/cycles/kernel/svm/svm_tex_coord.h
M intern/cycles/kernel/svm/svm_value.h
M intern/cycles/kernel/svm/svm_vector_transform.h
M intern/cycles/kernel/svm/svm_voronoi.h
M intern/cycles/kernel/svm/svm_wave.h
M intern/cycles/kernel/svm/svm_wireframe.h
===================================================================
diff --git a/intern/cycles/kernel/closure/bsdf.h b/intern/cycles/kernel/closure/bsdf.h
index b2556fc..e5aabe7 100644
--- a/intern/cycles/kernel/closure/bsdf.h
+++ b/intern/cycles/kernel/closure/bsdf.h
@@ -35,7 +35,7 @@
CCL_NAMESPACE_BEGIN
-ccl_device int bsdf_sample(ccl_addr_space KernelGlobals *kg, const ccl_addr_space ShaderData *sd, const ccl_addr_space ShaderClosure *sc, float randu, float randv, float3 *eval, float3 *omega_in, differential3 *domega_in, float *pdf)
+ccl_device int bsdf_sample(KernelGlobals *kg, const ccl_addr_space ShaderData *sd, const ccl_addr_space ShaderClosure *sc, float randu, float randv, float3 *eval, float3 *omega_in, differential3 *domega_in, float *pdf)
{
int label;
@@ -130,7 +130,7 @@ ccl_device int bsdf_sample(ccl_addr_space KernelGlobals *kg, const ccl_addr_spac
return label;
}
-ccl_device float3 bsdf_eval(ccl_addr_space KernelGlobals *kg, const ccl_addr_space ShaderData *sd, const ccl_addr_space ShaderClosure *sc, const float3 omega_in, float *pdf)
+ccl_device float3 bsdf_eval(KernelGlobals *kg, const ccl_addr_space ShaderData *sd, const ccl_addr_space ShaderClosure *sc, const float3 omega_in, float *pdf)
{
float3 eval;
@@ -273,7 +273,7 @@ ccl_device float3 bsdf_eval(ccl_addr_space KernelGlobals *kg, const ccl_addr_spa
return eval;
}
-ccl_device void bsdf_blur(ccl_addr_space KernelGlobals *kg, ccl_addr_space ShaderClosure *sc, float roughness)
+ccl_device void bsdf_blur(KernelGlobals *kg, ccl_addr_space ShaderClosure *sc, float roughness)
{
/* ToDo: do we want to blur volume closures? */
diff --git a/intern/cycles/kernel/closure/bsdf_microfacet.h b/intern/cycles/kernel/closure/bsdf_microfacet.h
index 6da62aa..ee4f8ef 100644
--- a/intern/cycles/kernel/closure/bsdf_microfacet.h
+++ b/intern/cycles/kernel/closure/bsdf_microfacet.h
@@ -38,7 +38,7 @@ CCL_NAMESPACE_BEGIN
/* Beckmann and GGX microfacet importance sampling. */
ccl_device_inline void microfacet_beckmann_sample_slopes(
- ccl_addr_space KernelGlobals *kg,
+ KernelGlobals *kg,
const float cos_theta_i, const float sin_theta_i,
float randu, float randv, float *slope_x, float *slope_y,
float *G1i)
@@ -171,7 +171,7 @@ ccl_device_inline void microfacet_ggx_sample_slopes(
}
ccl_device_inline float3 microfacet_sample_stretched(
- ccl_addr_space KernelGlobals *kg, const float3 omega_i,
+ KernelGlobals *kg, const float3 omega_i,
const float alpha_x, const float alpha_y,
const float randu, const float randv,
bool beckmann, float *G1i)
@@ -417,7 +417,7 @@ ccl_device float3 bsdf_microfacet_ggx_eval_transmit(const ccl_addr_space ShaderC
return make_float3(out, out, out);
}
-ccl_device int bsdf_microfacet_ggx_sample(ccl_addr_space KernelGlobals *kg, const ccl_addr_space ShaderClosure *sc, float3 Ng, float3 I, float3 dIdx, float3 dIdy, float randu, float randv, float3 *eval, float3 *omega_in, float3 *domega_in_dx, float3 *domega_in_dy, float *pdf)
+ccl_device int bsdf_microfacet_ggx_sample(KernelGlobals *kg, const ccl_addr_space ShaderClosure *sc, float3 Ng, float3 I, float3 dIdx, float3 dIdy, float randu, float randv, float3 *eval, float3 *omega_in, float3 *domega_in_dx, float3 *domega_in_dy, float *pdf)
{
float alpha_x = sc->data0;
float alpha_y = sc->data1;
@@ -769,7 +769,7 @@ ccl_device float3 bsdf_microfacet_beckmann_eval_transmit(const ccl_addr_space Sh
return make_float3(out, out, out);
}
-ccl_device int bsdf_microfacet_beckmann_sample(ccl_addr_space KernelGlobals *kg, const ccl_addr_space ShaderClosure *sc, float3 Ng, float3 I, float3 dIdx, float3 dIdy, float randu, float randv, float3 *eval, float3 *omega_in, float3 *domega_in_dx, float3 *domega_in_dy, float *pdf)
+ccl_device int bsdf_microfacet_beckmann_sample(KernelGlobals *kg, const ccl_addr_space ShaderClosure *sc, float3 Ng, float3 I, float3 dIdx, float3 dIdy, float randu, float randv, float3 *eval, float3 *omega_in, float3 *domega_in_dx, float3 *domega_in_dy, float *pdf)
{
float alpha_x = sc->data0;
float alpha_y = sc->data1;
diff --git a/intern/cycles/kernel/geom/geom_attribute.h b/intern/cycles/kernel/geom/geom_attribute.h
index e6f9770..b111c23 100644
--- a/intern/cycles/kernel/geom/geom_attribute.h
+++ b/intern/cycles/kernel/geom/geom_attribute.h
@@ -27,7 +27,7 @@ CCL_NAMESPACE_BEGIN
/* Find attribute based on ID */
-ccl_device_inline int find_attribute(ccl_addr_space KernelGlobals *kg, const ccl_addr_space ShaderData *sd, uint id, AttributeElement *elem)
+ccl_device_inline int find_attribute(KernelGlobals *kg, const ccl_addr_space ShaderData *sd, uint id, AttributeElement *elem)
{
if(sd_fetch(object) == PRIM_NONE)
return (int)ATTR_STD_NOT_FOUND;
@@ -57,7 +57,7 @@ ccl_device_inline int find_attribute(ccl_addr_space KernelGlobals *kg, const ccl
}
/* Transform matrix attribute on meshes */
-ccl_device Transform primitive_attribute_matrix(ccl_addr_space KernelGlobals *kg, const ShaderData *sd, int offset)
+ccl_device Transform primitive_attribute_matrix(KernelGlobals *kg, const ShaderData *sd, int offset)
{
Transform tfm;
diff --git a/intern/cycles/kernel/geom/geom_bvh.h b/intern/cycles/kernel/geom/geom_bvh.h
index 0fa0172..a15b7a8 100644
--- a/intern/cycles/kernel/geom/geom_bvh.h
+++ b/intern/cycles/kernel/geom/geom_bvh.h
@@ -216,7 +216,7 @@ CCL_NAMESPACE_BEGIN
#undef BVH_NAME_EVAL
#undef BVH_FUNCTION_FULL_NAME
-ccl_device_intersect bool scene_intersect(ccl_addr_space KernelGlobals *kg, const Ray *ray, const uint visibility, ccl_addr_space Intersection *isect,
+ccl_device_intersect bool scene_intersect(KernelGlobals *kg, const Ray *ray, const uint visibility, ccl_addr_space Intersection *isect,
uint *lcg_state, float difl, float extmax)
{
#ifdef __OBJECT_MOTION__
@@ -255,7 +255,7 @@ ccl_device_intersect bool scene_intersect(ccl_addr_space KernelGlobals *kg, cons
}
#ifdef __SUBSURFACE__
-ccl_device_intersect uint scene_intersect_subsurface(ccl_addr_space KernelGlobals *kg, const Ray *ray, Intersection *isect, int subsurface_object, uint *lcg_state, int max_hits)
+ccl_device_intersect uint scene_intersect_subsurface(KernelGlobals *kg, const Ray *ray, Intersection *isect, int subsurface_object, uint *lcg_state, int max_hits)
{
#ifdef __OBJECT_MOTION__
if(kernel_data.bvh.have_motion) {
@@ -294,7 +294,7 @@ ccl_device_intersect uint scene_intersect_subsurface(ccl_addr_space KernelGlobal
#endif
#ifdef __SHADOW_RECORD_ALL__
-ccl_device_intersect bool scene_intersect_shadow_all(ccl_addr_space KernelGlobals *kg, const Ray *ray, Intersection *isect, uint max_hits, uint *num_hits)
+ccl_device_intersect bool scene_intersect_shadow_all(KernelGlobals *kg, const Ray *ray, Intersection *isect, uint max_hits, uint *num_hits)
{
#ifdef __OBJECT_MOTION__
if(kernel_data.bvh.have_motion) {
@@ -322,7 +322,7 @@ ccl_device_intersect bool scene_intersect_shadow_all(ccl_addr_space KernelGlobal
#endif
#ifdef __VOLUME__
-ccl_device_intersect bool scene_intersect_volume(ccl_addr_space KernelGlobals *kg,
+ccl_device_intersect bool scene_intersect_volume(KernelGlobals *kg,
const Ray *ray,
Intersection *isect)
{
diff --git a/intern/cycles/kernel/geom/geom_bvh_shadow.h b/intern/cycles/kernel/geom/geom_bvh_shadow.h
index 54b1f35..e4cba99 100644
--- a/intern/cycles/kernel/geom/geom_bvh_shadow.h
+++ b/intern/cycles/kernel/geom/geom_bvh_shadow.h
@@ -31,7 +31,7 @@
*
*/
-ccl_device bool BVH_FUNCTION_FULL_NAME(BVH)(ccl_addr_space KernelGlobals *kg,
+ccl_device bool BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
const Ray *ray,
Intersection *isect_array,
const uint max_hits,
@@ -382,7 +382,7 @@ ccl_device bool BVH_FUNCTION_FULL_NAME(BVH)(ccl_addr_space KernelGlobals *kg,
return false;
}
-ccl_device_inline bool BVH_FUNCTION_NAME(ccl_addr_space KernelGlobals *kg,
+ccl_device_inline bool BVH_FUNCTION_NAME(KernelGlobals *kg,
const Ray *ray,
Intersection *isect_array,
const uint max_hits,
diff --git a/intern/cycles/kernel/geom/geom_bvh_subsurface.h b/intern/cycles/kernel/geom/geom_bvh_subsurface.h
index 0862984..a73139f 100644
--- a/intern/cycles/kernel/geom/geom_bvh_subsurface.h
+++ b/intern/cycles/kernel/geom/geom_bvh_subsurface.h
@@ -30,7 +30,7 @@
*
*/
-ccl_device uint BVH_FUNCTION_FULL_NAME(BVH)(ccl_addr_space KernelGlobals *kg,
+ccl_device uint BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
const Ray *ray,
Intersection *isect_array,
int subsurface_object,
@@ -305,7 +305,7 @@ ccl_device uint BVH_FUNCTION_FULL_NAME(BVH)(ccl_addr_space KernelGlobals *kg,
return num_hits;
}
-ccl_device_inline uint BVH_FUNCTION_NAME(ccl_addr_space KernelGlobals *kg,
+ccl_device_inline uint BVH_FUNCTION_NAME(KernelGlobals *kg,
const Ray *ray,
Intersection *isect_array,
int subsurface_object,
diff --git a/intern/cycles/kernel/geom/geom_bvh_traversal.h b/intern/cycles/kernel/geom/geom_bvh_traversal.h
index 63d88ac..bc2483e 100644
--- a/intern/cycles/kernel/geom/geom_bvh_traversal.h
+++ b/intern/cycles/kernel/geom/geom_bvh_traversal.h
@@ -32,7 +32,7 @@
*
*/
-ccl_device bool BVH_FUNCTION_FULL_NAME(BVH)(ccl_addr_space KernelGlobals *kg,
+ccl_device bool BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
const Ray *ray,
ccl_addr_space Intersection *isect,
const uint visibility
@@ -399,7 +399,7 @@ ccl_device bool BVH_FUNCTION_FULL_NAME(BVH)(ccl_addr_space KernelGlobals *kg,
return (isect->prim != PRIM_NONE);
}
-ccl_device_inline bool BVH_FUNCTION_NAME(ccl_addr_space KernelGlobals *kg,
+ccl_device_inline bool BVH_FUNCTION_NAME(KernelGlobals *kg,
const Ray *ray,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list