From bc5f4b664a1d5855c827efdb7c06c757f9609727 Mon Sep 17 00:00:00 2001 From: minggo Date: Wed, 30 Dec 2020 14:15:15 +0800 Subject: [PATCH] fix vertex buffer binding issue (#3168) --- .../renderer/gfx-metal/MTLRenderCommandEncoder.h | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/native/cocos/renderer/gfx-metal/MTLRenderCommandEncoder.h b/native/cocos/renderer/gfx-metal/MTLRenderCommandEncoder.h index 58fa32fa7d..7c90ae3c15 100644 --- a/native/cocos/renderer/gfx-metal/MTLRenderCommandEncoder.h +++ b/native/cocos/renderer/gfx-metal/MTLRenderCommandEncoder.h @@ -197,10 +197,14 @@ public: } CC_INLINE void setVertexBuffer(const id buffer, uint offset, uint index) { - if (_vertexBufferMap.count(index) > 0 && (buffer == _vertexBufferMap[index])) - return; + if (_vertexBufferMap.count(index) > 0) { + const auto &bufferBinding = _vertexBufferMap[index]; + if (buffer == bufferBinding.buffer && offset == bufferBinding.offset) { + return; + } + } - _vertexBufferMap[index] = buffer; + _vertexBufferMap[index] = {buffer, offset}; [_mtlEncoder setVertexBuffer:buffer offset:offset atIndex:index]; @@ -209,8 +213,9 @@ public: CC_INLINE void setFragmentBuffer(const id buffer, uint offset, uint index) { if (_fragmentBufferMap.count(index) > 0) { const auto &bufferBinding = _fragmentBufferMap[index]; - if (buffer == bufferBinding.buffer && offset == bufferBinding.offset) + if (buffer == bufferBinding.buffer && offset == bufferBinding.offset) { return; + } } _fragmentBufferMap[index] = {buffer, offset}; @@ -285,8 +290,7 @@ private: Viewport _viewport; Rect _scissorRect; Color _blendColor; - // Offset will always be 0 for vertex buffer. - std::unordered_map> _vertexBufferMap; + std::unordered_map _vertexBufferMap; std::unordered_map _fragmentBufferMap; std::unordered_map> _vertexTextureMap; std::unordered_map> _fragmentTextureMap;