Fix sun flare with sky portals. Sun flare must be inside sky portal.

reaction/Reaction-ChangeLog

@@ -1,3 +1,4 @@
+- Fix sun flare with sky portals.  Sun flare must be inside sky portal.
 - Speed up tone mapping
 - Add fast light shader path when r_normalMapping and r_specularMapping are 0
 - Revise FBO blitting code (Still needs more work)

reaction/code/renderergl2/tr_backend.c

@@ -227,12 +227,16 @@ void GL_State( unsigned long stateBits )
 	//
 	// check depthFunc bits
 	//
-	if ( diff & GLS_DEPTHFUNC_EQUAL )
+	if ( diff & GLS_DEPTHFUNC_BITS )
 	{
 		if ( stateBits & GLS_DEPTHFUNC_EQUAL )
 		{
 			qglDepthFunc( GL_EQUAL );
 		}
+		else if ( stateBits & GLS_DEPTHFUNC_GREATER)
+		{
+			qglDepthFunc( GL_GREATER );
+		}
 		else
 		{
 			qglDepthFunc( GL_LEQUAL );
@@ -533,7 +537,7 @@ void RB_BeginDrawingView (void) {
 	backEnd.skyRenderedThisView = qfalse;
 
 #ifdef REACTION
-	backEnd.hasSunFlare = qfalse;
+	backEnd.viewHasSunFlare = qfalse;
 #endif
 
 	// clip to the plane of the portal
@@ -687,12 +691,11 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 						qglClear( GL_COLOR_BUFFER_BIT );
 
 						qglDepthRange(1.f, 1.f);
-						if (glRefConfig.occlusionQuery && !inQuery && !backEnd.hasSunFlare) {
+						if (glRefConfig.occlusionQuery && !inQuery && !backEnd.viewHasSunFlare) {
 							inQuery = qtrue;
 							tr.sunFlareQueryActive[tr.sunFlareQueryIndex] = qtrue;
 							qglBeginQueryARB(GL_SAMPLES_PASSED_ARB, tr.sunFlareQuery[tr.sunFlareQueryIndex]);
 						}
-						//backEnd.hasSunFlare = qtrue;
 						sunflare = qtrue;
 					} else {
 						depthRange = qtrue;
@@ -794,6 +797,17 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 		inQuery = qfalse;
 		qglEndQueryARB(GL_SAMPLES_PASSED_ARB);
 	}
+#ifdef REACTION
+	// HACK: flip Z and render black to god rays buffer
+	if (backEnd.frameHasSunFlare)
+	{
+		vec4_t black;
+		VectorSet4(black, 0, 0, 0, 1);
+		qglDepthRange (1, 1);
+		FBO_BlitFromTexture(tr.whiteImage, NULL, NULL, tr.godRaysFbo, NULL, NULL, black, GLS_DEPTHFUNC_GREATER);
+	}
+#endif
+
 	FBO_Bind(fbo);
 
 	// go back to the world modelview matrix
@@ -1405,6 +1419,9 @@ const void	*RB_SwapBuffers( const void *data ) {
 
 	backEnd.framePostProcessed = qfalse;
 	backEnd.projection2D = qfalse;
+#ifdef REACTION
+	backEnd.frameHasSunFlare = qfalse;
+#endif
 
 	return (const void *)(cmd + 1);
 }

reaction/code/renderergl2/tr_fbo.c

@@ -701,7 +701,7 @@ void FBO_BlitFromTexture(struct image_s *src, vec4i_t inSrcBox, vec2_t inSrcTexS
 	invTexRes[0] = 1.0f / src->width  * srcTexScale[0];
 	invTexRes[1] = 1.0f / src->height * srcTexScale[1];
 
-	GL_State( blend | GLS_DEPTHTEST_DISABLE );
+	GL_State( blend );
 
 	RB_InstantQuad2(quadVerts, texCoords, color, shaderProgram, invTexRes);
 }
@@ -726,7 +726,7 @@ void FBO_Blit(FBO_t *src, vec4i_t inSrcBox, vec2_t srcTexScale, FBO_t *dst, vec4
 		VectorSet4(srcBox, 0, src->height, src->width, -src->height);
 	}
 
-	FBO_BlitFromTexture(src->colorImage[0], srcBox, srcTexScale, dst, dstBox, shaderProgram, color, blend);
+	FBO_BlitFromTexture(src->colorImage[0], srcBox, srcTexScale, dst, dstBox, shaderProgram, color, blend | GLS_DEPTHTEST_DISABLE);
 }
 
 void FBO_FastBlit(FBO_t *src, vec4i_t srcBox, FBO_t *dst, vec4i_t dstBox, int buffers, int filter)

reaction/code/renderergl2/tr_local.h

@@ -1675,7 +1675,8 @@ typedef struct {
 
 #ifdef REACTION
 	vec3_t					sunFlarePos;
-	qboolean				hasSunFlare;
+	qboolean				viewHasSunFlare;
+	qboolean                frameHasSunFlare;
 #endif
 
 	qboolean	projection2D;	// if qtrue, drawstretchpic doesn't need to change modes
@@ -2116,6 +2117,8 @@ void	GL_Cull( int cullType );
 
 #define GLS_DEPTHTEST_DISABLE					0x00010000
 #define GLS_DEPTHFUNC_EQUAL						0x00020000
+#define GLS_DEPTHFUNC_GREATER                   0x00040000
+#define GLS_DEPTHFUNC_BITS                      0x00060000
 
 #define GLS_ATEST_GT_0							0x10000000
 #define GLS_ATEST_LT_80							0x20000000

reaction/code/renderergl2/tr_postprocess.c

@@ -296,7 +296,7 @@ void RB_GodRays(void)
 	matrix_t mvp;
 	vec4_t pos, hpos;
 
-	if (!backEnd.hasSunFlare)
+	if (!backEnd.viewHasSunFlare)
 		return;
 
 	VectorSubtract(backEnd.sunFlarePos, backEnd.viewParms.or.origin, dir);
@@ -473,7 +473,7 @@ void RB_GaussianBlur(float blur)
 		VectorSet4(srcBox, 0, 0, tr.whiteImage->width, tr.whiteImage->height);
 		VectorSet4(dstBox, 0, 0, tr.textureScratchFbo[0]->width, tr.textureScratchFbo[0]->height);
 		qglColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_TRUE);
-		FBO_BlitFromTexture(tr.whiteImage, srcBox, texScale, tr.textureScratchFbo[0], dstBox, &tr.textureColorShader, color, 0);
+		FBO_BlitFromTexture(tr.whiteImage, srcBox, texScale, tr.textureScratchFbo[0], dstBox, &tr.textureColorShader, color, GLS_DEPTHTEST_DISABLE);
 		qglColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
 
 		// blur the tiny buffer horizontally and vertically

reaction/code/renderergl2/tr_surface.c

@@ -297,7 +297,7 @@ static void RB_SurfaceSprite( void ) {
 #ifdef REACTION
 	if (ent->e.renderfx & RF_SUNFLARE)
 	{
-		if (backEnd.hasSunFlare)
+		if (backEnd.viewHasSunFlare)
 		{
 			ri.Printf(PRINT_WARNING, "Multiple sun flares not supported\n");
 			return;
@@ -307,7 +307,8 @@ static void RB_SurfaceSprite( void ) {
 		colors[0] = colors[1] = colors[2] = colors[3] = ent->e.shaderRGBA[glRefConfig.framebufferObject] / 255.0f;
 		if (colors[0] == 0)
 			return;
-		backEnd.hasSunFlare = qtrue;
+		backEnd.viewHasSunFlare = qtrue;
+		backEnd.frameHasSunFlare = qtrue;
 	}
 	else
 #endif