From ad7cb93236063d29ad98f7739b9b2ab2d608cb6e Mon Sep 17 00:00:00 2001 From: korenkonder Date: Wed, 26 Jun 2024 13:40:28 +0300 Subject: [PATCH] Always bind LUT Texture for Tonemapping --- res/ft_shaders.farc | Bin 110208 -> 110160 bytes src/DivaGL/render.cpp | 8 ++------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/res/ft_shaders.farc b/res/ft_shaders.farc index 9b4793d5d35646139643dbef18adbe1410c37b4a..1d2f9ffcaff17e4826654b0cd5a6fec1395f1c16 100644 GIT binary patch delta 6098 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[1]); gl_state_active_bind_texture_2d(1, reduce_tex_draw); gl_state_bind_sampler(1, rctx->render_samplers[2]); - - if (tone_map == TONE_MAP_YCC_EXPONENT) { - gl_state_active_bind_texture_2d(2, tonemap_lut_texture); - gl_state_bind_sampler(2, rctx->render_samplers[0]); - } - + gl_state_active_bind_texture_2d(2, tonemap_lut_texture); + gl_state_bind_sampler(2, rctx->render_samplers[0]); gl_state_active_bind_texture_2d(3, exposure_tex); gl_state_bind_sampler(3, rctx->render_samplers[3]);