OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Implement drawing HWWall portals using the level mesh and occlusion queries

Browse source
This commit is contained in:
Magnus Norddahl 2023-12-04 12:20:31 +01:00
commit 86ac07f2f8
11 changed files with 141 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/common/rendering/hwrenderer/data/hw_renderstate.h
View file

@ -691,9 +691,10 @@ public:
// Draw level mesh
virtual void DrawLevelMeshDepthPass() { }
virtual void DrawLevelMeshOpaquePass() { }
virtual int GetNextQueryIndex() { return 0; }
virtual void BeginQuery() { }
virtual void EndQuery() { }
virtual void GetQueryResults(TArray<bool>& results) { }
virtual void GetQueryResults(int start, int count, TArray<bool>& results) { }
friend class Mesh;
};

4
src/common/rendering/vulkan/buffers/vk_rsbuffers.cpp
View file

@ -105,6 +105,10 @@ VkRSBuffers::VkRSBuffers(VulkanRenderDevice* fb)
.Create(fb->GetDevice());
Fogballbuffer.Data = Fogballbuffer.UBO->Map(0, Fogballbuffer.UBO->size);
OcclusionQuery.QueryPool = QueryPoolBuilder()
.QueryType(VK_QUERY_TYPE_OCCLUSION, OcclusionQuery.MaxQueries)
.Create(fb->GetDevice());
}
VkRSBuffers::~VkRSBuffers()

7
src/common/rendering/vulkan/buffers/vk_rsbuffers.h
View file

@ -61,6 +61,13 @@ public:
std::unique_ptr<VkMatrixBufferWriter> MatrixBuffer;
std::unique_ptr<VkSurfaceUniformsBufferWriter> SurfaceUniformsBuffer;
struct
{
const int MaxQueries = 64000;
std::unique_ptr<VulkanQueryPool> QueryPool;
int NextIndex = 0;
} OcclusionQuery;
};
class VkStreamBuffer

31
src/common/rendering/vulkan/vk_renderstate.cpp
View file

@ -740,8 +740,9 @@ void VkRenderState::BeginFrame()
mRSBuffers->Lightbuffer.UploadIndex = 0;
mRSBuffers->Bonebuffer.UploadIndex = 0;
mRSBuffers->Fogballbuffer.UploadIndex = 0;
mRSBuffers->OcclusionQuery.NextIndex = 0;
mNextOcclusionQueryIndex = 0;
fb->GetCommands()->GetDrawCommands()->resetQueryPool(mRSBuffers->OcclusionQuery.QueryPool.get(), 0, mRSBuffers->OcclusionQuery.MaxQueries);
}
void VkRenderState::EndRenderPass()
@ -862,12 +863,14 @@ void VkRenderState::DrawLevelMeshDepthPass()
pipelineKey.ShaderKey.NoFragmentShader = true;
DrawLevelMeshRange(mCommandBuffer, pipelineKey, range.Start, range.Count);
}
/*
for (LevelSubmeshDrawRange& range : submesh->PortalList)
{
VkPipelineKey pipelineKey = fb->GetLevelMeshPipelineKey(range.PipelineID);
pipelineKey.ShaderKey.NoFragmentShader = true;
DrawLevelMeshRange(mCommandBuffer, pipelineKey, range.Start, range.Count);
}
*/
}
void VkRenderState::DrawLevelMeshOpaquePass()
@ -883,18 +886,34 @@ void VkRenderState::DrawLevelMeshOpaquePass()
void VkRenderState::BeginQuery()
{
// mCommandBuffer->beginQuery(mNextOcclusionQueryIndex++);
mCommandBuffer->beginQuery(mRSBuffers->OcclusionQuery.QueryPool.get(), mRSBuffers->OcclusionQuery.NextIndex++, 0);
}
void VkRenderState::EndQuery()
{
// mCommandBuffer->endQuery(mNextOcclusionQueryIndex - 1);
mCommandBuffer->endQuery(mRSBuffers->OcclusionQuery.QueryPool.get(), mRSBuffers->OcclusionQuery.NextIndex - 1);
}
void VkRenderState::GetQueryResults(TArray<bool>& results)
int VkRenderState::GetNextQueryIndex()
{
//vkGetQueryPoolResults(fb->GetDevice()->device, ...)
results.Clear();
return mRSBuffers->OcclusionQuery.NextIndex;
}
void VkRenderState::GetQueryResults(int queryStart, int queryCount, TArray<bool>& results)
{
fb->GetCommands()->FlushCommands(false);
mQueryResultsBuffer.Resize(queryCount);
VkResult result = vkGetQueryPoolResults(fb->GetDevice()->device, mRSBuffers->OcclusionQuery.QueryPool->pool, queryStart, queryCount, mQueryResultsBuffer.Size() * sizeof(uint32_t), mQueryResultsBuffer.Data(), sizeof(uint32_t), VK_QUERY_RESULT_WAIT_BIT);
CheckVulkanError(result, "Could not query occlusion query results");
if (result == VK_NOT_READY)
VulkanError("Occlusion query results returned VK_NOT_READY!");
results.Resize(queryCount);
for (int i = 0; i < queryCount; i++)
{
results[i] = mQueryResultsBuffer[i] != 0;
}
}
void VkRenderState::DrawLevelMeshRange(VulkanCommandBuffer* cmdbuffer, const VkPipelineKey& pipelineKey, int start, int count)

7
src/common/rendering/vulkan/vk_renderstate.h
View file

@ -59,9 +59,10 @@ public:
// Draw level mesh
void DrawLevelMeshDepthPass() override;
void DrawLevelMeshOpaquePass() override;
int GetNextQueryIndex() override;
void BeginQuery() override;
void EndQuery() override;
void GetQueryResults(TArray<bool>& results) override;
void GetQueryResults(int start, int count, TArray<bool>& results) override;
// Worker threads
void FlushCommands() override { EndRenderPass(); }
@ -119,8 +120,6 @@ protected:
int mColorMask = 15;
int mCullMode = 0;
int mNextOcclusionQueryIndex = 0;
PushConstants mPushConstants = {};
uint32_t mLastViewpointOffset = 0xffffffff;
@ -150,6 +149,8 @@ protected:
VkSampleCountFlagBits Samples = VK_SAMPLE_COUNT_1_BIT;
int DrawBuffers = 1;
} mRenderTarget;
TArray<uint32_t> mQueryResultsBuffer;
};
class VkRenderStateMolten : public VkRenderState