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

Graphics: Fix render queue keys 

I have no idea how I messed this up
This commit is contained in:
SirLynix 2023-02-26 18:51:59 +01:00
parent eabd9bcece
commit 7f06d8db2b
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/Nazara/Graphics/RenderSpriteChain.inl
View File

@ -41,9 +41,9 @@ namespace Nz
// - Distance to near plane (32bits) - could by reduced to 24 or even 16 if required // - Distance to near plane (32bits) - could by reduced to 24 or even 16 if required
// - ?? (23bits) // - ?? (23bits)
return (layerIndex & 0xFF) << 60 | return (layerIndex & 0xFF) << 56 |
(matFlags) << 52 | (matFlags) << 55 |
(distance) << 51; (distance) << 23;
} }
else else
@ -62,14 +62,14 @@ namespace Nz
// - Pipeline (16bits) // - Pipeline (16bits)
// - MaterialPass (16bits) // - MaterialPass (16bits)
// - VertexDeclaration (8bits) // - VertexDeclaration (8bits)
// - ?? (8bits) - Depth? // - ?? (11bits) - Depth?
return (layerIndex & 0xFF) << 60 | return (layerIndex & 0xFF) << 56 |
(matFlags) << 52 | (matFlags) << 55 |
(elementType & 0xF) << 51 | (elementType & 0xF) << 51 |
(pipelineIndex & 0xFFFF) << 35 | (pipelineIndex & 0xFFFF) << 35 |
(materialInstanceIndex & 0xFFFF) << 23 | (materialInstanceIndex & 0xFFFF) << 19 |
(vertexDeclarationIndex & 0xFF) << 7; (vertexDeclarationIndex & 0xFF) << 11;
} }
} }

17
include/Nazara/Graphics/RenderSubmesh.inl
View File

@ -42,9 +42,9 @@ namespace Nz
// - Distance to near plane (32bits) - could by reduced to 24 or even 16 if required // - Distance to near plane (32bits) - could by reduced to 24 or even 16 if required
// - ?? (23bits) // - ?? (23bits)
return (layerIndex & 0xFF) << 60 | return (layerIndex & 0xFF) << 56 |
(matFlags) << 52 | (matFlags) << 55 |
(distance) << 51; (distance) << 23;
} }
else else
{ {
@ -67,14 +67,15 @@ namespace Nz
// - MaterialPass (16bits) // - MaterialPass (16bits)
// - VertexBuffer (8bits) // - VertexBuffer (8bits)
// - Skeleton (8bits) // - Skeleton (8bits)
// - Unused (3bits)
return (layerIndex & 0xFF) << 60 | return (layerIndex & 0xFF) << 56 |
(matFlags) << 52 | (matFlags) << 55 |
(elementType & 0xF) << 51 | (elementType & 0xF) << 51 |
(pipelineIndex & 0xFFFF) << 35 | (pipelineIndex & 0xFFFF) << 35 |
(materialInstanceIndex & 0xFFFF) << 23 | (materialInstanceIndex & 0xFFFF) << 19 |
(vertexBufferIndex & 0xFF) << 7 | (vertexBufferIndex & 0xFF) << 11 |
(skeletonIndex & 0xFF); (skeletonIndex & 0xFF) << 3;
} }
} }