From 39e49ec3567fb82c9a92357d9129383753b10b94 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Tue, 10 May 2022 00:06:46 -0700 Subject: [PATCH] Fix MinGW build issue with asserts --- DirectXMesh/DirectXMeshVBReader.cpp | 4 ++-- DirectXMesh/DirectXMeshVBWriter.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DirectXMesh/DirectXMeshVBReader.cpp b/DirectXMesh/DirectXMeshVBReader.cpp index fe56363..9111791 100644 --- a/DirectXMesh/DirectXMeshVBReader.cpp +++ b/DirectXMesh/DirectXMeshVBReader.cpp @@ -158,8 +158,8 @@ HRESULT VBReader::Impl::Initialize(const InputElementDesc* vbDecl, size_t nDecl) if (!IsValid(reinterpret_cast(vbDecl), nDecl)) return E_INVALIDARG; - assert(nDecl <= D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT); - _Analysis_assume_(nDecl <= D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT); + assert(nDecl <= 32 /*D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT*/); + _Analysis_assume_(nDecl <= 32 /*D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT*/); ComputeInputLayout(reinterpret_cast(vbDecl), nDecl, offsets, mDefaultStrides); #endif diff --git a/DirectXMesh/DirectXMeshVBWriter.cpp b/DirectXMesh/DirectXMeshVBWriter.cpp index 3eeef8a..a17dd3f 100644 --- a/DirectXMesh/DirectXMeshVBWriter.cpp +++ b/DirectXMesh/DirectXMeshVBWriter.cpp @@ -157,8 +157,8 @@ HRESULT VBWriter::Impl::Initialize(const InputElementDesc* vbDecl, size_t nDecl) if (!IsValid(reinterpret_cast(vbDecl), nDecl)) return E_INVALIDARG; - assert(nDecl <= D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT); - _Analysis_assume_(nDecl <= D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT); + assert(nDecl <= 32 /*D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT*/); + _Analysis_assume_(nDecl <= 32 /*D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT*/); ComputeInputLayout(reinterpret_cast(vbDecl), nDecl, offsets, mDefaultStrides); #endif