Scarfski/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-11-14 20:15:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Metal fixes, and instance data fallback on all renderers. (#4103)

Browse Source
This commit is contained in:
Branimir Karadžić
2026-10-28 21:08:38 -07:00
committed by GitHub
parent 4367089705
commit e7c58be8b6
8 changed files with 215 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer_vk.cpp
+37
View File
@@ -2305,6 +2305,23 @@ VK_IMPORT_INSTANCE
fmt = s_textureFormat[ii].m_fmtSrgb;
}
if (0 != (support & BGFX_CAPS_FORMAT_TEXTURE_MIP_AUTOGEN) )
{
VkFormatProperties fp;
vkGetPhysicalDeviceFormatProperties(m_physicalDevice, depth ? s_textureFormat[ii].m_fmtDsv : s_textureFormat[ii].m_fmt, &fp);
const VkFormatFeatureFlags mipFeatures = 0
| VK_FORMAT_FEATURE_BLIT_SRC_BIT
| VK_FORMAT_FEATURE_BLIT_DST_BIT
| (depth ? 0 : VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT)
;
if (mipFeatures != (fp.optimalTilingFeatures & mipFeatures) )
{
support &= ~BGFX_CAPS_FORMAT_TEXTURE_MIP_AUTOGEN;
}
}
g_caps.formats[ii] = support;
}
@@ -4135,10 +4152,24 @@ VK_IMPORT_DEVICE
}
}
const uint32_t firstInstanceLocation = _vertexInputState.vertexAttributeDescriptionCount;
if (0 < _numInstanceData)
{
fillInstanceBinding(_program.m_vsh, _vertexInputState, _numInstanceData);
}
const uint32_t numFallback = 0 < _numStream ? _program.m_vsh->m_numInstanceData : 0;
for (uint32_t ii = _numInstanceData; ii < numFallback; ++ii)
{
VkVertexInputAttributeDescription* inputAttrib = const_cast<VkVertexInputAttributeDescription*>(_vertexInputState.pVertexAttributeDescriptions + _vertexInputState.vertexAttributeDescriptionCount);
inputAttrib->location = firstInstanceLocation + ii;
inputAttrib->binding = 0;
inputAttrib->format = VK_FORMAT_R8G8B8A8_UNORM;
inputAttrib->offset = 0;
_vertexInputState.vertexAttributeDescriptionCount++;
}
}
VkResult getRenderPass(uint8_t _num, const VkFormat* _formats, const VkImageAspectFlags* _aspects, const bool* _resolve, VkSampleCountFlagBits _samples, uint16_t _clearFlags, uint8_t _depthFlags, ::VkRenderPass* _outRenderPass, uint32_t* _outHashKey)
@@ -7000,6 +7031,8 @@ VK_DESTROY
bx::read(&reader, m_numAttrs, &err);
m_numInstanceData = 0;
for (uint8_t ii = 0; ii < m_numAttrs; ++ii)
{
uint16_t id;
@@ -7012,6 +7045,10 @@ VK_DESTROY
m_attrMask[attr] = UINT16_MAX;
m_attrRemap[attr] = ii;
}
else
{
++m_numInstanceData;
}
}
bx::HashMurmur2A murmur;