OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Initialize lightmap texture in SetLevelMesh

Browse source 
Create VkLightmap class on VulkanRenderDevice
This commit is contained in:
Magnus Norddahl 2023-09-01 00:03:18 +02:00
commit cff50b8087
15 changed files with 125 additions and 200 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,6 @@
#include "halffloat.h"
#include "filesystem.h"
VkLightmap::VkLightmap(VulkanRenderDevice* fb) : fb(fb)
{
useRayQuery = fb->GetDevice()->PhysicalDevice.Features.RayQuery.rayQuery;
@ -94,9 +93,9 @@ void VkLightmap::RenderAtlasImage(size_t pageIndex)
};
beginPass();
for (size_t i = 0; i < mesh->surfaces.size(); i++)
for (unsigned int i = 0; i < mesh->Surfaces.Size(); i++)
{
hwrenderer::Surface* targetSurface = mesh->surfaces[i].get();
hwrenderer::Surface* targetSurface = &mesh->Surfaces[i];
if (targetSurface->atlasPageIndex != pageIndex)
continue;
@ -122,8 +121,6 @@ void VkLightmap::RenderAtlasImage(size_t pageIndex)
int vertexCount = (int)surface->verts.Size();
if (lights.Pos + lightCount > lights.BufferSize || vertices.Pos + vertexCount > vertices.BufferSize)
{
printf(".");
// Flush scene buffers
FinishCommands();
lights.Pos = 0;
@ -133,8 +130,6 @@ void VkLightmap::RenderAtlasImage(size_t pageIndex)
BeginCommands();
beginPass();
printf(".");
if (lights.Pos + lightCount > lights.BufferSize)
{
throw std::runtime_error("SceneLightBuffer is too small!");
@ -199,9 +194,9 @@ void VkLightmap::CreateAtlasImages()
const int spacing = 3; // Note: the spacing is here to avoid that the resolve sampler finds data from other surface tiles
RectPacker packer(atlasImageSize, atlasImageSize, RectPacker::Spacing(spacing));
for (size_t i = 0; i < mesh->surfaces.size(); i++)
for (unsigned int i = 0; i < mesh->Surfaces.Size(); i++)
{
hwrenderer::Surface* surface = mesh->surfaces[i].get();
hwrenderer::Surface* surface = &mesh->Surfaces[i];
auto result = packer.insert(surface->texWidth + 2, surface->texHeight + 2);
surface->atlasX = result.pos.x + 1;
@ -308,9 +303,9 @@ void VkLightmap::DownloadAtlasImage(size_t pageIndex)
hvec4* pixels = (hvec4*)atlasImages[pageIndex].Transfer->Map(0, atlasImageSize * atlasImageSize * sizeof(hvec4));
for (size_t i = 0; i < mesh->surfaces.size(); i++)
for (unsigned int i = 0; i < mesh->Surfaces.Size(); i++)
{
hwrenderer::Surface* surface = mesh->surfaces[i].get();
hwrenderer::Surface* surface = &mesh->Surfaces[i];
if (surface->atlasPageIndex != pageIndex)
continue;