NUKE now-unused ST_PORTALMAP stage

Author: slipher

src.cmake

@@ -139,8 +139,6 @@ set(GLSL_EMBED_LIST
     lightMapping_fp.glsl
     liquid_vp.glsl
     liquid_fp.glsl
-    portal_vp.glsl
-    portal_fp.glsl
     reflection_CB_vp.glsl
     reflection_CB_fp.glsl
     screen_vp.glsl

src/engine/renderer/GeometryOptimiser.cpp

@@ -100,10 +100,6 @@ void MarkShaderBuildScreen( const shaderStage_t* ) {
 	gl_screenShader->MarkProgramForBuilding();
 }
 
-void MarkShaderBuildPortal( const shaderStage_t* ) {
-	gl_portalShader->MarkProgramForBuilding();
-}
-
 void MarkShaderBuildHeatHaze( const shaderStage_t* pStage ) {
 	ProcessShaderHeatHaze( pStage );
 	gl_heatHazeShader->MarkProgramForBuilding();

src/engine/renderer/GeometryOptimiser.h

@@ -84,7 +84,6 @@ void MarkShaderBuildLightMapping( const shaderStage_t* pStage );
 void MarkShaderBuildReflection( const shaderStage_t* pStage );
 void MarkShaderBuildSkybox( const shaderStage_t* pStage );
 void MarkShaderBuildScreen( const shaderStage_t* pStage );
-void MarkShaderBuildPortal( const shaderStage_t* pStage );
 void MarkShaderBuildHeatHaze( const shaderStage_t* pStage );
 void MarkShaderBuildLiquid( const shaderStage_t* pStage );
 

src/engine/renderer/gl_shader.cpp

@@ -72,7 +72,6 @@ GLShader_heatHaze                        *gl_heatHazeShader = nullptr;
 GLShader_heatHazeMaterial                *gl_heatHazeShaderMaterial = nullptr;
 GLShader_liquid                          *gl_liquidShader = nullptr;
 GLShader_liquidMaterial                  *gl_liquidShaderMaterial = nullptr;
-GLShader_portal                          *gl_portalShader = nullptr;
 GLShader_reflection                      *gl_reflectionShader = nullptr;
 GLShader_reflectionMaterial              *gl_reflectionShaderMaterial = nullptr;
 GLShader_screen                          *gl_screenShader = nullptr;
@@ -2775,21 +2774,6 @@ GLShader_screenMaterial::GLShader_screenMaterial() :
 	u_ModelViewProjectionMatrix( this ) {
 }
 
-GLShader_portal::GLShader_portal() :
-	GLShader( "portal", ATTR_POSITION,
-		false, "portal", "portal" ),
-	u_CurrentMap( this ),
-	u_ModelViewMatrix( this ),
-	u_ModelViewProjectionMatrix( this ),
-	u_InversePortalRange( this )
-{
-}
-
-void GLShader_portal::SetShaderProgramUniforms( ShaderProgramDescriptor *shaderProgram )
-{
-	glUniform1i( glGetUniformLocation( shaderProgram->id, "u_CurrentMap" ), 0 );
-}
-
 GLShader_contrast::GLShader_contrast() :
 	GLShader( "contrast", ATTR_POSITION,
 		false, "screenSpace", "contrast" ),

src/engine/renderer/gl_shader.h

@@ -3268,18 +3268,6 @@ class GLShader_screenMaterial :
 	GLShader_screenMaterial();
 };
 
-class GLShader_portal :
-	public GLShader,
-	public u_CurrentMap,
-	public u_ModelViewMatrix,
-	public u_ModelViewProjectionMatrix,
-	public u_InversePortalRange
-{
-public:
-	GLShader_portal();
-	void SetShaderProgramUniforms( ShaderProgramDescriptor *shaderProgram ) override;
-};
-
 class GLShader_contrast :
 	public GLShader,
 	public u_ColorMap {
@@ -3563,7 +3551,6 @@ extern GLShader_heatHaze                        *gl_heatHazeShader;
 extern GLShader_heatHazeMaterial                *gl_heatHazeShaderMaterial;
 extern GLShader_liquid                          *gl_liquidShader;
 extern GLShader_liquidMaterial                  *gl_liquidShaderMaterial;
-extern GLShader_portal                          *gl_portalShader;
 extern GLShader_reflection                      *gl_reflectionShader;
 extern GLShader_reflectionMaterial              *gl_reflectionShaderMaterial;
 extern GLShader_screen                          *gl_screenShader;

src/engine/renderer/glsl_source/portal_fp.glsl

@@ -938,7 +938,6 @@ enum
 	  ST_REFLECTIONMAP, // cubeMap based reflection
 	  ST_SKYBOXMAP,
 	  ST_SCREENMAP, // 2d offscreen or portal rendering
-	  ST_PORTALMAP,
 	  ST_HEATHAZEMAP, // heatHaze post process effect
 	  ST_LIQUIDMAP,
 	  ST_FOGMAP_INNER, // a fog seen from inside
@@ -3249,7 +3248,6 @@ void GLimp_LogComment_( std::string comment );
 	void Render_reflection_CB( shaderStage_t *pStage );
 	void Render_skybox( shaderStage_t *pStage );
 	void Render_screen( shaderStage_t *pStage );
-	void Render_portal( shaderStage_t *pStage );
 	void Render_heatHaze( shaderStage_t *pStage );
 	void Render_liquid( shaderStage_t *pStage );
 	void Render_fog( shaderStage_t *pStage );

src/engine/renderer/glsl_source/portal_vp.glsl

@@ -343,11 +343,6 @@ static void GLSL_InitGPUShadersOrError()
 		gl_contrastShader->MarkProgramForBuilding();
 	}
 
-	// portal process effect
-	gl_shaderManager.LoadShader( gl_portalShader );
-
-	gl_portalShader->MarkProgramForBuilding();
-
 	// camera post process effect
 	gl_shaderManager.LoadShader( gl_cameraEffectsShader );
 
@@ -509,7 +504,6 @@ void GLSL_ShutdownGPUShaders()
 	gl_heatHazeShaderMaterial = nullptr;
 	gl_screenShader = nullptr;
 	gl_screenShaderMaterial = nullptr;
-	gl_portalShader = nullptr;
 	gl_contrastShader = nullptr;
 	gl_cameraEffectsShader = nullptr;
 	gl_blurShader = nullptr;
@@ -1411,35 +1405,6 @@ void Render_screen( shaderStage_t *pStage )
 	GL_CheckErrors();
 }
 
-/* This doesn't render the portal itself but the texture
-blended to it to fade it with distance. */
-void Render_portal( shaderStage_t *pStage )
-{
-	GLIMP_LOGCOMMENT( "--- Render_portal ---" );
-
-	GL_State( pStage->stateBits );
-
-	// enable shader, set arrays
-	gl_portalShader->BindProgram();
-
-	{
-		GL_VertexAttribsState( ATTR_POSITION | ATTR_TEXCOORD );
-		glVertexAttrib4fv( ATTR_INDEX_COLOR, tess.svars.color.ToArray() );
-	}
-
-	gl_portalShader->SetUniform_InversePortalRange( 1 / tess.surfaceShader->portalRange );
-
-	gl_portalShader->SetUniform_ModelViewMatrix( glState.modelViewMatrix[ glState.stackIndex ] );
-	gl_portalShader->SetUniform_ModelViewProjectionMatrix( glState.modelViewProjectionMatrix[ glState.stackIndex ] );
-
-	// bind u_CurrentMap
-	gl_portalShader->SetUniform_CurrentMapBindless( BindAnimatedImage( 0, &pStage->bundle[TB_COLORMAP] ) );
-
-	Tess_DrawElements();
-
-	GL_CheckErrors();
-}
-
 void Render_heatHaze( shaderStage_t *pStage )
 {
 	float         deformMagnitude;

src/engine/renderer/tr_local.h

@@ -2748,10 +2748,6 @@ static bool ParseStage( shaderStage_t *stage, const char **text )
 			{
 				stage->type = stageType_t::ST_SCREENMAP;
 			}
-			else if ( !Q_stricmp( token, "portalMap" ) )
-			{
-				stage->type = stageType_t::ST_PORTALMAP;
-			}
 			else if ( !Q_stricmp( token, "heathazeMap" ) )
 			{
 				stage->type = stageType_t::ST_HEATHAZEMAP;
@@ -5652,14 +5648,6 @@ static void SetStagesRenderers()
 					&UpdateSurfaceDataScreen, &BindShaderScreen, &ProcessMaterialScreen,
 				};
 				break;
-			case stageType_t::ST_PORTALMAP:
-				/* Comment from the Material code:
-				This is supposedly used for alphagen portal and portal surfaces should never get here. */
-				stageRendererOptions = {
-					&Render_portal, &MarkShaderBuildPortal,
-					&UpdateSurfaceDataNONE, &BindShaderNONE, &ProcessMaterialNONE,
-				};
-				break;
 			case stageType_t::ST_HEATHAZEMAP:
 				stageRendererOptions = {
 					&Render_heatHaze, &MarkShaderBuildHeatHaze,
@@ -6596,7 +6584,6 @@ class ListShadersCmd : public Cmd::StaticCmd
 			{ stageType_t::ST_REFLECTIONMAP, "REFLECTIONMAP" },
 			{ stageType_t::ST_SKYBOXMAP, "SKYBOXMAP" },
 			{ stageType_t::ST_SCREENMAP, "SCREENMAP" },
-			{ stageType_t::ST_PORTALMAP, "PORTALMAP" },
 			{ stageType_t::ST_HEATHAZEMAP, "HEATHAZEMAP" },
 			{ stageType_t::ST_LIQUIDMAP, "LIQUIDMAP" },
 			{ stageType_t::ST_LIGHTMAP, "LIGHTMAP" },