sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Graphics/BasicRenderQueue: Extends maximum layer count to 65535

Browse Source
This commit is contained in:
Lynix
2018-10-29 22:06:09 +01:00
parent ed46c87781
commit c4cf6d2f53
1 changed files with 50 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
src/Nazara/Graphics/BasicRenderQueue.cpp
View File

@@ -742,14 +742,14 @@ namespace Nz
basicSprites.Sort([&](const SpriteChain& vertices) basicSprites.Sort([&](const SpriteChain& vertices)
{ {
// RQ index: // RQ index:
// - Layer (4bits) // - Layer (16bits)
// - Pipeline (8bits) // - Pipeline (8bits)
// - Material (8bits) // - Material (8bits)
// - Shader? (8bits) // - Shader? (8bits)
// - Textures (8bits) // - Textures (8bits)
// - Overlay (8bits) // - Overlay (8bits)
// - Scissor (4bits) // - Scissor (4bits)
// - Depth? (16bits) // - ??? (4bits)
UInt64 layerIndex = m_layerCache[vertices.layerIndex]; UInt64 layerIndex = m_layerCache[vertices.layerIndex];
UInt64 pipelineIndex = GetOrInsert(m_pipelineCache, vertices.material->GetPipeline()); UInt64 pipelineIndex = GetOrInsert(m_pipelineCache, vertices.material->GetPipeline());
@@ -758,16 +758,14 @@ namespace Nz
UInt64 textureIndex = GetOrInsert(m_textureCache, vertices.material->GetDiffuseMap()); UInt64 textureIndex = GetOrInsert(m_textureCache, vertices.material->GetDiffuseMap());
UInt64 overlayIndex = GetOrInsert(m_overlayCache, vertices.overlay); UInt64 overlayIndex = GetOrInsert(m_overlayCache, vertices.overlay);
UInt64 scissorIndex = 0; //< TODO UInt64 scissorIndex = 0; //< TODO
UInt64 depthIndex = 0; //< TODO
UInt64 index = (layerIndex & 0x0F) << 60 | UInt64 index = (layerIndex & 0xFFFF) << 48 |
(pipelineIndex & 0xFF) << 52 | (pipelineIndex & 0xFF) << 40 |
(materialIndex & 0xFF) << 44 | (materialIndex & 0xFF) << 32 |
(shaderIndex & 0xFF) << 36 | (shaderIndex & 0xFF) << 24 |
(textureIndex & 0xFF) << 28 | (textureIndex & 0xFF) << 16 |
(overlayIndex & 0xFF) << 20 | (overlayIndex & 0xFF) << 8 |
(scissorIndex & 0x0F) << 16 | (scissorIndex & 0x0F) << 4;
(depthIndex & 0xFFFF) << 0;
return index; return index;
}); });
@@ -775,14 +773,13 @@ namespace Nz
billboards.Sort([&](const BillboardChain& billboard) billboards.Sort([&](const BillboardChain& billboard)
{ {
// RQ index: // RQ index:
// - Layer (4bits) // - Layer (16bits)
// - Pipeline (8bits) // - Pipeline (8bits)
// - Material (8bits) // - Material (8bits)
// - Shader? (8bits) // - Shader? (8bits)
// - Textures (8bits) // - Textures (8bits)
// - ??? (8bits)
// - Scissor (4bits) // - Scissor (4bits)
// - Depth? (16bits) // - ??? (12bits)
UInt64 layerIndex = m_layerCache[billboard.layerIndex]; UInt64 layerIndex = m_layerCache[billboard.layerIndex];
UInt64 pipelineIndex = GetOrInsert(m_pipelineCache, billboard.material->GetPipeline()); UInt64 pipelineIndex = GetOrInsert(m_pipelineCache, billboard.material->GetPipeline());
@@ -791,16 +788,14 @@ namespace Nz
UInt64 textureIndex = GetOrInsert(m_textureCache, billboard.material->GetDiffuseMap()); UInt64 textureIndex = GetOrInsert(m_textureCache, billboard.material->GetDiffuseMap());
UInt64 unknownIndex = 0; //< ??? UInt64 unknownIndex = 0; //< ???
UInt64 scissorIndex = 0; //< TODO UInt64 scissorIndex = 0; //< TODO
UInt64 depthIndex = 0; //< TODO?
UInt64 index = (layerIndex & 0x0F) << 60 | UInt64 index = (layerIndex & 0xFFFF) << 48 |
(pipelineIndex & 0xFF) << 52 | (pipelineIndex & 0xFF) << 40 |
(materialIndex & 0xFF) << 44 | (materialIndex & 0xFF) << 32 |
(shaderIndex & 0xFF) << 36 | (shaderIndex & 0xFF) << 24 |
(textureIndex & 0xFF) << 28 | (textureIndex & 0xFF) << 16 |
(unknownIndex & 0xFF) << 20 | (scissorIndex & 0x0F) << 12 |
(scissorIndex & 0x0F) << 16 | (unknownIndex & 0xFF) << 0;
(depthIndex & 0xFFFF) << 0;
return index; return index;
}); });
@@ -808,11 +803,11 @@ namespace Nz
customDrawables.Sort([&](const CustomDrawable& drawable) customDrawables.Sort([&](const CustomDrawable& drawable)
{ {
// RQ index: // RQ index:
// - Layer (4bits) // - Layer (16bits)
UInt64 layerIndex = m_layerCache[drawable.layerIndex]; UInt64 layerIndex = m_layerCache[drawable.layerIndex];
UInt64 index = (layerIndex & 0x0F) << 60; UInt64 index = (layerIndex & 0xFFFF) << 48;
return index; return index;
@@ -821,14 +816,14 @@ namespace Nz
models.Sort([&](const Model& renderData) models.Sort([&](const Model& renderData)
{ {
// RQ index: // RQ index:
// - Layer (4bits) // - Layer (16bits)
// - Pipeline (8bits) // - Pipeline (8bits)
// - Material (8bits) // - Material (8bits)
// - Shader? (8bits) // - Shader? (8bits)
// - Textures (8bits) // - Textures (8bits)
// - Buffers (8bits) // - Buffers (8bits)
// - Scissor (4bits) // - Scissor (4bits)
// - Depth? (16bits) // - ??? (4bits)
UInt64 layerIndex = m_layerCache[renderData.layerIndex]; UInt64 layerIndex = m_layerCache[renderData.layerIndex];
UInt64 pipelineIndex = GetOrInsert(m_pipelineCache, renderData.material->GetPipeline()); UInt64 pipelineIndex = GetOrInsert(m_pipelineCache, renderData.material->GetPipeline());
@@ -839,14 +834,13 @@ namespace Nz
UInt64 scissorIndex = 0; //< TODO UInt64 scissorIndex = 0; //< TODO
UInt64 depthIndex = 0; //< TODO UInt64 depthIndex = 0; //< TODO
UInt64 index = (layerIndex & 0x0F) << 60 | UInt64 index = (layerIndex & 0xFFFF) << 48 |
(pipelineIndex & 0xFF) << 52 | (pipelineIndex & 0xFF) << 40 |
(materialIndex & 0xFF) << 44 | (materialIndex & 0xFF) << 32 |
(shaderIndex & 0xFF) << 36 | (shaderIndex & 0xFF) << 24 |
(textureIndex & 0xFF) << 28 | (textureIndex & 0xFF) << 16 |
(bufferIndex & 0xFF) << 20 | (bufferIndex & 0xFF) << 8 |
(scissorIndex & 0x0F) << 16 | (scissorIndex & 0x0F) << 4;
(depthIndex & 0xFFFF) << 0;
return index; return index;
}); });
@@ -864,19 +858,19 @@ namespace Nz
depthSortedBillboards.Sort([&](const Billboard& billboard) depthSortedBillboards.Sort([&](const Billboard& billboard)
{ {
// RQ index: // RQ index:
// - Layer (4bits) // - Layer (16bits)
// - Depth (32bits) // - Depth (32bits)
// - ?? (28bits) // - ?? (16bits)
// Reinterpret depth as UInt32 (this will work as long as they're all either positive or negative, // Reinterpret depth as UInt32 (this will work as long as they're all either positive or negative,
// a negative distance may happen with billboard behind the camera which we don't care about since they'll be rendered) // a negative distance may happen with billboard behind the camera which we don't care about since they'll not be rendered)
float depth = nearPlane.Distance(billboard.data.center); float depth = nearPlane.Distance(billboard.data.center);
UInt64 layerIndex = m_layerCache[billboard.layerIndex]; UInt64 layerIndex = m_layerCache[billboard.layerIndex];
UInt64 depthIndex = ~reinterpret_cast<UInt32&>(depth); UInt64 depthIndex = ~reinterpret_cast<UInt32&>(depth);
UInt64 index = (layerIndex & 0x0F) << 60 | UInt64 index = (layerIndex & 0xFFFF) << 48 |
(depthIndex & 0xFFFFFFFF) << 28; (depthIndex & 0xFFFFFFFF) << 16;
return index; return index;
}); });
@@ -886,17 +880,17 @@ namespace Nz
depthSortedModels.Sort([&](const Model& model) depthSortedModels.Sort([&](const Model& model)
{ {
// RQ index: // RQ index:
// - Layer (4bits) // - Layer (16bits)
// - Depth (32bits) // - Depth (32bits)
// - ?? (28bits) // - ?? (16bits)
float depth = nearPlane.Distance(model.obbSphere.GetPosition()); float depth = nearPlane.Distance(model.obbSphere.GetPosition());
UInt64 layerIndex = m_layerCache[model.layerIndex]; UInt64 layerIndex = m_layerCache[model.layerIndex];
UInt64 depthIndex = ~reinterpret_cast<UInt32&>(depth); UInt64 depthIndex = ~reinterpret_cast<UInt32&>(depth);
UInt64 index = (layerIndex & 0x0F) << 60 | UInt64 index = (layerIndex & 0xFFFF) << 48 |
(depthIndex & 0xFFFFFFFF) << 28; (depthIndex & 0xFFFFFFFF) << 16;
return index; return index;
}); });
@@ -904,17 +898,17 @@ namespace Nz
depthSortedSprites.Sort([&](const SpriteChain& spriteChain) depthSortedSprites.Sort([&](const SpriteChain& spriteChain)
{ {
// RQ index: // RQ index:
// - Layer (4bits) // - Layer (16bits)
// - Depth (32bits) // - Depth (32bits)
// - ?? (28bits) // - ?? (16bits)
float depth = nearPlane.Distance(spriteChain.vertices[0].position); float depth = nearPlane.Distance(spriteChain.vertices[0].position);
UInt64 layerIndex = m_layerCache[spriteChain.layerIndex]; UInt64 layerIndex = m_layerCache[spriteChain.layerIndex];
UInt64 depthIndex = ~reinterpret_cast<UInt32&>(depth); UInt64 depthIndex = ~reinterpret_cast<UInt32&>(depth);
UInt64 index = (layerIndex & 0x0F) << 60 | UInt64 index = (layerIndex & 0xFFFF) << 48 |
(depthIndex & 0xFFFFFFFF) << 28; (depthIndex & 0xFFFFFFFF) << 16;
return index; return index;
}); });
@@ -926,17 +920,17 @@ namespace Nz
depthSortedModels.Sort([&](const Model& model) depthSortedModels.Sort([&](const Model& model)
{ {
// RQ index: // RQ index:
// - Layer (4bits) // - Layer (16bits)
// - Depth (32bits) // - Depth (32bits)
// - ?? (28bits) // - ?? (16bits)
float depth = viewerPos.SquaredDistance(model.obbSphere.GetPosition()); float depth = viewerPos.SquaredDistance(model.obbSphere.GetPosition());
UInt64 layerIndex = m_layerCache[model.layerIndex]; UInt64 layerIndex = m_layerCache[model.layerIndex];
UInt64 depthIndex = ~reinterpret_cast<UInt32&>(depth); UInt64 depthIndex = ~reinterpret_cast<UInt32&>(depth);
UInt64 index = (layerIndex & 0x0F) << 60 | UInt64 index = (layerIndex & 0x0F) << 48 |
(depthIndex & 0xFFFFFFFF) << 28; (depthIndex & 0xFFFFFFFF) << 16;
return index; return index;
}); });
@@ -944,17 +938,17 @@ namespace Nz
depthSortedSprites.Sort([&](const SpriteChain& sprites) depthSortedSprites.Sort([&](const SpriteChain& sprites)
{ {
// RQ index: // RQ index:
// - Layer (4bits) // - Layer (16bits)
// - Depth (32bits) // - Depth (32bits)
// - ?? (28bits) // - ?? (16bits)
float depth = viewerPos.SquaredDistance(sprites.vertices[0].position); float depth = viewerPos.SquaredDistance(sprites.vertices[0].position);
UInt64 layerIndex = m_layerCache[sprites.layerIndex]; UInt64 layerIndex = m_layerCache[sprites.layerIndex];
UInt64 depthIndex = ~reinterpret_cast<UInt32&>(depth); UInt64 depthIndex = ~reinterpret_cast<UInt32&>(depth);
UInt64 index = (layerIndex & 0x0F) << 60 | UInt64 index = (layerIndex & 0xFFFF) << 48 |
(depthIndex & 0xFFFFFFFF) << 28; (depthIndex & 0xFFFFFFFF) << 16;
return index; return index;
}); });