From fdabf2dd0dd1e352c46dd17002832770ff2894e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B8=D1=85=D0=B0=D0=B8=D0=BB=20=D0=9A=D0=B0=D0=BF?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=BA=D0=BE?= Date: Tue, 20 Oct 2026 16:36:56 +0300 Subject: [PATCH] only set const shaders once --- game/ver-mac/bridge/raylib_bridge.c | 70 +++++++++++++++++------------ 1 file changed, 41 insertions(+), 29 deletions(-) diff --git a/game/ver-mac/bridge/raylib_bridge.c b/game/ver-mac/bridge/raylib_bridge.c index 95054b6..fbe8015 100644 --- a/game/ver-mac/bridge/raylib_bridge.c +++ b/game/ver-mac/bridge/raylib_bridge.c @@ -138,6 +138,46 @@ static void sr_build_ground(void) sr_ground_shadow_material.shader = sr_shadow_shader; } +// Uniforms that never change between frames are uploaded once at startup. +// SetShaderValue() is a bare glUniform*(), so the program must be bound. +static void sr_init_main_uniforms(void) +{ + sr_light_pos = (Vector3){ 0.0f, 4.2f, 0.0f }; + + Vector3 light_color = { 1.15f, 1.08f, 0.98f }; + Vector3 ambient = { 0.30f, 0.32f, 0.38f }; + Vector3 grid_color = { 0.45f, 0.62f, 0.95f }; + Vector3 fog_color = { 24.0f / 255.0f, 26.0f / 255.0f, 34.0f / 255.0f }; + Vector3 camera_pos = { 0.0f, 2.6f, 5.6f }; + float albedo[3] = { 1.0f, 1.0f, 1.0f }; + float light_amount = 1.0f; + float shadow_bias = 0.0025f; + float shadow_softness = 4.0f; + float fog_start = 10.0f; + float fog_end = 34.0f; + int shadow_unit = 1; + int normal_unit = 2; + + rlEnableShader(sr_main_shader.id); + + SetShaderValue(sr_main_shader, loc_light_pos, &sr_light_pos, SHADER_UNIFORM_VEC3); + SetShaderValue(sr_main_shader, loc_light_color, &light_color, SHADER_UNIFORM_VEC3); + SetShaderValue(sr_main_shader, loc_ambient, &ambient, SHADER_UNIFORM_VEC3); + SetShaderValue(sr_main_shader, loc_light_enabled, &light_amount, SHADER_UNIFORM_FLOAT); + SetShaderValue(sr_main_shader, loc_shadow_bias, &shadow_bias, SHADER_UNIFORM_FLOAT); + SetShaderValue(sr_main_shader, loc_shadow_softness, &shadow_softness, SHADER_UNIFORM_FLOAT); + SetShaderValue(sr_main_shader, loc_grid_color, &grid_color, SHADER_UNIFORM_VEC3); + SetShaderValue(sr_main_shader, loc_camera_pos, &camera_pos, SHADER_UNIFORM_VEC3); + SetShaderValue(sr_main_shader, loc_fog_color, &fog_color, SHADER_UNIFORM_VEC3); + SetShaderValue(sr_main_shader, loc_fog_start, &fog_start, SHADER_UNIFORM_FLOAT); + SetShaderValue(sr_main_shader, loc_fog_end, &fog_end, SHADER_UNIFORM_FLOAT); + SetShaderValue(sr_main_shader, loc_albedo_color, albedo, SHADER_UNIFORM_VEC3); + SetShaderValue(sr_main_shader, loc_shadow_map, &shadow_unit, SHADER_UNIFORM_INT); + SetShaderValue(sr_main_shader, loc_normal_map, &normal_unit, SHADER_UNIFORM_INT); + + rlDisableShader(); +} + void sr_init(int width, int height, const char *main_vs, const char *main_fs, const char *shadow_vs, const char *shadow_fs, sr_config config) { @@ -153,6 +193,7 @@ void sr_init(int width, int height, const char *main_vs, const char *main_fs, rlglInit(sr_width, sr_height); sr_load_shaders(main_vs, main_fs, shadow_vs, shadow_fs); + sr_init_main_uniforms(); sr_build_ground(); sr_ready = 1; @@ -255,30 +296,6 @@ static void sr_render_main_pass(void) rlEnableShader(sr_main_shader.id); - Vector3 light_color = { 1.15f, 1.08f, 0.98f }; - Vector3 ambient = { 0.30f, 0.32f, 0.38f }; - Vector3 grid_color = { 0.45f, 0.62f, 0.95f }; - Vector3 fog_color = { 24.0f / 255.0f, 26.0f / 255.0f, 34.0f / 255.0f }; - float light_amount = 1.0f; - float shadow_bias = 0.0025f; - float shadow_softness = 4.0f; - float fog_start = 10.0f; - float fog_end = 34.0f; - - SetShaderValue(sr_main_shader, loc_light_pos, &sr_light_pos, SHADER_UNIFORM_VEC3); - SetShaderValue(sr_main_shader, loc_light_color, &light_color, SHADER_UNIFORM_VEC3); - SetShaderValue(sr_main_shader, loc_ambient, &ambient, SHADER_UNIFORM_VEC3); - SetShaderValue(sr_main_shader, loc_light_enabled, &light_amount, SHADER_UNIFORM_FLOAT); - SetShaderValue(sr_main_shader, loc_shadow_bias, &shadow_bias, SHADER_UNIFORM_FLOAT); - SetShaderValue(sr_main_shader, loc_shadow_softness, &shadow_softness, SHADER_UNIFORM_FLOAT); - SetShaderValue(sr_main_shader, loc_grid_color, &grid_color, SHADER_UNIFORM_VEC3); - SetShaderValue(sr_main_shader, loc_camera_pos, &eye, SHADER_UNIFORM_VEC3); - SetShaderValue(sr_main_shader, loc_fog_color, &fog_color, SHADER_UNIFORM_VEC3); - SetShaderValue(sr_main_shader, loc_fog_start, &fog_start, SHADER_UNIFORM_FLOAT); - SetShaderValue(sr_main_shader, loc_fog_end, &fog_end, SHADER_UNIFORM_FLOAT); - - int shadow_unit = 1; - SetShaderValue(sr_main_shader, loc_shadow_map, &shadow_unit, SHADER_UNIFORM_INT); rlActiveTextureSlot(1); rlEnableTexture(sr_shadow_depth); rlActiveTextureSlot(0); @@ -356,8 +373,6 @@ static void sr_set_light_mvp(Matrix model) static void sr_bind_normal(Texture2D tex) { - int unit = 2; - SetShaderValue(sr_main_shader, loc_normal_map, &unit, SHADER_UNIFORM_INT); rlActiveTextureSlot(2); if (tex.id > 0) rlEnableTexture(tex.id); rlActiveTextureSlot(0); @@ -368,9 +383,7 @@ static void sr_draw_object(Model model, Material material, Matrix model_mat, { sr_set_light_mvp(model_mat); - float albedo[3] = { 1.0f, 1.0f, 1.0f }; float normal_strength = (normal.id > 0) ? 1.0f : 0.0f; - SetShaderValue(sr_main_shader, loc_albedo_color, albedo, SHADER_UNIFORM_VEC3); SetShaderValue(sr_main_shader, loc_emissive, &emissive, SHADER_UNIFORM_FLOAT); SetShaderValue(sr_main_shader, loc_is_ground, &is_ground, SHADER_UNIFORM_FLOAT); SetShaderValue(sr_main_shader, loc_normal_strength, &normal_strength, SHADER_UNIFORM_FLOAT); @@ -387,7 +400,6 @@ void sr_render(void) rlDrawRenderBatchActive(); // --- Light (point light above the scene) --- - sr_light_pos = (Vector3){ 0.0f, 4.2f, 0.0f }; Vector3 light_target = (Vector3){ 0.0f, -2.0f, 0.0f }; Vector3 light_up = (Vector3){ 0.0f, 0.0f, -1.0f }; sr_light_view = MatrixLookAt(sr_light_pos, light_target, light_up);