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

Cleanup: EEVEE-Next: Fix compilation warning and errors on Metal

Browse Source
This commit is contained in:
Clément Foucault
2023-09-02 23:17:26 +02:00
parent 7b0b2e4a5d
commit 5ad7d81549
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@ void main()
}
/* Display surfels as circles. */
if (distance(P, surfel.position) > surfel_radius) {
if (distance(P, surfel.position) > debug_surfel_radius) {
discard;
return;
}

6
source/blender/draw/engines/eevee_next/shaders/eevee_debug_surfels_vert.glsl
View File

@@ -41,9 +41,9 @@ void main()
vec3 T, B;
make_orthonormal_basis(N, T, B);
mat4 model_matrix = mat4(vec4(T * surfel_radius, 0),
vec4(B * surfel_radius, 0),
vec4(N * surfel_radius, 0),
mat4 model_matrix = mat4(vec4(T * debug_surfel_radius, 0),
vec4(B * debug_surfel_radius, 0),
vec4(N * debug_surfel_radius, 0),
vec4(surfel.position, 1));
P = (model_matrix * vec4(lP, 1)).xyz;

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

@@ -142,7 +142,7 @@ void debug_atlas_values(vec3 P, LightData light)
void debug_random_tile_color(vec3 P, LightData light)
{
ShadowSample samp = debug_tile_get(P, light);
out_color_add = vec4(debug_random_color(ivec2(samp.tile.page)), 0) * 0.5;
out_color_add = vec4(debug_random_color(ivec2(samp.tile.page.xy)), 0) * 0.5;
out_color_mul = vec4(0.5);
}

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

@@ -15,7 +15,7 @@
void main()
{
int surfel_index = int(gl_GlobalInvocationID.x);
if (surfel_index >= capture_info_buf.surfel_len) {
if (surfel_index >= int(capture_info_buf.surfel_len)) {
return;
}

2
source/blender/draw/engines/eevee_next/shaders/infos/eevee_irradiance_cache_info.hh
View File

@@ -20,7 +20,7 @@ GPU_SHADER_CREATE_INFO(eevee_debug_surfels)
.fragment_source("eevee_debug_surfels_frag.glsl")
.fragment_out(0, Type::VEC4, "out_color")
.storage_buf(0, Qualifier::READ, "Surfel", "surfels_buf[]")
.push_constant(Type::FLOAT, "surfel_radius")
.push_constant(Type::FLOAT, "debug_surfel_radius")
.push_constant(Type::INT, "debug_mode")
.do_static_compilation(true);