zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-25 21:41:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Somehow fix lightmaps being corrupted in debug build

Browse source
This commit is contained in:
RaveYard 2023-09-10 21:49:00 +02:00 committed by Christoph Oelckers
parent f9580f081e
commit 9b3a3c6115
5 changed files with 47 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
src/common/rendering/vulkan/accelstructs/vk_lightmap.cpp
View file

@ -54,7 +54,6 @@ void VkLightmap::Raytrace(LevelMesh* level, const TArray<LevelMeshSurface*>& sur
{
bool newLevel = (mesh != level);
mesh = level;
if (newLevel)
{
UpdateAccelStructDescriptors();
@ -63,62 +62,65 @@ void VkLightmap::Raytrace(LevelMesh* level, const TArray<LevelMeshSurface*>& sur
lightmapRaytraceLast.Reset();
}
lightmapRaytrace.active = true;
lightmapRaytraceLast.active = true;
if (surfaces.Size())
{
lightmapRaytrace.active = true;
lightmapRaytraceLast.active = true;
lightmapRaytrace.Clock();
lightmapRaytraceLast.ResetAndClock();
lightmapRaytrace.Clock();
lightmapRaytraceLast.ResetAndClock();
CreateAtlasImages(surfaces);
CreateAtlasImages(surfaces);
#if 0 // SmoothGroups
TArray<int> allSurfaces;
TArray<int> allSurfaces;
std::set<int> s;
std::set<int> s;
for (auto& surface : surfaceIndices)
{
s.insert(mesh->GetSurface(surface)->smoothingGroupIndex);
}
for (int i = 0, count = level->GetSurfaceCount(); i < count; ++i)
{
auto surface = level->GetSurface(i);
if (s.find(surface->smoothingGroupIndex) != s.end())
for (auto& surface : surfaceIndices)
{
allSurfaces.Push(i);
surface->needsUpdate = false;
s.insert(mesh->GetSurface(surface)->smoothingGroupIndex);
}
for (int i = 0, count = level->GetSurfaceCount(); i < count; ++i)
{
auto surface = level->GetSurface(i);
if (s.find(surface->smoothingGroupIndex) != s.end())
{
allSurfaces.Push(i);
surface->needsUpdate = false;
}
}
}
#else
const auto& allSurfaces = surfaces;
const auto& allSurfaces = surfaces;
#endif
UploadUniforms();
UploadUniforms();
lastSurfaceCount = allSurfaces.Size();
lastSurfaceCount = allSurfaces.Size();
for (size_t pageIndex = 0; pageIndex < atlasImages.size(); pageIndex++)
{
if (atlasImages[pageIndex].pageMaxX && atlasImages[pageIndex].pageMaxY)
for (size_t pageIndex = 0; pageIndex < atlasImages.size(); pageIndex++)
{
RenderAtlasImage(pageIndex, allSurfaces);
if (atlasImages[pageIndex].pageMaxX && atlasImages[pageIndex].pageMaxY)
{
RenderAtlasImage(pageIndex, allSurfaces);
}
}
}
for (size_t pageIndex = 0; pageIndex < atlasImages.size(); pageIndex++)
{
if (atlasImages[pageIndex].pageMaxX && atlasImages[pageIndex].pageMaxY)
for (size_t pageIndex = 0; pageIndex < atlasImages.size(); pageIndex++)
{
ResolveAtlasImage(pageIndex);
BlurAtlasImage(pageIndex);
CopyAtlasImageResult(pageIndex, allSurfaces);
if (atlasImages[pageIndex].pageMaxX && atlasImages[pageIndex].pageMaxY)
{
ResolveAtlasImage(pageIndex);
BlurAtlasImage(pageIndex);
CopyAtlasImageResult(pageIndex, allSurfaces);
}
}
}
lightmapRaytrace.Unclock();
lightmapRaytraceLast.Unclock();
lightmapRaytrace.Unclock();
lightmapRaytraceLast.Unclock();
}
}
void VkLightmap::RenderAtlasImage(size_t pageIndex, const TArray<LevelMeshSurface*>& surfaces)
@ -272,7 +274,7 @@ void VkLightmap::CreateAtlasImages(const TArray<LevelMeshSurface*>& surfaces)
LevelMeshSurface* surface = surfaces[i];
//for (int i = 0, count = mesh->GetSurfaceCount(); i < count; i++)
//{
//LevelMeshSurface* surface = mesh->GetSurface(i);
// LevelMeshSurface* surface = mesh->GetSurface(i);
auto result = packer.insert(surface->texWidth + 2, surface->texHeight + 2);
surface->lightmapperAtlasX = result.pos.x + 1;

2
src/rendering/hwrenderer/doom_levelmesh.cpp
View file

@ -369,8 +369,6 @@ void DoomLevelMesh::BindLightmapSurfacesToGeometry(FLevelLocals& doomMap)
{
surface.TexCoords = (float*)&LightmapUvs[surface.startUvIndex];
surface.LightmapNum = surface.atlasPageIndex;
if (surface.Type == ST_FLOOR || surface.Type == ST_CEILING)
{
surface.Subsector = &doomMap.subsectors[surface.typeIndex];

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

@ -16,10 +16,9 @@ struct FLevelLocals;
struct DoomLevelMeshSurface : public LevelMeshSurface
{
subsector_t* Subsector;
side_t* Side;
sector_t* ControlSector;
uint32_t LightmapNum; // To do: same as atlasPageIndex. Delete one of them!
subsector_t* Subsector = nullptr;
side_t* Side = nullptr;
sector_t* ControlSector = nullptr;
float* TexCoords;
};

2
src/rendering/hwrenderer/hw_vertexbuilder.cpp
View file

@ -243,7 +243,7 @@ static int CreateIndexedSectorVerticesLM(FRenderState& renderstate, sector_t* se
if (lightmap && lightmap->Type != ST_UNKNOWN) // lightmap may be missing if the subsector is degenerate triangle
{
float* luvs = lightmap->TexCoords;
int lindex = lightmap->LightmapNum;
int lindex = lightmap->atlasPageIndex;
for (unsigned int j = 0; j < sub->numlines; j++)
{
SetFlatVertex(vbo_shadowdata[vi + pos], sub->firstline[j].v1, plane, luvs[j * 2], luvs[j * 2 + 1], lindex);

4
src/rendering/hwrenderer/scene/hw_walls.cpp
View file

@ -1019,7 +1019,7 @@ bool HWWall::SetWallCoordinates(seg_t * seg, FTexCoordInfo *tci, float textureto
if (lightmap && lightmap->Type != ST_UNKNOWN)
{
srclightuv = (texcoord*)lightmap->TexCoords;
lindex = (float)lightmap->LightmapNum;
lindex = (float)lightmap->atlasPageIndex;
}
else
{
@ -1725,7 +1725,7 @@ void HWWall::BuildFFBlock(HWDrawInfo *di, FRenderState& state, seg_t * seg, F3DF
if (lightmap && lightmap->Type != ST_UNKNOWN)
{
srclightuv = (texcoord*)lightmap->TexCoords;
lindex = (float)lightmap->LightmapNum;
lindex = (float)lightmap->atlasPageIndex;
}
else
{