Mirrors/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-02-17 20:52:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Metal: Fixed missing vertex attribute.

Browse Source
This commit is contained in:
Branimir Karadžić
2018-09-20 17:27:53 -07:00
parent 6eaac4212d
commit a2a347c798
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/renderer_mtl.mm
View File

@@ -1950,6 +1950,8 @@ namespace bgfx { namespace mtl
VertexDescriptor vertexDesc = m_vertexDescriptor;
reset(vertexDesc);
bool attrSet[Attrib::Count] = {};
uint8_t stream = 0;
for (; stream < _numStreams; ++stream)
{
@@ -1957,7 +1959,7 @@ namespace bgfx { namespace mtl
for (uint32_t ii = 0; Attrib::Count != program.m_used[ii]; ++ii)
{
Attrib::Enum attr = Attrib::Enum(program.m_used[ii]);
uint32_t loc = program.m_attributes[attr];
const uint32_t loc = program.m_attributes[attr];
uint8_t num;
AttribType::Enum type;
@@ -1973,24 +1975,32 @@ namespace bgfx { namespace mtl
vertexDesc.attributes[loc].offset = vertexDecl.m_offset[attr];
BX_TRACE("attrib: %s format: %d offset: %d", s_attribName[attr], (int)vertexDesc.attributes[loc].format, (int)vertexDesc.attributes[loc].offset);
attrSet[attr] = true;
}
// else
// { // NOTE: missing attribute: using dummy attribute with smallest possible size
// vertexDesc.attributes[loc].format = MTLVertexFormatUChar2;
// vertexDesc.attributes[loc].bufferIndex = 1;
// vertexDesc.attributes[loc].offset = 0;
// }
}
vertexDesc.layouts[stream+1].stride = vertexDecl.getStride();
vertexDesc.layouts[stream+1].stepFunction = MTLVertexStepFunctionPerVertex;
}
for (uint32_t ii = 0; Attrib::Count != program.m_used[ii]; ++ii)
{
Attrib::Enum attr = Attrib::Enum(program.m_used[ii]);
const uint32_t loc = program.m_attributes[attr];
if (!attrSet[attr])
{
vertexDesc.attributes[loc].format = MTLVertexFormatUChar2;
vertexDesc.attributes[loc].bufferIndex = 1;
vertexDesc.attributes[loc].offset = 0;
}
}
if (0 < _numInstanceData)
{
for (uint32_t ii = 0; UINT16_MAX != program.m_instanceData[ii]; ++ii)
{
uint32_t loc = program.m_instanceData[ii];
const uint32_t loc = program.m_instanceData[ii];
vertexDesc.attributes[loc].format = MTLVertexFormatFloat4;
vertexDesc.attributes[loc].bufferIndex = stream+1;
vertexDesc.attributes[loc].offset = ii*16;