From 5c37019fe256ed7ae8ebd5dcedef2fea6168447a Mon Sep 17 00:00:00 2001
From: Thomas Debesse <dev@illwieckz.net>
Date: Mon, 16 Dec 2019 01:00:29 +0100
Subject: [PATCH] renderer: revive liquid shader, code is currently broken

this way broken code is less likely to be introduced in liquid shader
and it makes easier to test the code to debug it
---
 src/engine/renderer/tr_backend.cpp | 6 ++++--
 src/engine/renderer/tr_shade.cpp   | 8 ++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/engine/renderer/tr_backend.cpp b/src/engine/renderer/tr_backend.cpp
index 50bcd305fe..3212fd89c5 100644
--- a/src/engine/renderer/tr_backend.cpp
+++ b/src/engine/renderer/tr_backend.cpp
@@ -4716,14 +4716,16 @@ static void RB_RenderView( bool depthPass )
 
 	if ( backEnd.viewParms.portalLevel > 0 )
 	{
-#if !defined( GLSL_COMPILE_STARTUP_ONLY )
 		{
 			// capture current color buffer
+			// liquid shader will then bind tr.portalRenderImage
+			// as u_PortalMap to be read by liquid glsl
+			// FIXME: it does not work
 			GL_SelectTexture( 0 );
 			GL_Bind( tr.portalRenderImage );
 			glCopyTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, 0, 0, tr.portalRenderImage->uploadWidth, tr.portalRenderImage->uploadHeight );
 		}
-#endif
+
 		backEnd.pc.c_portals++;
 	}
 
diff --git a/src/engine/renderer/tr_shade.cpp b/src/engine/renderer/tr_shade.cpp
index 2bde0728a0..6ef32f5d9c 100644
--- a/src/engine/renderer/tr_shade.cpp
+++ b/src/engine/renderer/tr_shade.cpp
@@ -106,10 +106,10 @@ static void GLSL_InitGPUShadersOrError()
 	// debug utils
 	gl_shaderManager.load( gl_debugShadowMapShader );
 
-#if !defined( GLSL_COMPILE_STARTUP_ONLY )
-
 	gl_shaderManager.load( gl_liquidShader );
 
+#if !defined( GLSL_COMPILE_STARTUP_ONLY )
+
 	gl_shaderManager.load( gl_volumetricFogShader );
 
 #endif // #if !defined(GLSL_COMPILE_STARTUP_ONLY)
@@ -2462,7 +2462,6 @@ static void Render_heatHaze( int stage )
 	GL_CheckErrors();
 }
 
-#if !defined( GLSL_COMPILE_STARTUP_ONLY )
 static void Render_liquid( int stage )
 {
 	vec3_t        viewOrigin;
@@ -2576,9 +2575,6 @@ static void Render_liquid( int stage )
 
 	GL_CheckErrors();
 }
-#else
-static void Render_liquid(int){}
-#endif
 
 static void Render_fog()
 {