OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- create an array for the stream data

Browse source
This commit is contained in:
Magnus Norddahl 2019-03-02 23:20:29 +01:00
commit 0c9d27d078
8 changed files with 91 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/rendering/vulkan/system/vk_device.cpp
View file

@ -50,7 +50,7 @@ extern HWND Window;
EXTERN_CVAR(Bool, vid_vsync);
#ifdef NDEBUG
CVAR(Bool, vk_debug, true, 0); // this should be false, once the oversized model can be removed.
CVAR(Bool, vk_debug, false, 0); // this should be false, once the oversized model can be removed.
#else
CVAR(Bool, vk_debug, true, 0);
#endif

11
src/rendering/vulkan/system/vk_framebuffer.cpp
View file

@ -79,8 +79,7 @@ VulkanFrameBuffer::~VulkanFrameBuffer()
cur->Reset();
delete MatricesUBO;
delete ColorsUBO;
delete GlowingWallsUBO;
delete StreamUBO;
delete mVertexData;
delete mSkyData;
delete mViewpoints;
@ -103,12 +102,10 @@ void VulkanFrameBuffer::InitializeState()
mLights = new FLightBuffer();
// To do: move this to HW renderer interface maybe?
MatricesUBO = (VKDataBuffer*)CreateDataBuffer(1234, false);
ColorsUBO = (VKDataBuffer*)CreateDataBuffer(1234, false);
GlowingWallsUBO = (VKDataBuffer*)CreateDataBuffer(1234, false);
MatricesUBO = (VKDataBuffer*)CreateDataBuffer(-1, false);
StreamUBO = (VKDataBuffer*)CreateDataBuffer(-1, false);
MatricesUBO->SetData(UniformBufferAlignment<::MatricesUBO>() * 50000, nullptr, false);
ColorsUBO->SetData(UniformBufferAlignment<::ColorsUBO>() * 50000, nullptr, false);
GlowingWallsUBO->SetData(UniformBufferAlignment<::GlowingWallsUBO>() * 50000, nullptr, false);
StreamUBO->SetData(UniformBufferAlignment<::StreamUBO>() * 200, nullptr, false);
mShaderManager.reset(new VkShaderManager(device));
mSamplerManager.reset(new VkSamplerManager(device));

3
src/rendering/vulkan/system/vk_framebuffer.h
View file

@ -31,8 +31,7 @@ public:
VKDataBuffer *ViewpointUBO = nullptr;
VKDataBuffer *LightBufferSSO = nullptr;
VKDataBuffer *MatricesUBO = nullptr;
VKDataBuffer *ColorsUBO = nullptr;
VKDataBuffer *GlowingWallsUBO = nullptr;
VKDataBuffer *StreamUBO = nullptr;
std::vector<std::unique_ptr<VulkanBuffer>> mFrameDeleteList;