feat: cleanup

Signed-off-by: Michael Pollind <[email protected]>

Author: pollend

source/qcommon/common.c

@@ -230,8 +230,6 @@ void Com_Printf( const char *format, ... )
 	Q_vsnprintfz( msg, sizeof( msg ), format, argptr );
 	va_end( argptr );
 
-	printf("%s", msg);
-
 	QMutex_Lock( com_print_mutex );
 
 	if( rd_target )

source/qcommon/snap_write.c

@@ -909,8 +909,6 @@ static bool SNAP_SnapCullEntity( cmodel_state_t *cms, edict_t *ent, edict_t *cle
 	if( frame->allentities )
 		return false;
 
-	if(ent->s.type == ET_PLAYER || ent->s.type == ET_CORPSE)
-		return false;
 
 	// filters: transmit only to clients in the same team as this entity
 	// broadcasting is less important than team specifics

source/ref_gl/r_backend.c

@@ -145,7 +145,10 @@ void RB_StatsMessage( char *msg, size_t size )
 	);
 }
 
-void RB_SetStencilFunc( int func, int ref, int mask ) {
+void RB_SetStencilFunc( int func, int ref, int mask )
+{
+	if( !glConfig.stencilBits )
+		return;
 	if( rb.gl.stencilFunc == func && rb.gl.stencilRef == ref && rb.gl.stencilFuncMask == mask )
 		return;
 
@@ -155,7 +158,10 @@ void RB_SetStencilFunc( int func, int ref, int mask ) {
 	rb.gl.stencilFuncMask = mask;
 }
 
-void RB_SetStencilOp( int sfail, int dpfail, int dppass ) {
+void RB_SetStencilOp( int sfail, int dpfail, int dppass )
+{
+	if( !glConfig.stencilBits )
+		return;
 	if( rb.gl.stencilSFail == sfail && rb.gl.stencilDPFail == dpfail && rb.gl.stencilDPPass == dppass )
 		return;
 
@@ -165,14 +171,16 @@ void RB_SetStencilOp( int sfail, int dpfail, int dppass ) {
 	rb.gl.stencilDPPass = dppass;
 }
 
-void RB_SetStencilMask( int mask ) {
-	 if( rb.gl.stencilMask == mask )
-	 	return;
+void RB_SetStencilMask( int mask )
+{
+	if( !glConfig.stencilBits )
+		return;
+	if( rb.gl.stencilMask == mask )
+		return;
 	qglStencilMask( mask );
 	rb.gl.stencilMask = mask;
 }
 
-
 /*
 * RB_SetGLDefaults
 */
@@ -364,7 +372,7 @@ void RB_Cull( int cull )
 void RB_SetState( int state )
 {
 
-	int diff = rb.gl.state ^ state;
+	const int diff = rb.gl.state ^ state;
 	if( !diff )
 		return;
 
@@ -493,7 +501,7 @@ void RB_SetState( int state )
 
 	if( diff & GLSTATE_STENCIL_TEST )
 	{
-	//	if( glConfig.stencilBits )
+		if( glConfig.stencilBits )
 		{
 			if( state & GLSTATE_STENCIL_TEST )
 				qglEnable( GL_STENCIL_TEST );

source/ref_gl/r_backend_program.c

@@ -110,23 +110,23 @@ static void RB_InitBuiltinPasses( void )
 	pass->rgbgen.type = RGB_GEN_OUTLINE;
 	pass->alphagen.type = ALPHA_GEN_OUTLINE;
 	pass->tcgen = TC_GEN_NONE;
-	pass->program_type = GLSL_PROGRAM_TYPE_OUTLINE_0;
+	pass->program_type = GLSL_PROGRAM_TYPE_OUTLINE_STENCIL_BACK;
 
 	// overlay outline
 	pass = &r_GLSLpasses[BUILTIN_GLSLPASS_OVERLAY_OUTLINE_1];
 	pass->flags = 0;
 	pass->rgbgen.type = RGB_GEN_OUTLINE;
 	pass->alphagen.type = ALPHA_GEN_OUTLINE;
 	pass->tcgen = TC_GEN_NONE;
-	pass->program_type = GLSL_PROGRAM_TYPE_OUTLINE_1;
+	pass->program_type = GLSL_PROGRAM_TYPE_OUTLINE_STENCIL_FRONT;
 
 	// overlay outline
 	pass = &r_GLSLpasses[BUILTIN_GLSLPASS_OVERLAY_OUTLINE_2];
 	pass->flags = 0;
 	pass->rgbgen.type = RGB_GEN_OUTLINE;
 	pass->alphagen.type = ALPHA_GEN_OUTLINE;
 	pass->tcgen = TC_GEN_NONE;
-	pass->program_type = GLSL_PROGRAM_TYPE_OUTLINE_2;
+	pass->program_type = GLSL_PROGRAM_TYPE_OUTLINE_GHOST_FINAL;
 
 
 	// skybox
@@ -1391,10 +1391,6 @@ static void RB_RenderMeshGLSL_Shadowmap( const shaderpass_t *pass, r_glslfeat_t
 	RB_Scissor( old_scissor[0], old_scissor[1], old_scissor[2], old_scissor[3] );
 }
 
-
-/*
-* RB_RenderMeshGLSL_Outline
-*/
 static void RB_RenderMeshGLSL_StencilOutline_0( const shaderpass_t *pass, r_glslfeat_t programFeatures )
 {
 	Vector4Copy( rb.currentEntity->outlineColorGhost, rb.entityOutlineColor );
@@ -1425,7 +1421,7 @@ static void RB_RenderMeshGLSL_StencilOutline_0( const shaderpass_t *pass, r_glsl
 	RB_SetStencilOp( GL_REPLACE, GL_ZERO, GL_REPLACE);
 	RB_SetStencilFunc( GL_ALWAYS, 1, 0xFF );
 
-	RB_SetShaderpassState( pass->flags | GLSTATE_STENCIL_TEST | GLSTATE_DEPTHFUNC_GT);// | GLSTATE_NO_COLORWRITE );
+	RB_SetShaderpassState( pass->flags | GLSTATE_STENCIL_TEST | GLSTATE_DEPTHFUNC_GT);;
 	RP_UpdateOutlineUniforms( program, rb.currentEntity->outlineGhost);
 	RB_DrawElementsReal( &rb.drawElements );
 }
@@ -2024,13 +2020,13 @@ void RB_RenderMeshGLSLProgrammed( const shaderpass_t *pass, int programType )
 	case GLSL_PROGRAM_TYPE_SHADOWMAP:
 		RB_RenderMeshGLSL_Shadowmap( pass, features );
 		break;
-	case GLSL_PROGRAM_TYPE_OUTLINE_0:
+	case GLSL_PROGRAM_TYPE_OUTLINE_STENCIL_BACK:
 		RB_RenderMeshGLSL_StencilOutline_0(pass, features );
 		break;
-	case GLSL_PROGRAM_TYPE_OUTLINE_1:
+	case GLSL_PROGRAM_TYPE_OUTLINE_STENCIL_FRONT:
 		RB_RenderMeshGLSL_StencilOutline_1(pass, features );
 		break;
-	case GLSL_PROGRAM_TYPE_OUTLINE_2:
+	case GLSL_PROGRAM_TYPE_OUTLINE_GHOST_FINAL:
 		RB_RenderMeshGLSL_StencilOutline_2(pass, features );
 		break;
 	case GLSL_PROGRAM_TYPE_OUTLINE:
@@ -2543,7 +2539,7 @@ void RB_DrawShadedElements( void )
 	if( addGLSLOutline )
 		RB_RenderPass( &r_GLSLpasses[BUILTIN_GLSLPASS_OUTLINE] );
 
-	if(rb.currentEntity->outlineGhost) 
+	if(rb.currentEntity->outlineGhost && glConfig.stencilBits) 
 		RB_RenderPass( &r_GLSLpasses[BUILTIN_GLSLPASS_OVERLAY_OUTLINE_2] );
 
 	// fog

source/ref_gl/r_image.c

@@ -2426,8 +2426,8 @@ static void R_InitScreenImagePair( const char *name, image_t **color, image_t **
 
 	assert( !depth || glConfig.ext.depth_texture );
 
-	//if( !glConfig.stencilBits )
-	//	stencil = false;
+	if( !glConfig.stencilBits )
+		stencil = false;
 
 	flags = IT_SPECIAL;
 

source/ref_gl/r_program.h

@@ -54,9 +54,9 @@ enum
 	GLSL_PROGRAM_TYPE_FXAA,
 	GLSL_PROGRAM_TYPE_YUV,
 	GLSL_PROGRAM_TYPE_COLORCORRECTION,
-	GLSL_PROGRAM_TYPE_OUTLINE_0,
-	GLSL_PROGRAM_TYPE_OUTLINE_1,
-	GLSL_PROGRAM_TYPE_OUTLINE_2,
+	GLSL_PROGRAM_TYPE_OUTLINE_STENCIL_BACK,
+	GLSL_PROGRAM_TYPE_OUTLINE_STENCIL_FRONT,
+	GLSL_PROGRAM_TYPE_OUTLINE_GHOST_FINAL,
 
 	GLSL_PROGRAM_TYPE_MAXTYPE
 };

source/ref_gl/r_scene.c

@@ -118,6 +118,7 @@ void R_AddEntityToScene( const entity_t *ent )
 				tent.renderfx |= RF_OUTLINE_STENCIL_0;
 				R_AddEntityToScene( &tent );
 			}
+			if(glConfig.stencilBits)
 			{
 				entity_t tent = *ent;
 				tent.renderfx |= RF_OUTLINE_STENCIL_1;

source/ref_gl/r_skm.c

@@ -1471,11 +1471,11 @@ bool R_AddSkeletalModelToDrawList( const entity_t *e )
 		}
 
 		if( shader ) {
-			 int order = 0;
-			 if( shader->sort == SHADER_SORT_OPAQUE ) {
-			 		order = R_PackOpaqueOrder(e, shader, false, false);
-			 }
-			 R_AddSurfToDrawList( rn.meshlist, e, fog, shader, distance, order, NULL, skmodel->drawSurfs + i );
+			int order = 0;
+			if( shader->sort == SHADER_SORT_OPAQUE ) {
+				order = R_PackOpaqueOrder( e, shader, false, false );
+			}
+			R_AddSurfToDrawList( rn.meshlist, e, fog, shader, distance, order, NULL, skmodel->drawSurfs + i );
 		}
 	}