blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Cleanup: make format

This commit is contained in:
Jacques Lucke 2022-05-24 15:53:02 +02:00
parent cd412b4454
commit 25d216724b
4 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/kernel/device/cpu/image.h
View File

@ -818,11 +818,13 @@ ccl_device float4 kernel_tex_image_interp_3d(KernelGlobals kg,
case IMAGE_DATA_TYPE_NANOVDB_FLOAT3:
return NanoVDBInterpolator<nanovdb::Vec3f>::interp_3d(info, P.x, P.y, P.z, interp);
case IMAGE_DATA_TYPE_NANOVDB_FPN: {
const float f = NanoVDBInterpolator<nanovdb::FpN, float>::interp_3d(info, P.x, P.y, P.z, interp);
const float f = NanoVDBInterpolator<nanovdb::FpN, float>::interp_3d(
info, P.x, P.y, P.z, interp);
return make_float4(f, f, f, 1.0f);
}
case IMAGE_DATA_TYPE_NANOVDB_FP16: {
const float f = NanoVDBInterpolator<nanovdb::Fp16, float>::interp_3d(info, P.x, P.y, P.z, interp);
const float f = NanoVDBInterpolator<nanovdb::Fp16, float>::interp_3d(
info, P.x, P.y, P.z, interp);
return make_float4(f, f, f, 1.0f);
}
#endif

12
source/blender/draw/engines/eevee/shaders/shadow_vert.glsl
View File

@ -72,13 +72,13 @@ int g_curves_attr_id = 0;
* based on the attribute scope (point or spline). */
int curves_attribute_element_id()
{
int id = hairStrandID;
if (drw_curves.is_point_attribute[g_curves_attr_id] != 0) {
id = hair_get_base_id();
}
int id = hairStrandID;
if (drw_curves.is_point_attribute[g_curves_attr_id] != 0) {
id = hair_get_base_id();
}
g_curves_attr_id += 1;
return id;
g_curves_attr_id += 1;
return id;
}
vec4 attr_load_tangent(samplerBuffer cd_buf)

12
source/blender/draw/engines/eevee/shaders/surface_vert.glsl
View File

@ -79,13 +79,13 @@ int g_curves_attr_id = 0;
* based on the attribute scope (point or spline). */
int curves_attribute_element_id()
{
int id = hairStrandID;
if (drw_curves.is_point_attribute[g_curves_attr_id] != 0) {
id = hair_get_base_id();
}
int id = hairStrandID;
if (drw_curves.is_point_attribute[g_curves_attr_id] != 0) {
id = hair_get_base_id();
}
g_curves_attr_id += 1;
return id;
g_curves_attr_id += 1;
return id;
}
vec4 attr_load_tangent(samplerBuffer cd_buf)

12
source/blender/draw/engines/eevee_next/shaders/eevee_attributes_lib.glsl
View File

@ -130,13 +130,13 @@ int g_curves_attr_id = 0;
* based on the attribute scope (point or spline). */
int curves_attribute_element_id()
{
int id = interp.curves_strand_id;
if (drw_curves.is_point_attribute[g_curves_attr_id] != 0) {
id = hair_get_base_id();
}
int id = interp.curves_strand_id;
if (drw_curves.is_point_attribute[g_curves_attr_id] != 0) {
id = hair_get_base_id();
}
g_curves_attr_id += 1;
return id;
g_curves_attr_id += 1;
return id;
}
vec4 attr_load_tangent(samplerBuffer cd_buf)