From 5ad7d81549d09e464afc437c430f834320a59746 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cle=CC=81ment=20Foucault?= Date: Sat, 2 Sep 2023 23:17:26 +0200 Subject: [PATCH] Cleanup: EEVEE-Next: Fix compilation warning and errors on Metal --- .../eevee_next/shaders/eevee_debug_surfels_frag.glsl | 2 +- .../eevee_next/shaders/eevee_debug_surfels_vert.glsl | 6 +++--- .../engines/eevee_next/shaders/eevee_shadow_debug_frag.glsl | 2 +- .../eevee_next/shaders/eevee_surfel_cluster_build_comp.glsl | 2 +- .../eevee_next/shaders/infos/eevee_irradiance_cache_info.hh | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_debug_surfels_frag.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_debug_surfels_frag.glsl index 8bbf392d601..0812f3b7262 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_debug_surfels_frag.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_debug_surfels_frag.glsl @@ -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; } diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_debug_surfels_vert.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_debug_surfels_vert.glsl index 5f983be7278..bbe5830ff0e 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_debug_surfels_vert.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_debug_surfels_vert.glsl @@ -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; diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_shadow_debug_frag.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_shadow_debug_frag.glsl index 4e046ae4414..0f697d5d280 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_shadow_debug_frag.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_shadow_debug_frag.glsl @@ -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); } diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_surfel_cluster_build_comp.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_surfel_cluster_build_comp.glsl index bdf923e78e3..3c4938fd962 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_surfel_cluster_build_comp.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_surfel_cluster_build_comp.glsl @@ -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; } diff --git a/source/blender/draw/engines/eevee_next/shaders/infos/eevee_irradiance_cache_info.hh b/source/blender/draw/engines/eevee_next/shaders/infos/eevee_irradiance_cache_info.hh index 5678331647f..1b2bc3d8cd7 100644 --- a/source/blender/draw/engines/eevee_next/shaders/infos/eevee_irradiance_cache_info.hh +++ b/source/blender/draw/engines/eevee_next/shaders/infos/eevee_irradiance_cache_info.hh @@ -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);