OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Sort initial draw lists by pipeline

Browse source 
Fix applying pipeline state too often for scattered draw ranges
Delay updating sides and sectors until frame start to allow the playsim to mark surfaces dirty multiple times
This commit is contained in:
Magnus Norddahl 2024-08-28 19:53:12 +02:00
commit d12cd4d74d
7 changed files with 251 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/rendering/hwrenderer/doom_levelmesh.h
View file

@ -50,6 +50,14 @@ struct GeometryFreeInfo
bool IsPortal = false;
};
struct DrawRangeInfo
{
int PipelineID = 0;
bool IsPortal = false;
int DrawIndexStart = 0;
int DrawIndexCount = 0;
};
struct SideSurfaceBlock
{
int FirstSurface = -1;
@ -57,6 +65,8 @@ struct SideSurfaceBlock
TArray<UniformsAllocInfo> Uniforms;
TArray<HWWall> WallPortals;
bool InSidePortalsList = false;
TArray<DrawRangeInfo> DrawRanges;
bool InUpdateList = false;
};
struct FlatSurfaceBlock
@ -64,6 +74,8 @@ struct FlatSurfaceBlock
int FirstSurface = -1;
TArray<GeometryFreeInfo> Geometries;
TArray<UniformsAllocInfo> Uniforms;
TArray<DrawRangeInfo> DrawRanges;
bool InUpdateList = false;
};
class DoomLevelMesh : public LevelMesh, public UpdateLevelMesh
@ -105,12 +117,22 @@ public:
DoomSurfaceInfos.Resize(limits.MaxSurfaces);
}
struct Stats
{
int FlatsUpdated = 0;
int SidesUpdated = 0;
};
Stats LastFrameStats, CurFrameStats;
private:
void CreateSurfaces(FLevelLocals& doomMap);
void CreateLightList(FLevelLocals& doomMap, int surfaceIndex);
void UpdateSide(FLevelLocals& doomMap, unsigned int sideIndex);
void UpdateFlat(FLevelLocals& doomMap, unsigned int sectorIndex);
void UpdateSide(unsigned int sideIndex);
void UpdateFlat(unsigned int sectorIndex);
void CreateSide(FLevelLocals& doomMap, unsigned int sideIndex);
void CreateFlat(FLevelLocals& doomMap, unsigned int sectorIndex);
void FreeSide(FLevelLocals& doomMap, unsigned int sideIndex);
void FreeFlat(FLevelLocals& doomMap, unsigned int sectorIndex);
@ -133,6 +155,10 @@ private:
int GetLightIndex(FDynamicLight* light, int portalgroup);
void AddToDrawList(TArray<DrawRangeInfo>& drawRanges, int pipelineID, int indexStart, int indexCount, bool isPortal);
void RemoveFromDrawList(const TArray<DrawRangeInfo>& drawRanges);
void SortDrawLists();
TArray<DoomSurfaceInfo> DoomSurfaceInfos;
TArray<std::unique_ptr<DoomSurfaceInfo* []>> PolyDoomSurfaceInfos;
@ -140,6 +166,9 @@ private:
TArray<FlatSurfaceBlock> Flats;
TArray<side_t*> PolySides;
TArray<int> SideUpdateList;
TArray<int> FlatUpdateList;
std::map<LightmapTileBinding, int> bindings;
MeshBuilder state;
bool LightsCreated = false;