From 2386d98217a611045793990ca911659663e07aa9 Mon Sep 17 00:00:00 2001 From: zhenyan121 <3367366583@qq.com> Date: Sun, 21 Jun 2026 16:04:44 +0800 Subject: [PATCH] refactor: remove unused uniforms and set cameraPos uniform outside lambda --- assets/shaders/water_f_shader.glsl | 1 - src/renderer.cpp | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/assets/shaders/water_f_shader.glsl b/assets/shaders/water_f_shader.glsl index 31ff808..7b3f52d 100644 --- a/assets/shaders/water_f_shader.glsl +++ b/assets/shaders/water_f_shader.glsl @@ -22,7 +22,6 @@ uniform float ambientStrength; uniform vec3 sunlightColor; uniform vec3 ambientColor; uniform vec3 sunlightDir; -uniform vec3 cameraPos; uniform bool shader_on; uniform float specularStrength; diff --git a/src/renderer.cpp b/src/renderer.cpp index 732345d..a528ec7 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -819,7 +819,6 @@ void Renderer::render_world() { accum_shader.set_loc("mv_matrix", m_mv_mat); accum_shader.set_loc("proj_matrix", m_p_mat); accum_shader.set_loc("norm_matrix", m_norm_mat); - accum_shader.set_loc("lightSpaceMatrix", light_space_matrix); accum_shader.set_loc("ambientStrength", m_ambient_strength); accum_shader.set_loc("sunlightColor", m_parallel_light.directional_light_color); @@ -828,14 +827,13 @@ void Renderer::render_world() { accum_shader.set_loc("sunlightDir", light_dir_view); accum_shader.set_loc("shader_on", m_shader_on); accum_shader.set_loc("specularStrength", m_specular_strength); - accum_shader.set_loc("cameraPos", m_camera.get_camera_pos()); }; auto& accum_shader = get_shader("accum"); accum_shader.use(); set_accum_loc(accum_shader); - + accum_shader.set_loc("cameraPos", m_camera.get_camera_pos()); glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D_ARRAY, m_texture_manager.get_texture_array()); for (const auto& snapshot : m_render_snapshots) {