From 35edca61db4d5c42fb84786d2187c94e5b17d950 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Thu, 30 Apr 2026 12:05:45 -0400 Subject: [PATCH] Revert "Fix Water_Ripple uniform" This reverts commit ec53fd651174bdb2b4f577a8b0c64d2603ce5de6. --- src/hardware/r_opengl/r_opengl.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index 410c00e82..7bab48963 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -1945,14 +1945,7 @@ static void Shader_SetUniforms(FSurfaceInfo *Surface, GLRGBAFloat *poly, GLRGBAF UNIFORM_2(shader->uniforms[gluniform_scr_resolution], (GLfloat)vid.width, (GLfloat)vid.height, pglUniform2f); - if (Surface) - { - UNIFORM_1(shader->uniforms[gluniform_water_ripple], (Surface->PolyFlags & PF_Ripple), pglUniform1f); - } - else - { - UNIFORM_1(shader->uniforms[gluniform_water_ripple], 0, pglUniform1f); - } + UNIFORM_1(shader->uniforms[gluniform_water_ripple], !!(Surface && (Surface->PolyFlags & PF_Ripple)), pglUniform1f); #undef UNIFORM_1 #undef UNIFORM_2