griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Fix spelling in EEVEE

Browse Source 
_No response_

Pull Request: https://projects.blender.org/blender/blender/pulls/123355
This commit is contained in:
Jeroen Bakker
2024-06-18 10:57:03 +02:00
parent c525c0354f
commit d13682efa8
8 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/draw/engines/eevee_next/eevee_shader.cc
View File

@@ -385,7 +385,7 @@ class SamplerSlots {
}
};
void ShaderModule::material_create_info_ammend(GPUMaterial *gpumat, GPUCodegenOutput *codegen_)
void ShaderModule::material_create_info_amend(GPUMaterial *gpumat, GPUCodegenOutput *codegen_)
{
using namespace blender::gpu::shader;
@@ -842,7 +842,7 @@ void ShaderModule::material_create_info_ammend(GPUMaterial *gpumat, GPUCodegenOu
* thread unsafe manner. */
static void codegen_callback(void *thunk, GPUMaterial *mat, GPUCodegenOutput *codegen)
{
reinterpret_cast<ShaderModule *>(thunk)->material_create_info_ammend(mat, codegen);
reinterpret_cast<ShaderModule *>(thunk)->material_create_info_amend(mat, codegen);
}
static GPUPass *pass_replacement_cb(void *thunk, GPUMaterial *mat)

2
source/blender/draw/engines/eevee_next/eevee_shader.hh
View File

@@ -186,7 +186,7 @@ class ShaderModule {
eMaterialPipeline pipeline_type,
eMaterialGeometry geometry_type);
void material_create_info_ammend(GPUMaterial *mat, GPUCodegenOutput *codegen);
void material_create_info_amend(GPUMaterial *mat, GPUCodegenOutput *codegen);
/** Only to be used by Instance constructor. */
static ShaderModule *module_get();

8
source/blender/draw/engines/eevee_next/shaders/eevee_depth_of_field_accumulator_lib.glsl
View File

@@ -113,7 +113,7 @@ float dof_gather_accum_weight(float coc, float bordering_radius, bool first_ring
return saturate(coc - bordering_radius);
}
void dof_gather_ammend_weight(inout DofGatherData sample_data, float weight)
void dof_gather_amend_weight(inout DofGatherData sample_data, float weight)
{
sample_data.color *= weight;
sample_data.coc *= weight;
@@ -319,7 +319,7 @@ void dof_gather_accumulate_center_sample(DofGatherData center_data,
if (is_foreground && !is_resolve) {
/* Reduce issue with closer foreground over distant foreground. */
float ring_area = square(bordering_radius);
dof_gather_ammend_weight(center_data, ring_area);
dof_gather_amend_weight(center_data, ring_area);
}
/* Accumulate center as its own ring. */
@@ -521,7 +521,7 @@ void dof_gather_accumulator(sampler2D color_tx,
float ring_area = (square(float(ring) + 0.5 + coc_radius_error) -
square(float(ring) - 0.5 + coc_radius_error)) *
square(base_radius * unit_sample_radius);
dof_gather_ammend_weight(ring_data, ring_area);
dof_gather_amend_weight(ring_data, ring_area);
}
dof_gather_accumulate_sample_ring(
@@ -540,7 +540,7 @@ void dof_gather_accumulator(sampler2D color_tx,
const float outer_rings_weight = 1.0 / (radius_downscale_factor * radius_downscale_factor);
/* Samples are already weighted per ring in foreground pass. */
if (!is_foreground) {
dof_gather_ammend_weight(accum_data, outer_rings_weight);
dof_gather_amend_weight(accum_data, outer_rings_weight);
}
/* Re-init kernel position & sampling parameters. */
dof_gather_init(base_radius, noise, center_co, lod, isect_mul);

2
source/blender/draw/engines/eevee_next/shaders/eevee_film_frag.glsl
View File

@@ -33,5 +33,5 @@ void main()
gl_FragDepth = drw_depth_view_to_screen(-out_depth);
gl_FragDepth = film_display_depth_ammend(texel_film, gl_FragDepth);
gl_FragDepth = film_display_depth_amend(texel_film, gl_FragDepth);
}

2
source/blender/draw/engines/eevee_next/shaders/eevee_film_lib.glsl
View File

@@ -587,7 +587,7 @@ void film_store_weight(ivec2 texel, float value)
imageStore(out_weight_img, ivec3(texel, FILM_WEIGHT_LAYER_ACCUMULATION), vec4(value));
}
float film_display_depth_ammend(ivec2 texel, float depth)
float film_display_depth_amend(ivec2 texel, float depth)
{
/* This effectively offsets the depth of the whole 2x2 region to the lowest value of the region
* twice. One for X and one for Y direction. */

2
source/blender/draw/engines/eevee_next/shaders/eevee_ray_trace_fallback_comp.glsl
View File

@@ -57,7 +57,7 @@ void main()
if (thickness != 0.0) {
ClosureUndetermined cl = gbuffer_read_bin(
gbuf_header, gbuf_closure_tx, gbuf_normal_tx, texel_fullres, closure_index);
ray = raytrace_thickness_ray_ammend(ray, cl, V, thickness);
ray = raytrace_thickness_ray_amend(ray, cl, V, thickness);
}
}

2
source/blender/draw/engines/eevee_next/shaders/eevee_ray_trace_screen_comp.glsl
View File

@@ -71,7 +71,7 @@ void main()
if (thickness != 0.0) {
ClosureUndetermined cl = gbuffer_read_bin(
gbuf_header, gbuf_closure_tx, gbuf_normal_tx, texel_fullres, closure_index);
ray = raytrace_thickness_ray_ammend(ray, cl, V, thickness);
ray = raytrace_thickness_ray_amend(ray, cl, V, thickness);
}
}

2
source/blender/draw/engines/eevee_next/shaders/eevee_ray_trace_screen_lib.glsl
View File

@@ -225,7 +225,7 @@ ScreenTraceHitData raytrace_planar(RayTraceData rt_data,
/* Modify the ray origin before tracing it. We must do this because ray origin is implicitly
* reconstructed from from gbuffer depth which we cannot modify. */
Ray raytrace_thickness_ray_ammend(Ray ray, ClosureUndetermined cl, vec3 V, float thickness)
Ray raytrace_thickness_ray_amend(Ray ray, ClosureUndetermined cl, vec3 V, float thickness)
{
switch (cl.type) {
case CLOSURE_BSDF_MICROFACET_GGX_REFRACTION_ID: