OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Move more code into the correct managers

Browse source
This commit is contained in:
Magnus Norddahl 2022-06-11 04:31:06 +02:00 • committed by Christoph Oelckers
commit ba88303527
21 changed files with 267 additions and 250 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/common/rendering/vulkan/system/vk_framebuffer.cpp
View file

@ -138,7 +138,7 @@ void VulkanFrameBuffer::InitializeState()
mViewpoints = new HWViewpointBuffer;
mLights = new FLightBuffer();
mShaderManager.reset(new VkShaderManager(device));
mShaderManager.reset(new VkShaderManager(this));
mDescriptorSetManager->Init();
#ifdef __APPLE__
mRenderState.reset(new VkRenderStateMolten(this));
@ -472,8 +472,7 @@ void VulkanFrameBuffer::InitLightmap(int LMTextureSize, int LMTextureCount, TArr
barrier.addImage(&lightmap, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, false, 0, count);
barrier.execute(cmdbuffer);
GetCommands()->FrameTextureUpload.Buffers.push_back(std::move(stagingBuffer));
GetCommands()->FrameTextureUpload.TotalSize += totalSize;
GetCommands()->TransferDeleteList->Add(std::move(stagingBuffer));
LMTextureData.Reset(); // We no longer need this, release the memory
}