nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

raytrace updates

Browse Source
This commit is contained in:
Turanszki Janos
2018-06-19 21:20:14 +01:00
parent 0b3a89c9b8
commit cdcee162ae
4 changed files with 245 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WickedEngine/TracedRenderableComponent.cpp
+11 -15
View File
@@ -91,6 +91,14 @@ void TracedRenderableComponent::Render()
}
void TracedRenderableComponent::Update(float dt)
{
if (wiRenderer::getCamera()->hasChanged)
{
sam = 0;
}
}
void TracedRenderableComponent::RenderScene(GRAPHICSTHREAD threadID)
{
@@ -98,7 +106,7 @@ void TracedRenderableComponent::RenderScene(GRAPHICSTHREAD threadID)
wiRenderer::UpdateCameraCB(wiRenderer::getCamera(), threadID);
wiRenderer::DrawTracedScene(wiRenderer::getCamera(), traceResult, threadID);
wiRenderer::DrawTracedScene(wiRenderer::getCamera(), traceResult, sam == 0, threadID);
@@ -108,28 +116,16 @@ void TracedRenderableComponent::RenderScene(GRAPHICSTHREAD threadID)
static float sam = 0;
if (wiRenderer::getCamera()->hasChanged)
{
sam = 0;
}
if (GetAsyncKeyState('K') < 0)
{
sam = 0;
}
fx.opacity = 1.0f / (sam + 1.0f);
fx.blendFlag = BLENDMODE_ALPHA;
rtAccumulation.Set(threadID);
wiImage::Draw(traceResult, fx, threadID);
sam++;
//if (wiRenderer::GetTemporalAAEnabled() && !wiRenderer::GetTemporalAADebugEnabled())
//{
// wiRenderer::GetDevice()->EventBegin("Temporal AA Resolve", threadID);
WickedEngine/TracedRenderableComponent.h
+4
View File
@@ -5,6 +5,9 @@
class TracedRenderableComponent :
public Renderable3DComponent
{
private:
float sam = 0;
protected:
wiGraphicsTypes::Texture2D* traceResult = nullptr;
wiRenderTarget rtAccumulation;
@@ -22,6 +25,7 @@ public:
virtual void Initialize() override;
virtual void Load() override;
virtual void Start() override;
virtual void Update(float dt) override;
virtual void Render() override;
virtual void Compose() override;
};
WickedEngine/wiRenderer.cpp
+229 -182
View File
@@ -6329,7 +6329,7 @@ void wiRenderer::GenerateMipChain(Texture3D* texture, MIPGENFILTER filter, GRAPH
GetDevice()->EventEnd(threadID);
}
void wiRenderer::DrawTracedScene(Camera* camera, wiGraphicsTypes::Texture2D* result, GRAPHICSTHREAD threadID)
void wiRenderer::DrawTracedScene(Camera* camera, wiGraphicsTypes::Texture2D* result, bool rebuildBVH, GRAPHICSTHREAD threadID)
{
GraphicsDevice* device = wiRenderer::GetDevice();
@@ -6560,205 +6560,252 @@ void wiRenderer::DrawTracedScene(Camera* camera, wiGraphicsTypes::Texture2D* res
assert(SUCCEEDED(hr));
}
wiProfiler::GetInstance().BeginRange("BVH Rebuild", wiProfiler::DOMAIN_GPU, threadID);
device->EventBegin("BVH - Reset", threadID);
if (rebuildBVH)
{
device->BindComputePSO(CPSO[CSTYPE_BVH_RESET], threadID);
wiProfiler::GetInstance().BeginRange("BVH Rebuild", wiProfiler::DOMAIN_GPU, threadID);
GPUResource* uavs[] = {
clusterCounterBuffer,
bvhNodeBuffer,
bvhAABBBuffer,
};
device->BindUnorderedAccessResourcesCS(uavs, 0, ARRAYSIZE(uavs), threadID);
device->EventBegin("BVH - Reset", threadID);
{
device->BindComputePSO(CPSO[CSTYPE_BVH_RESET], threadID);
device->Dispatch(1, 1, 1, threadID);
GPUResource* uavs[] = {
clusterCounterBuffer,
bvhNodeBuffer,
bvhAABBBuffer,
};
device->BindUnorderedAccessResourcesCS(uavs, 0, ARRAYSIZE(uavs), threadID);
device->Dispatch(1, 1, 1, threadID);
}
device->EventEnd(threadID);
uint32_t totalTriangles = 0;
uint32_t totalMaterials = 0;
device->EventBegin("BVH - Classification", threadID);
{
device->BindComputePSO(CPSO[CSTYPE_BVH_CLASSIFICATION], threadID);
GPUResource* uavs[] = {
triangleBuffer,
clusterCounterBuffer,
clusterIndexBuffer,
clusterMortonBuffer,
clusterOffsetBuffer,
clusterAABBBuffer,
};
device->BindUnorderedAccessResourcesCS(uavs, 0, ARRAYSIZE(uavs), threadID);
for (auto& model : GetScene().models)
{
for (auto& iter : model->objects)
{
Object* object = iter;
Mesh* mesh = object->mesh;
TracedBVHCB cb;
cb.xTraceBVHWorld = object->world;
cb.xTraceBVHMaterialOffset = totalMaterials;
cb.xTraceBVHMeshTriangleOffset = totalTriangles;
cb.xTraceBVHMeshTriangleCount = (uint)mesh->indices.size() / 3;
cb.xTraceBVHMeshVertexPOSStride = sizeof(Mesh::Vertex_POS);
device->UpdateBuffer(constantBuffers[CBTYPE_RAYTRACE_BVH], &cb, threadID);
totalTriangles += cb.xTraceBVHMeshTriangleCount;
device->BindConstantBuffer(CS, constantBuffers[CBTYPE_RAYTRACE_BVH], CB_GETBINDSLOT(TracedBVHCB), threadID);
GPUResource* res[] = {
mesh->indexBuffer,
mesh->vertexBuffer_POS,
mesh->vertexBuffer_TEX,
};
device->BindResources(CS, res, TEXSLOT_ONDEMAND1, ARRAYSIZE(res), threadID);
device->Dispatch((UINT)ceilf((float)cb.xTraceBVHMeshTriangleCount / (float)TRACEDRENDERING_BVH_CLASSIFICATION_GROUPSIZE), 1, 1, threadID);
///// TEMP:
GPUResource* tex[3] = {
wiTextureHelper::getInstance()->getWhite(),
wiTextureHelper::getInstance()->getNormalMapDefault(),
wiTextureHelper::getInstance()->getWhite(),
};
for (auto& subset : mesh->subsets)
{
if (subset.material->texture != nullptr)
{
tex[0] = subset.material->texture;
}
if (subset.material->normalMap != nullptr)
{
tex[1] = subset.material->normalMap;
}
if (subset.material->surfaceMap != nullptr)
{
tex[2] = subset.material->surfaceMap;
}
materialArray[totalMaterials].Create(*subset.material);
totalMaterials++;
}
device->BindResources(CS, tex, TEXSLOT_ONDEMAND4, ARRAYSIZE(tex), threadID);
}
}
device->UAVBarrier(uavs, ARRAYSIZE(uavs), threadID);
device->UnBindUnorderedAccessResources(0, ARRAYSIZE(uavs), threadID);
}
device->EventEnd(threadID);
device->EventBegin("BVH - Sort Cluster Mortons", threadID);
wiGPUSortLib::Sort(maxClusterCount, clusterMortonBuffer, clusterCounterBuffer, 0, clusterIndexBuffer, threadID);
device->EventEnd(threadID);
device->EventBegin("BVH - Kick Jobs", threadID);
{
device->BindComputePSO(CPSO[CSTYPE_BVH_KICKJOBS], threadID);
GPUResource* uavs[] = {
indirectBuffer,
};
device->BindUnorderedAccessResourcesCS(uavs, 0, ARRAYSIZE(uavs), threadID);
GPUResource* res[] = {
clusterCounterBuffer,
clusterAABBBuffer,
};
device->BindResources(CS, res, TEXSLOT_ONDEMAND0, ARRAYSIZE(res), threadID);
device->Dispatch(1, 1, 1, threadID);
device->UAVBarrier(uavs, ARRAYSIZE(uavs), threadID);
device->UnBindUnorderedAccessResources(0, ARRAYSIZE(uavs), threadID);
}
device->EventEnd(threadID);
device->EventBegin("BVH - Cluster Processor", threadID);
{
device->BindComputePSO(CPSO[CSTYPE_BVH_CLUSTERPROCESSOR], threadID);
GPUResource* uavs[] = {
clusterSortedMortonBuffer,
clusterConeBuffer,
};
device->BindUnorderedAccessResourcesCS(uavs, 0, ARRAYSIZE(uavs), threadID);
GPUResource* res[] = {
clusterCounterBuffer,
clusterIndexBuffer,
clusterMortonBuffer,
clusterOffsetBuffer,
clusterAABBBuffer,
triangleBuffer,
};
device->BindResources(CS, res, TEXSLOT_ONDEMAND0, ARRAYSIZE(res), threadID);
device->DispatchIndirect(indirectBuffer, ARGUMENTBUFFER_OFFSET_CLUSTERPROCESSOR, threadID);
device->UAVBarrier(uavs, ARRAYSIZE(uavs), threadID);
device->UnBindUnorderedAccessResources(0, ARRAYSIZE(uavs), threadID);
}
device->EventEnd(threadID);
device->EventBegin("BVH - Build Hierarchy", threadID);
{
device->BindComputePSO(CPSO[CSTYPE_BVH_HIERARCHY], threadID);
GPUResource* uavs[] = {
bvhNodeBuffer,
bvhFlagBuffer,
};
device->BindUnorderedAccessResourcesCS(uavs, 0, ARRAYSIZE(uavs), threadID);
GPUResource* res[] = {
clusterCounterBuffer,
clusterSortedMortonBuffer,
};
device->BindResources(CS, res, TEXSLOT_ONDEMAND0, ARRAYSIZE(res), threadID);
device->DispatchIndirect(indirectBuffer, ARGUMENTBUFFER_OFFSET_HIERARCHY, threadID);
device->UAVBarrier(uavs, ARRAYSIZE(uavs), threadID);
device->UnBindUnorderedAccessResources(0, ARRAYSIZE(uavs), threadID);
}
device->EventEnd(threadID);
device->EventBegin("BVH - Propagate AABB", threadID);
{
device->BindComputePSO(CPSO[CSTYPE_BVH_PROPAGATEAABB], threadID);
GPUResource* uavs[] = {
bvhAABBBuffer,
bvhFlagBuffer,
};
device->BindUnorderedAccessResourcesCS(uavs, 0, ARRAYSIZE(uavs), threadID);
GPUResource* res[] = {
clusterCounterBuffer,
clusterIndexBuffer,
clusterAABBBuffer,
bvhNodeBuffer,
};
device->BindResources(CS, res, TEXSLOT_ONDEMAND0, ARRAYSIZE(res), threadID);
device->DispatchIndirect(indirectBuffer, ARGUMENTBUFFER_OFFSET_HIERARCHY, threadID);
device->UAVBarrier(uavs, ARRAYSIZE(uavs), threadID);
device->UnBindUnorderedAccessResources(0, ARRAYSIZE(uavs), threadID);
}
device->EventEnd(threadID);
wiProfiler::GetInstance().EndRange(threadID); // BVH rebuild
}
device->EventEnd(threadID);
// Gather scene properties:
uint32_t totalTriangles = 0;
uint32_t totalMaterials = 0;
device->EventBegin("BVH - Classification", threadID);
for (auto& model : GetScene().models)
{
device->BindComputePSO(CPSO[CSTYPE_BVH_CLASSIFICATION], threadID);
GPUResource* uavs[] = {
triangleBuffer,
clusterCounterBuffer,
clusterIndexBuffer,
clusterMortonBuffer,
clusterOffsetBuffer,
clusterAABBBuffer,
};
device->BindUnorderedAccessResourcesCS(uavs, 0, ARRAYSIZE(uavs), threadID);
for (auto& model : GetScene().models)
for (auto& iter : model->objects)
{
for (auto& iter : model->objects)
Object* object = iter;
Mesh* mesh = object->mesh;
totalTriangles += (uint)mesh->indices.size() / 3;
///// TEMP:
GPUResource* tex[3] = {
wiTextureHelper::getInstance()->getWhite(),
wiTextureHelper::getInstance()->getNormalMapDefault(),
wiTextureHelper::getInstance()->getWhite(),
};
for (auto& subset : mesh->subsets)
{
Object* object = iter;
Mesh* mesh = object->mesh;
TracedBVHCB cb;
cb.xTraceBVHWorld = object->world;
cb.xTraceBVHMaterialOffset = totalMaterials;
cb.xTraceBVHMeshTriangleOffset = totalTriangles;
cb.xTraceBVHMeshTriangleCount = (uint)mesh->indices.size() / 3;
cb.xTraceBVHMeshVertexPOSStride = sizeof(Mesh::Vertex_POS);
device->UpdateBuffer(constantBuffers[CBTYPE_RAYTRACE_BVH], &cb, threadID);
totalTriangles += cb.xTraceBVHMeshTriangleCount;
device->BindConstantBuffer(CS, constantBuffers[CBTYPE_RAYTRACE_BVH], CB_GETBINDSLOT(TracedBVHCB), threadID);
GPUResource* res[] = {
mesh->indexBuffer,
mesh->vertexBuffer_POS,
mesh->vertexBuffer_TEX,
};
device->BindResources(CS, res, TEXSLOT_ONDEMAND1, ARRAYSIZE(res), threadID);
device->Dispatch((UINT)ceilf((float)cb.xTraceBVHMeshTriangleCount / (float)TRACEDRENDERING_BVH_CLASSIFICATION_GROUPSIZE), 1, 1, threadID);
///// TEMP:
GPUResource* tex[3] = {
wiTextureHelper::getInstance()->getWhite(),
wiTextureHelper::getInstance()->getNormalMapDefault(),
wiTextureHelper::getInstance()->getWhite(),
};
for (auto& subset : mesh->subsets)
if (subset.material->texture != nullptr)
{
if (subset.material->texture != nullptr)
{
tex[0] = subset.material->texture;
}
if (subset.material->normalMap != nullptr)
{
tex[1] = subset.material->normalMap;
}
if (subset.material->surfaceMap != nullptr)
{
tex[2] = subset.material->surfaceMap;
}
materialArray[totalMaterials].Create(*subset.material);
totalMaterials++;
tex[0] = subset.material->texture;
}
device->BindResources(CS, tex, TEXSLOT_ONDEMAND4, ARRAYSIZE(tex), threadID);
if (subset.material->normalMap != nullptr)
{
tex[1] = subset.material->normalMap;
}
if (subset.material->surfaceMap != nullptr)
{
tex[2] = subset.material->surfaceMap;
}
materialArray[totalMaterials].Create(*subset.material);
totalMaterials++;
}
device->BindResources(CS, tex, TEXSLOT_ONDEMAND4, ARRAYSIZE(tex), threadID);
}
device->UAVBarrier(uavs, ARRAYSIZE(uavs), threadID);
device->UnBindUnorderedAccessResources(0, ARRAYSIZE(uavs), threadID);
}
device->EventEnd(threadID);
device->EventBegin("BVH - Sort Cluster Mortons", threadID);
wiGPUSortLib::Sort(maxClusterCount, clusterMortonBuffer, clusterCounterBuffer, 0, clusterIndexBuffer, threadID);
device->EventEnd(threadID);
device->EventBegin("BVH - Kick Jobs", threadID);
{
device->BindComputePSO(CPSO[CSTYPE_BVH_KICKJOBS], threadID);
GPUResource* uavs[] = {
indirectBuffer,
};
device->BindUnorderedAccessResourcesCS(uavs, 0, ARRAYSIZE(uavs), threadID);
GPUResource* res[] = {
clusterCounterBuffer,
clusterAABBBuffer,
};
device->BindResources(CS, res, TEXSLOT_ONDEMAND0, ARRAYSIZE(res), threadID);
device->Dispatch(1, 1, 1, threadID);
device->UAVBarrier(uavs, ARRAYSIZE(uavs), threadID);
device->UnBindUnorderedAccessResources(0, ARRAYSIZE(uavs), threadID);
}
device->EventEnd(threadID);
device->EventBegin("BVH - Cluster Processor", threadID);
{
device->BindComputePSO(CPSO[CSTYPE_BVH_CLUSTERPROCESSOR], threadID);
GPUResource* uavs[] = {
clusterSortedMortonBuffer,
clusterConeBuffer,
};
device->BindUnorderedAccessResourcesCS(uavs, 0, ARRAYSIZE(uavs), threadID);
GPUResource* res[] = {
clusterCounterBuffer,
clusterIndexBuffer,
clusterMortonBuffer,
clusterOffsetBuffer,
clusterAABBBuffer,
triangleBuffer,
};
device->BindResources(CS, res, TEXSLOT_ONDEMAND0, ARRAYSIZE(res), threadID);
device->DispatchIndirect(indirectBuffer, ARGUMENTBUFFER_OFFSET_CLUSTERPROCESSOR, threadID);
device->UAVBarrier(uavs, ARRAYSIZE(uavs), threadID);
device->UnBindUnorderedAccessResources(0, ARRAYSIZE(uavs), threadID);
}
device->EventEnd(threadID);
device->EventBegin("BVH - Build Hierarchy", threadID);
{
device->BindComputePSO(CPSO[CSTYPE_BVH_HIERARCHY], threadID);
GPUResource* uavs[] = {
bvhNodeBuffer,
bvhFlagBuffer,
};
device->BindUnorderedAccessResourcesCS(uavs, 0, ARRAYSIZE(uavs), threadID);
GPUResource* res[] = {
clusterCounterBuffer,
clusterSortedMortonBuffer,
};
device->BindResources(CS, res, TEXSLOT_ONDEMAND0, ARRAYSIZE(res), threadID);
device->DispatchIndirect(indirectBuffer, ARGUMENTBUFFER_OFFSET_HIERARCHY, threadID);
device->UAVBarrier(uavs, ARRAYSIZE(uavs), threadID);
device->UnBindUnorderedAccessResources(0, ARRAYSIZE(uavs), threadID);
}
device->EventEnd(threadID);
device->EventBegin("BVH - Propagate AABB", threadID);
{
device->BindComputePSO(CPSO[CSTYPE_BVH_PROPAGATEAABB], threadID);
GPUResource* uavs[] = {
bvhAABBBuffer,
bvhFlagBuffer,
};
device->BindUnorderedAccessResourcesCS(uavs, 0, ARRAYSIZE(uavs), threadID);
GPUResource* res[] = {
clusterCounterBuffer,
clusterIndexBuffer,
clusterAABBBuffer,
bvhNodeBuffer,
};
device->BindResources(CS, res, TEXSLOT_ONDEMAND0, ARRAYSIZE(res), threadID);
device->DispatchIndirect(indirectBuffer, ARGUMENTBUFFER_OFFSET_HIERARCHY, threadID);
device->UAVBarrier(uavs, ARRAYSIZE(uavs), threadID);
device->UnBindUnorderedAccessResources(0, ARRAYSIZE(uavs), threadID);
}
device->EventEnd(threadID);
wiProfiler::GetInstance().EndRange(threadID); // BVH rebuild
// Begin raytrace
wiProfiler::GetInstance().BeginRange("RayTrace - ALL", wiProfiler::DOMAIN_GPU, threadID);
WickedEngine/wiRenderer.h
+1 -1
View File
@@ -498,7 +498,7 @@ public:
static void ComputeTiledLightCulling(bool deferred, GRAPHICSTHREAD threadID);
static void ResolveMSAADepthBuffer(wiGraphicsTypes::Texture2D* dst, wiGraphicsTypes::Texture2D* src, GRAPHICSTHREAD threadID);
static void DrawTracedScene(Camera* camera, wiGraphicsTypes::Texture2D* result, GRAPHICSTHREAD threadID);
static void DrawTracedScene(Camera* camera, wiGraphicsTypes::Texture2D* result, bool rebuildBVH, GRAPHICSTHREAD threadID);
enum MIPGENFILTER
{