src/r_main.h

@@ -29,6 +29,10 @@ extern fixed_t centerxfrac, centeryfrac;
 extern fixed_t projection, projectiony;
 extern fixed_t fovtan;
 
+extern INT32 numrendercontexts;
+extern INT32 numusablerendercontexts;
+extern boolean renderthreaded;
+
 // WARNING: a should be unsigned but to add with 2048, it isn't!
 #define AIMINGTODY(a) FixedDiv((FINETANGENT((2048+(((INT32)a)>>ANGLETOFINESHIFT)) & FINEMASK)*160), fovtan)
 
@@ -70,7 +74,6 @@ angle_t R_PointToAngleEx(INT32 x2, INT32 y2, INT32 x1, INT32 y1);
 fixed_t R_PointToDist(fixed_t x, fixed_t y);
 fixed_t R_PointToDist2(fixed_t px2, fixed_t py2, fixed_t px1, fixed_t py1);
 
-fixed_t R_ScaleFromGlobalAngle(angle_t visangle);
 subsector_t *R_PointInSubsector(fixed_t x, fixed_t y);
 subsector_t *R_PointInSubsectorOrNull(fixed_t x, fixed_t y);
 
@@ -78,22 +81,23 @@ boolean R_DoCulling(line_t *cullheight, line_t *viewcullheight, fixed_t vz, fixe
 
 // Render stats
 
-extern precise_t ps_prevframetime;// time when previous frame was rendered
+extern precise_t ps_prevframetime; // time when previous frame was rendered
 extern precise_t ps_rendercalltime;
+extern precise_t ps_postprocesstime;
 extern precise_t ps_uitime;
 extern precise_t ps_swaptime;
 
-extern precise_t ps_bsptime;
+extern precise_t ps_bsptime[MAX_RENDER_THREADS];
 
-extern precise_t ps_sw_spritecliptime;
-extern precise_t ps_sw_portaltime;
-extern precise_t ps_sw_planetime;
-extern precise_t ps_sw_maskedtime;
+extern precise_t ps_sw_spritecliptime[MAX_RENDER_THREADS];
+extern precise_t ps_sw_portaltime[MAX_RENDER_THREADS];
+extern precise_t ps_sw_planetime[MAX_RENDER_THREADS];
+extern precise_t ps_sw_maskedtime[MAX_RENDER_THREADS];
 
-extern int ps_numbspcalls;
-extern int ps_numsprites;
-extern int ps_numdrawnodes;
-extern int ps_numpolyobjects;
+extern int ps_numbspcalls[MAX_RENDER_THREADS];
+extern int ps_numsprites[MAX_RENDER_THREADS];
+extern int ps_numdrawnodes[MAX_RENDER_THREADS];
+extern int ps_numpolyobjects[MAX_RENDER_THREADS];
 
 //
 // REFRESH - the actual rendering functions.
@@ -131,6 +135,8 @@ void R_SkyboxFrame(player_t *player);
 boolean R_ViewpointHasChasecam(player_t *player);
 boolean R_IsViewpointThirdPerson(player_t *player, boolean skybox);
 
+void R_StopThreads(void);
+
 // Called by D_Display.
 void R_RenderPlayerView(player_t *player);
 

src/r_plane.h

@@ -55,52 +55,9 @@ typedef struct visplane_s
 	pslope_t *slope;
 } visplane_t;
 
-extern visplane_t *visplanes[MAXVISPLANES];
-extern visplane_t *floorplane;
-extern visplane_t *ceilingplane;
-
-// Visplane related.
-extern INT16 *lastopening, *openings;
-extern size_t maxopenings;
-
-extern INT16 floorclip[MAXVIDWIDTH], ceilingclip[MAXVIDWIDTH];
-extern fixed_t frontscale[MAXVIDWIDTH], yslopetab[MAXVIDHEIGHT*16];
-extern fixed_t cachedheight[MAXVIDHEIGHT];
-extern fixed_t cacheddistance[MAXVIDHEIGHT];
-extern fixed_t cachedxstep[MAXVIDHEIGHT];
-extern fixed_t cachedystep[MAXVIDHEIGHT];
-
-extern fixed_t *yslope;
-extern lighttable_t **planezlight;
-
-void R_InitPlanes(void);
-void R_ClearPlanes(void);
-void R_ClearFFloorClips (void);
-
-void R_DrawPlanes(void);
-visplane_t *R_FindPlane(fixed_t height, INT32 picnum, INT32 lightlevel, fixed_t xoff, fixed_t yoff, angle_t plangle,
-	extracolormap_t *planecolormap, ffloor_t *ffloor, polyobj_t *polyobj, pslope_t *slope);
-visplane_t *R_CheckPlane(visplane_t *pl, INT32 start, INT32 stop);
-void R_ExpandPlane(visplane_t *pl, INT32 start, INT32 stop);
-void R_PlaneBounds(visplane_t *plane);
-
-void R_CheckFlatLength(size_t size);
-boolean R_CheckPowersOfTwo(void);
-
-// Draws a single visplane.
-void R_DrawSinglePlane(visplane_t *pl);
-
-// Calculates the slope vectors needed for tilted span drawing.
-void R_SetSlopePlane(pslope_t *slope, fixed_t xpos, fixed_t ypos, fixed_t zpos, fixed_t xoff, fixed_t yoff, angle_t angle, angle_t plangle);
-void R_SetScaledSlopePlane(pslope_t *slope, fixed_t xpos, fixed_t ypos, fixed_t zpos, fixed_t xs, fixed_t ys, fixed_t xoff, fixed_t yoff, angle_t angle, angle_t plangle);
-void R_CalculateSlopeVectors(void);
-
-// Sets the slope vector pointers for the current tilted span.
-void R_SetTiltedSpan(INT32 span);
-
 typedef struct planemgr_s
 {
-	visplane_t *plane;
+	struct visplane_s *plane;
 	fixed_t height;
 	fixed_t f_pos; // F for Front sector
 	fixed_t b_pos; // B for Back sector
@@ -117,10 +74,36 @@ typedef struct planemgr_s
 
 	struct ffloor_s *ffloor;
 	polyobj_t *polyobj;
-} visffloor_t;
+} planemgr_t;
+
+// Visplane related.
+extern fixed_t yslopetab[MAXVIDHEIGHT*16];
+extern fixed_t *yslope;
+
+struct planecontext_s;
+struct rendercontext_s;
+struct viewcontext_s;
+
+void R_InitPlanes(void);
+void R_ClearPlanes(struct planecontext_s *context);
+void R_ClearFFloorClips (struct planecontext_s *context);
 
-extern visffloor_t ffloor[MAXFFLOORS];
-extern INT32 numffloors;
+void R_DrawPlanes(struct rendercontext_s *planecontext);
+visplane_t *R_FindPlane(struct planecontext_s *planecontext, struct viewcontext_s *viewcontext,
+	fixed_t height, INT32 picnum, INT32 lightlevel, fixed_t xoff, fixed_t yoff, angle_t plangle,
+	extracolormap_t *planecolormap, ffloor_t *ffloor, polyobj_t *polyobj, pslope_t *slope);
+visplane_t *R_CheckPlane(struct planecontext_s *planecontext, visplane_t *pl, INT32 start, INT32 stop);
+void R_ExpandPlane(visplane_t *pl, INT32 start, INT32 stop);
+void R_PlaneBounds(visplane_t *plane);
+
+// Draws a single visplane.
+void R_DrawSinglePlane(struct rendercontext_s *rendercontext, visplane_t *pl);
+
+// Calculates the slope vectors needed for tilted span drawing.
+void R_SetSlopePlane(pslope_t *slope, spancontext_t *ds, fixed_t xpos, fixed_t ypos, fixed_t zpos, fixed_t xoff, fixed_t yoff, angle_t angle, angle_t plangle);
+void R_SetScaledSlopePlane(pslope_t *slope, spancontext_t *ds, fixed_t xpos, fixed_t ypos, fixed_t zpos, fixed_t xs, fixed_t ys, fixed_t xoff, fixed_t yoff, angle_t angle, angle_t plangle);
+void R_CalculateSlopeVectors(spancontext_t *ds);
 
-void Portal_AddSkyboxPortals (void);
+// Sets the slope vector pointers for the current tilted span.
+void R_SetTiltedSpan(spancontext_t *ds, INT32 span);
 #endif

src/r_portal.h

@@ -41,21 +41,19 @@ typedef struct portal_s
 	fixed_t *frontscale;/**< Temporary screen bottom clipping array. */
 } portal_t;
 
-extern portal_t* portal_base;
-extern portal_t* portal_cap;
-extern UINT8 portalrender;
+struct bspcontext_s;
+struct planecontext_s;
+struct rendercontext_s;
+struct viewcontext_s;
 
-extern line_t *portalclipline;
-extern sector_t *portalcullsector;
-extern INT32 portalclipstart, portalclipend;
+void Portal_InitList	(struct bspcontext_s *bspcontext);
+void Portal_Remove		(struct bspcontext_s *context, portal_t* portal);
+void Portal_Add2Lines	(struct rendercontext_s *context,
+                        const INT32 line1, const INT32 line2, const INT32 x1, const INT32 x2);
+void Portal_AddSkybox	(struct bspcontext_s *bspcontext, struct viewcontext_s *viewcontext, const visplane_t* plane);
 
-void Portal_InitList	(void);
-void Portal_Remove		(portal_t* portal);
-void Portal_Add2Lines	(const INT32 line1, const INT32 line2, const INT32 x1, const INT32 x2);
-void Portal_AddSkybox	(const visplane_t* plane);
+void Portal_ClipRange (struct planecontext_s *planecontext, portal_t* portal);
+void Portal_ClipApply (struct planecontext_s *planecontext, const portal_t* portal);
 
-void Portal_ClipRange (portal_t* portal);
-void Portal_ClipApply (const portal_t* portal);
-
-void Portal_AddSkyboxPortals (void);
+void Portal_AddSkyboxPortals (struct rendercontext_s *context);
 #endif

src/r_segs.h

@@ -18,9 +18,12 @@
 #pragma interface
 #endif
 
+struct rendercontext_s;
+struct wallcontext_s;
+
 transnum_t R_GetLinedefTransTable(fixed_t alpha);
-void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2);
-void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pffloor);
-void R_StoreWallRange(INT32 start, INT32 stop);
+void R_RenderMaskedSegRange(struct rendercontext_s *context, drawseg_t *ds, INT32 x1, INT32 x2);
+void R_RenderThickSideRange(struct rendercontext_s *context, drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pffloor);
+void R_StoreWallRange(struct rendercontext_s *context, struct wallcontext_s *wallcontext, INT32 start, INT32 stop);
 
 #endif

src/r_sky.c

@@ -54,9 +54,6 @@ INT32 globallevelskynum;
 
 	Called at loadlevel after skytexture is set, or when sky texture changes.
 
-	\warning wallcolfunc should be set at R_ExecuteSetViewSize()
-	I don't bother because we don't use low detail anymore
-
 	\return	void
 */
 void R_SetupSkyDraw(void)

src/r_splats.h

@@ -26,7 +26,6 @@ struct rastery_s
 	fixed_t tx1, ty1;   // start points in texture at this line
 	fixed_t tx2, ty2;   // end points in texture at this line
 };
-extern struct rastery_s *prastertab; // for ASM code
 
 typedef struct floorsplat_s
 {
@@ -41,6 +40,8 @@ typedef struct floorsplat_s
 	mobj_t *mobj; // Mobj it is tied to
 } floorsplat_t;
 
-void R_DrawFloorSplat(vissprite_t *spr);
+struct rendercontext_s;
+
+void R_DrawFloorSplat(struct rendercontext_s *context, vissprite_t *spr);
 
 #endif /*__R_SPLATS_H__*/

src/r_state.h

@@ -90,6 +90,8 @@ extern sector_t *viewsector;
 extern player_t *viewplayer;
 extern mobj_t *r_viewmobj;
 
+extern consvar_t cv_numthreads;
+
 extern consvar_t cv_allowmlook;
 extern consvar_t cv_maxportals;
 
@@ -99,10 +101,4 @@ extern angle_t doubleclipangle;
 extern INT32 viewangletox[FINEANGLES/2];
 extern angle_t xtoviewangle[MAXVIDWIDTH+1];
 
-extern fixed_t rw_distance;
-extern angle_t rw_normalangle;
-
-// angle to line origin
-extern angle_t rw_angle1;
-
 #endif

src/sdl/CMakeLists.txt

@@ -128,11 +128,9 @@ if(${SDL2_FOUND})
 		if(${SRB2_CONFIG_YASM})
 			set(ASM_ASSEMBLER_TEMP ${CMAKE_ASM_YASM_COMPILER})
 			set(ASM_ASSEMBLER_OBJFORMAT ${CMAKE_ASM_YASM_OBJECT_FORMAT})
-			set_source_files_properties(${SRB2_NASM_SOURCES} LANGUAGE ASM_YASM)
 		else()
 			set(ASM_ASSEMBLER_TEMP ${CMAKE_ASM_NASM_COMPILER})
 			set(ASM_ASSEMBLER_OBJFORMAT ${CMAKE_ASM_NASM_OBJECT_FORMAT})
-			set_source_files_properties(${SRB2_NASM_SOURCES} LANGUAGE ASM_NASM)
 		endif()
 	endif()