Removed DWORD from public interface

microsoft · May 28, 2020 · 1c8e73c · 1c8e73c
1 parent 2191878
commit 1c8e73c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/DirectXMesh/DirectXMesh.h b/DirectXMesh/DirectXMesh.h
@@ -251,12 +251,12 @@ namespace DirectX
     HRESULT __cdecl ComputeNormals(
         _In_reads_(nFaces * 3) const uint16_t* indices, _In_ size_t nFaces,
         _In_reads_(nVerts) const XMFLOAT3* positions, _In_ size_t nVerts,
-        _In_ DWORD flags,
+        _In_ uint32_t flags,
         _Out_writes_(nVerts) XMFLOAT3* normals) noexcept;
     HRESULT __cdecl ComputeNormals(
         _In_reads_(nFaces * 3) const uint32_t* indices, _In_ size_t nFaces,
         _In_reads_(nVerts) const XMFLOAT3* positions, _In_ size_t nVerts,
-        _In_ DWORD flags,
+        _In_ uint32_t flags,
         _Out_writes_(nVerts) XMFLOAT3* normals) noexcept;
         // Computes vertex normals
 
@@ -328,11 +328,11 @@ namespace DirectX
     HRESULT __cdecl Validate(
         _In_reads_(nFaces * 3) const uint16_t* indices, _In_ size_t nFaces,
         _In_ size_t nVerts, _In_reads_opt_(nFaces * 3) const uint32_t* adjacency,
-        _In_ DWORD flags, _In_opt_ std::wstring* msgs = nullptr);
+        _In_ uint32_t flags, _In_opt_ std::wstring* msgs = nullptr);
     HRESULT __cdecl Validate(
         _In_reads_(nFaces * 3) const uint32_t* indices, _In_ size_t nFaces,
         _In_ size_t nVerts, _In_reads_opt_(nFaces * 3) const uint32_t* adjacency,
-        _In_ DWORD flags, _In_opt_ std::wstring* msgs = nullptr);
+        _In_ uint32_t flags, _In_opt_ std::wstring* msgs = nullptr);
         // Checks the mesh for common problems, return 'S_OK' if no problems were found
 
     HRESULT __cdecl Clean(
@@ -605,14 +605,14 @@ namespace DirectX
         _In_reads_(nVertIndices) const uint16_t* uniqueVertexIndices, _In_ size_t nVertIndices,
         _In_reads_(nPrimIndices) const MeshletTriangle* primitiveIndices, _In_ size_t nPrimIndices,
         _Out_writes_(nMeshlets) CullData* cullData,
-        _In_ MESHLET_FLAGS flags = MESHLET_DEFAULT) noexcept;
+        _In_ uint32_t flags = MESHLET_DEFAULT) noexcept;
     HRESULT __cdecl ComputeCullData(
         _In_reads_(nVerts) const XMFLOAT3* positions, _In_ size_t nVerts,
         _In_reads_(nMeshlets) const Meshlet* meshlets, _In_ size_t nMeshlets,
         _In_reads_(nVertIndices) const uint32_t* uniqueVertexIndices, _In_ size_t nVertIndices,
         _In_reads_(nPrimIndices) const MeshletTriangle* primitiveIndices, _In_ size_t nPrimIndices,
         _Out_writes_(nMeshlets) CullData* cullData,
-        _In_ MESHLET_FLAGS flags = MESHLET_DEFAULT) noexcept;
+        _In_ uint32_t flags = MESHLET_DEFAULT) noexcept;
         // Computes culling data for each input meshlet
 
 #include "DirectXMesh.inl"

diff --git a/DirectXMesh/DirectXMeshNormals.cpp b/DirectXMesh/DirectXMeshNormals.cpp
@@ -270,7 +270,7 @@ HRESULT DirectX::ComputeNormals(
     size_t nFaces,
     const XMFLOAT3* positions,
     size_t nVerts,
-    DWORD flags,
+    uint32_t flags,
     XMFLOAT3* normals) noexcept
 {
     if (!indices || !positions || !nFaces || !nVerts || !normals)
@@ -304,7 +304,7 @@ HRESULT DirectX::ComputeNormals(
     size_t nFaces,
     const XMFLOAT3* positions,
     size_t nVerts,
-    DWORD flags,
+    uint32_t flags,
     XMFLOAT3* normals) noexcept
 {
     if (!indices || !positions || !nFaces || !nVerts || !normals)

diff --git a/DirectXMesh/DirectXMeshValidate.cpp b/DirectXMesh/DirectXMeshValidate.cpp
@@ -22,7 +22,7 @@ namespace
     HRESULT ValidateIndices(
         _In_reads_(nFaces * 3) const index_t* indices, _In_ size_t nFaces,
         _In_ size_t nVerts, _In_reads_opt_(nFaces * 3) const uint32_t* adjacency,
-        _In_ DWORD flags, _In_opt_ std::wstring* msgs)
+        _In_ uint32_t flags, _In_opt_ std::wstring* msgs)
     {
         bool result = true;
 
@@ -361,7 +361,7 @@ HRESULT DirectX::Validate(
     size_t nFaces,
     size_t nVerts,
     const uint32_t* adjacency,
-    DWORD flags,
+    uint32_t flags,
     std::wstring* msgs)
 {
     if (!indices || !nFaces || !nVerts)
@@ -398,7 +398,7 @@ HRESULT DirectX::Validate(
     size_t nFaces,
     size_t nVerts,
     const uint32_t* adjacency,
-    DWORD flags,
+    uint32_t flags,
     std::wstring* msgs)
 {
     if (!indices || !nFaces || !nVerts)

diff --git a/DirectXMesh/DirectXMeshletGenerator.cpp b/DirectXMesh/DirectXMeshletGenerator.cpp
@@ -569,7 +569,7 @@ namespace
         _In_reads_(nPrimIndices) const MeshletTriangle* primitiveIndices,
         size_t nPrimIndices,
         _Out_writes_(nMeshlets) CullData* cullData,
-        MESHLET_FLAGS flags)
+        uint32_t flags)
     {
         // Input validation
         if (!positions || !meshlets || !uniqueVertexIndices || !primitiveIndices || !cullData)
@@ -843,7 +843,7 @@ HRESULT DirectX::ComputeCullData(
     const MeshletTriangle* primitiveIndices,
     size_t nPrimIndices,
     CullData* cullData,
-    MESHLET_FLAGS flags) noexcept
+    uint32_t flags) noexcept
 {
     return ComputeCullDataInternal<uint16_t>(
         positions, nVerts,
@@ -864,7 +864,7 @@ HRESULT DirectX::ComputeCullData(
     const MeshletTriangle* primitiveIndices,
     size_t nPrimIndices,
     CullData* cullData,
-    MESHLET_FLAGS flags) noexcept
+    uint32_t flags) noexcept
 {
     return ComputeCullDataInternal<uint32_t>(
         positions, nVerts,