Inital commit
Conan Packaging / Package assimp/6.0.5 (push) Failing after 0s
Conan Packaging / Package cli11/2.6.2 (push) Failing after 0s
Conan Packaging / Package eabase/01082025 (push) Failing after 0s
Conan Packaging / Package flatbuffers/25.12.19-2026-02-06-03fffb2-bigfoot (push) Failing after 0s
Conan Packaging / Package glm/1.0.3 (push) Failing after 0s
Conan Packaging / Package imgui/1.92.8-docking (push) Failing after 1s
Conan Packaging / Package lodepng/cci.20260210 (push) Failing after 0s
Conan Packaging / Package meshoptimizer/1.2 (push) Failing after 0s
Conan Packaging / Package rapidhash/3.0 (push) Failing after 0s
Conan Packaging / Package spirv-cross/1.4.341.0 (push) Failing after 1s
Conan Packaging / Package spirv-headers/1.4.341.0 (push) Failing after 0s
Conan Packaging / Package unordered_dense/4.8.1 (push) Failing after 0s
Conan Packaging / Package spirv-tools/1.4.341.0 (push) Skipped
Conan Packaging / Package mimalloc/3.3.2 (push) Failing after 0s
Conan Packaging / Package mold/2.41.0 (push) Failing after 0s
Conan Packaging / Package pixelmatch-cpp17/1.0.3 (push) Failing after 0s
Conan Packaging / Package sqlite3/3.53.3 (push) Failing after 0s
Conan Packaging / Package stduuid/1.2.3 (push) Failing after 0s
Conan Packaging / Package vulkan-headers/1.4.341.0 (push) Failing after 0s
Conan Packaging / Package eastl/3.27.01 (push) Skipped
Conan Packaging / Package vulkan-memory-allocator/3.3.0 (push) Skipped
Conan Packaging / Package vulkan-utility-libraries/1.4.341.0 (push) Skipped
Conan Packaging / Package glslang/1.4.341.0 (push) Skipped
Conan Packaging / Package vulkan-validationlayers/1.4.341.0 (push) Skipped
Conan Packaging / Package shaderc/2026.1 (push) Skipped

This commit is contained in:
2026-08-17 01:07:23 +02:00
commit 02d1a0a13a
243 changed files with 8598 additions and 0 deletions
@@ -0,0 +1,95 @@
--- a/include/vk_mem_alloc.h
+++ b/include/vk_mem_alloc.h
@@ -2569,6 +2569,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString(
#include <cstdlib>
#include <cstring>
#include <utility>
+#include <type_traits>
#ifdef _MSC_VER
#include <intrin.h> // For functions like __popcnt, _BitScanForward etc.
@@ -5491,6 +5492,7 @@ public:
// Posts next part of an open string. The number is converted to decimal characters.
void ContinueString(uint32_t n);
void ContinueString(uint64_t n);
+ void ContinueString_Size(size_t n);
// Posts next part of an open string. Pointer value is converted to characters
// using "%p" formatting - shown as hexadecimal number, e.g.: 000000081276Ad00
void ContinueString_Pointer(const void* ptr);
@@ -5500,6 +5502,7 @@ public:
// Writes a number value.
void WriteNumber(uint32_t n);
void WriteNumber(uint64_t n);
+ void WriteSize(size_t n);
// Writes a boolean value - false or true.
void WriteBool(bool b);
// Writes a null value.
@@ -5524,6 +5527,11 @@ private:
VmaVector< StackItem, VmaStlAllocator<StackItem> > m_Stack;
bool m_InsideString;
+ // Write size_t for less than 64bits
+ void WriteSize(size_t n, std::integral_constant<bool, false>) { m_SB.AddNumber(static_cast<uint32_t>(n)); }
+ // Write size_t for 64bits
+ void WriteSize(size_t n, std::integral_constant<bool, true>) { m_SB.AddNumber(static_cast<uint64_t>(n)); }
+
void BeginValue(bool isString);
void WriteIndent(bool oneLess = false);
};
@@ -5666,6 +5674,14 @@ void VmaJsonWriter::ContinueString(uint64_t n)
m_SB.AddNumber(n);
}
+void VmaJsonWriter::ContinueString_Size(size_t n)
+{
+ VMA_ASSERT(m_InsideString);
+ // Fix for AppleClang incorrect type casting
+ // TODO: Change to if constexpr when C++17 used as minimal standard
+ WriteSize(n, std::is_same<size_t, uint64_t>{});
+}
+
void VmaJsonWriter::ContinueString_Pointer(const void* ptr)
{
VMA_ASSERT(m_InsideString);
@@ -5697,6 +5713,15 @@ void VmaJsonWriter::WriteNumber(uint64_t n)
m_SB.AddNumber(n);
}
+void VmaJsonWriter::WriteSize(size_t n)
+{
+ VMA_ASSERT(!m_InsideString);
+ BeginValue(false);
+ // Fix for AppleClang incorrect type casting
+ // TODO: Change to if constexpr when C++17 used as minimal standard
+ WriteSize(n, std::is_same<size_t, uint64_t>{});
+}
+
void VmaJsonWriter::WriteBool(bool b)
{
VMA_ASSERT(!m_InsideString);
@@ -6440,13 +6465,13 @@ void VmaBlockMetadata::PrintDetailedMap_Begin(class VmaJsonWriter& json,
json.WriteNumber(GetSize());
json.WriteString("UnusedBytes");
- json.WriteNumber(unusedBytes);
+ json.WriteSize(unusedBytes);
json.WriteString("Allocations");
- json.WriteNumber(allocationCount);
+ json.WriteSize(allocationCount);
json.WriteString("UnusedRanges");
- json.WriteNumber(unusedRangeCount);
+ json.WriteSize(unusedRangeCount);
json.WriteString("Suballocations");
json.BeginArray();
@@ -15964,7 +15989,7 @@ void VmaAllocator_T::PrintDetailedMap(VmaJsonWriter& json)
{
json.WriteString("Name");
json.BeginString();
- json.ContinueString(index++);
+ json.ContinueString_Size(index++);
if (pool->GetName())
{
json.WriteString(" - ");
@@ -0,0 +1,15 @@
diff --git a/src/vk_mem_alloc.h b/src/vk_mem_alloc.h
index 32258b4..8da6bba 100644
--- a/src/vk_mem_alloc.h
+++ b/src/vk_mem_alloc.h
@@ -3470,6 +3470,10 @@ VMA_CALL_PRE void VMA_CALL_POST vmaDestroyImage(
#include <cstdlib>
#include <cstring>
+#if VMA_STATS_STRING_ENABLED
+ #include <cstdio> // For snprintf
+#endif
+
/*******************************************************************************
CONFIGURATION SECTION
@@ -0,0 +1,15 @@
diff --git a/include/vk_mem_alloc.h b/include/vk_mem_alloc.h
index 3b395a7..542191c 100644
--- a/include/vk_mem_alloc.h
+++ b/include/vk_mem_alloc.h
@@ -2575,6 +2575,10 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString(
#include <intrin.h> // For functions like __popcnt, _BitScanForward etc.
#endif
+#if VMA_STATS_STRING_ENABLED
+ #include <cstdio> // For snprintf
+#endif
+
/*******************************************************************************
CONFIGURATION SECTION
@@ -0,0 +1,15 @@
diff --git a/include/vk_mem_alloc.h b/include/vk_mem_alloc.h
index 60f5720..31164bc 100644
--- a/include/vk_mem_alloc.h
+++ b/include/vk_mem_alloc.h
@@ -2578,6 +2578,10 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString(
#include <bit> // For std::popcount
#endif
+#if VMA_STATS_STRING_ENABLED
+ #include <cstdio> // For snprintf
+#endif
+
/*******************************************************************************
CONFIGURATION SECTION