Removed DWORD from public interface
This commit is contained in:
Родитель
2191878da9
Коммит
1c8e73c376
|
@ -251,12 +251,12 @@ namespace DirectX
|
||||||
HRESULT __cdecl ComputeNormals(
|
HRESULT __cdecl ComputeNormals(
|
||||||
_In_reads_(nFaces * 3) const uint16_t* indices, _In_ size_t nFaces,
|
_In_reads_(nFaces * 3) const uint16_t* indices, _In_ size_t nFaces,
|
||||||
_In_reads_(nVerts) const XMFLOAT3* positions, _In_ size_t nVerts,
|
_In_reads_(nVerts) const XMFLOAT3* positions, _In_ size_t nVerts,
|
||||||
_In_ DWORD flags,
|
_In_ uint32_t flags,
|
||||||
_Out_writes_(nVerts) XMFLOAT3* normals) noexcept;
|
_Out_writes_(nVerts) XMFLOAT3* normals) noexcept;
|
||||||
HRESULT __cdecl ComputeNormals(
|
HRESULT __cdecl ComputeNormals(
|
||||||
_In_reads_(nFaces * 3) const uint32_t* indices, _In_ size_t nFaces,
|
_In_reads_(nFaces * 3) const uint32_t* indices, _In_ size_t nFaces,
|
||||||
_In_reads_(nVerts) const XMFLOAT3* positions, _In_ size_t nVerts,
|
_In_reads_(nVerts) const XMFLOAT3* positions, _In_ size_t nVerts,
|
||||||
_In_ DWORD flags,
|
_In_ uint32_t flags,
|
||||||
_Out_writes_(nVerts) XMFLOAT3* normals) noexcept;
|
_Out_writes_(nVerts) XMFLOAT3* normals) noexcept;
|
||||||
// Computes vertex normals
|
// Computes vertex normals
|
||||||
|
|
||||||
|
@ -328,11 +328,11 @@ namespace DirectX
|
||||||
HRESULT __cdecl Validate(
|
HRESULT __cdecl Validate(
|
||||||
_In_reads_(nFaces * 3) const uint16_t* indices, _In_ size_t nFaces,
|
_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_ 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(
|
HRESULT __cdecl Validate(
|
||||||
_In_reads_(nFaces * 3) const uint32_t* indices, _In_ size_t nFaces,
|
_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_ 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
|
// Checks the mesh for common problems, return 'S_OK' if no problems were found
|
||||||
|
|
||||||
HRESULT __cdecl Clean(
|
HRESULT __cdecl Clean(
|
||||||
|
@ -605,14 +605,14 @@ namespace DirectX
|
||||||
_In_reads_(nVertIndices) const uint16_t* uniqueVertexIndices, _In_ size_t nVertIndices,
|
_In_reads_(nVertIndices) const uint16_t* uniqueVertexIndices, _In_ size_t nVertIndices,
|
||||||
_In_reads_(nPrimIndices) const MeshletTriangle* primitiveIndices, _In_ size_t nPrimIndices,
|
_In_reads_(nPrimIndices) const MeshletTriangle* primitiveIndices, _In_ size_t nPrimIndices,
|
||||||
_Out_writes_(nMeshlets) CullData* cullData,
|
_Out_writes_(nMeshlets) CullData* cullData,
|
||||||
_In_ MESHLET_FLAGS flags = MESHLET_DEFAULT) noexcept;
|
_In_ uint32_t flags = MESHLET_DEFAULT) noexcept;
|
||||||
HRESULT __cdecl ComputeCullData(
|
HRESULT __cdecl ComputeCullData(
|
||||||
_In_reads_(nVerts) const XMFLOAT3* positions, _In_ size_t nVerts,
|
_In_reads_(nVerts) const XMFLOAT3* positions, _In_ size_t nVerts,
|
||||||
_In_reads_(nMeshlets) const Meshlet* meshlets, _In_ size_t nMeshlets,
|
_In_reads_(nMeshlets) const Meshlet* meshlets, _In_ size_t nMeshlets,
|
||||||
_In_reads_(nVertIndices) const uint32_t* uniqueVertexIndices, _In_ size_t nVertIndices,
|
_In_reads_(nVertIndices) const uint32_t* uniqueVertexIndices, _In_ size_t nVertIndices,
|
||||||
_In_reads_(nPrimIndices) const MeshletTriangle* primitiveIndices, _In_ size_t nPrimIndices,
|
_In_reads_(nPrimIndices) const MeshletTriangle* primitiveIndices, _In_ size_t nPrimIndices,
|
||||||
_Out_writes_(nMeshlets) CullData* cullData,
|
_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
|
// Computes culling data for each input meshlet
|
||||||
|
|
||||||
#include "DirectXMesh.inl"
|
#include "DirectXMesh.inl"
|
||||||
|
|
|
@ -270,7 +270,7 @@ HRESULT DirectX::ComputeNormals(
|
||||||
size_t nFaces,
|
size_t nFaces,
|
||||||
const XMFLOAT3* positions,
|
const XMFLOAT3* positions,
|
||||||
size_t nVerts,
|
size_t nVerts,
|
||||||
DWORD flags,
|
uint32_t flags,
|
||||||
XMFLOAT3* normals) noexcept
|
XMFLOAT3* normals) noexcept
|
||||||
{
|
{
|
||||||
if (!indices || !positions || !nFaces || !nVerts || !normals)
|
if (!indices || !positions || !nFaces || !nVerts || !normals)
|
||||||
|
@ -304,7 +304,7 @@ HRESULT DirectX::ComputeNormals(
|
||||||
size_t nFaces,
|
size_t nFaces,
|
||||||
const XMFLOAT3* positions,
|
const XMFLOAT3* positions,
|
||||||
size_t nVerts,
|
size_t nVerts,
|
||||||
DWORD flags,
|
uint32_t flags,
|
||||||
XMFLOAT3* normals) noexcept
|
XMFLOAT3* normals) noexcept
|
||||||
{
|
{
|
||||||
if (!indices || !positions || !nFaces || !nVerts || !normals)
|
if (!indices || !positions || !nFaces || !nVerts || !normals)
|
||||||
|
|
|
@ -22,7 +22,7 @@ namespace
|
||||||
HRESULT ValidateIndices(
|
HRESULT ValidateIndices(
|
||||||
_In_reads_(nFaces * 3) const index_t* indices, _In_ size_t nFaces,
|
_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_ 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;
|
bool result = true;
|
||||||
|
|
||||||
|
@ -361,7 +361,7 @@ HRESULT DirectX::Validate(
|
||||||
size_t nFaces,
|
size_t nFaces,
|
||||||
size_t nVerts,
|
size_t nVerts,
|
||||||
const uint32_t* adjacency,
|
const uint32_t* adjacency,
|
||||||
DWORD flags,
|
uint32_t flags,
|
||||||
std::wstring* msgs)
|
std::wstring* msgs)
|
||||||
{
|
{
|
||||||
if (!indices || !nFaces || !nVerts)
|
if (!indices || !nFaces || !nVerts)
|
||||||
|
@ -398,7 +398,7 @@ HRESULT DirectX::Validate(
|
||||||
size_t nFaces,
|
size_t nFaces,
|
||||||
size_t nVerts,
|
size_t nVerts,
|
||||||
const uint32_t* adjacency,
|
const uint32_t* adjacency,
|
||||||
DWORD flags,
|
uint32_t flags,
|
||||||
std::wstring* msgs)
|
std::wstring* msgs)
|
||||||
{
|
{
|
||||||
if (!indices || !nFaces || !nVerts)
|
if (!indices || !nFaces || !nVerts)
|
||||||
|
|
|
@ -569,7 +569,7 @@ namespace
|
||||||
_In_reads_(nPrimIndices) const MeshletTriangle* primitiveIndices,
|
_In_reads_(nPrimIndices) const MeshletTriangle* primitiveIndices,
|
||||||
size_t nPrimIndices,
|
size_t nPrimIndices,
|
||||||
_Out_writes_(nMeshlets) CullData* cullData,
|
_Out_writes_(nMeshlets) CullData* cullData,
|
||||||
MESHLET_FLAGS flags)
|
uint32_t flags)
|
||||||
{
|
{
|
||||||
// Input validation
|
// Input validation
|
||||||
if (!positions || !meshlets || !uniqueVertexIndices || !primitiveIndices || !cullData)
|
if (!positions || !meshlets || !uniqueVertexIndices || !primitiveIndices || !cullData)
|
||||||
|
@ -843,7 +843,7 @@ HRESULT DirectX::ComputeCullData(
|
||||||
const MeshletTriangle* primitiveIndices,
|
const MeshletTriangle* primitiveIndices,
|
||||||
size_t nPrimIndices,
|
size_t nPrimIndices,
|
||||||
CullData* cullData,
|
CullData* cullData,
|
||||||
MESHLET_FLAGS flags) noexcept
|
uint32_t flags) noexcept
|
||||||
{
|
{
|
||||||
return ComputeCullDataInternal<uint16_t>(
|
return ComputeCullDataInternal<uint16_t>(
|
||||||
positions, nVerts,
|
positions, nVerts,
|
||||||
|
@ -864,7 +864,7 @@ HRESULT DirectX::ComputeCullData(
|
||||||
const MeshletTriangle* primitiveIndices,
|
const MeshletTriangle* primitiveIndices,
|
||||||
size_t nPrimIndices,
|
size_t nPrimIndices,
|
||||||
CullData* cullData,
|
CullData* cullData,
|
||||||
MESHLET_FLAGS flags) noexcept
|
uint32_t flags) noexcept
|
||||||
{
|
{
|
||||||
return ComputeCullDataInternal<uint32_t>(
|
return ComputeCullDataInternal<uint32_t>(
|
||||||
positions, nVerts,
|
positions, nVerts,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче