Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes for build failures when using MinGW #95

Merged
merged 2 commits into from
Apr 21, 2023
Merged

Fixes for build failures when using MinGW #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dd8019
Fixes for build failures when using MinGW
walbourn Apr 21, 2023
577fd3f
Fix GoogleTest+MinGW bugs
walbourn Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 41 additions & 0 deletions googletest/MockDevice.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ class MockDevice : public ID3D12Device
return;
}

#if defined(_MSC_VER) || !defined(_WIN32)
virtual D3D12_RESOURCE_ALLOCATION_INFO STDMETHODCALLTYPE GetResourceAllocationInfo(
_In_ UINT visibleMask,
_In_ UINT numResourceDescs,
Expand All @@ -206,14 +207,42 @@ class MockDevice : public ID3D12Device
D3D12_RESOURCE_ALLOCATION_INFO mockInfo = {};
return mockInfo;
}
#else
virtual D3D12_RESOURCE_ALLOCATION_INFO *STDMETHODCALLTYPE GetResourceAllocationInfo(
D3D12_RESOURCE_ALLOCATION_INFO * RetVal,
_In_ UINT visibleMask,
_In_ UINT numResourceDescs,
_In_reads_(numResourceDescs) const D3D12_RESOURCE_DESC *pResourceDescs) override
{
if (RetVal)
{
*RetVal = {};
}
return RetVal;
}
#endif

#if defined(_MSC_VER) || !defined(_WIN32)
virtual D3D12_HEAP_PROPERTIES STDMETHODCALLTYPE GetCustomHeapProperties(
_In_ UINT nodeMask,
D3D12_HEAP_TYPE heapType) override
{
D3D12_HEAP_PROPERTIES mockProps = {};
return mockProps;
}
#else
virtual D3D12_HEAP_PROPERTIES *STDMETHODCALLTYPE GetCustomHeapProperties(
D3D12_HEAP_PROPERTIES * RetVal,
_In_ UINT nodeMask,
D3D12_HEAP_TYPE heapType) override
{
if (RetVal)
{
*RetVal = {};
}
return RetVal;
}
#endif

virtual HRESULT STDMETHODCALLTYPE CreateCommittedResource(
_In_ const D3D12_HEAP_PROPERTIES *pHeapProperties,
Expand Down Expand Up @@ -360,11 +389,23 @@ class MockDevice : public ID3D12Device
return;
}

#if defined(_MSC_VER) || !defined(_WIN32)
virtual LUID STDMETHODCALLTYPE GetAdapterLuid( void) override
{
LUID mockLuid = {};
return mockLuid;
}
#else
virtual LUID *STDMETHODCALLTYPE GetAdapterLuid(
LUID * RetVal) override
{
if (RetVal)
{
*RetVal = {};
}
return RetVal;
}
#endif

public: // ID3D12Object
virtual HRESULT STDMETHODCALLTYPE GetPrivateData(
Expand Down
5 changes: 4 additions & 1 deletion src/d3dx12_property_format_table.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
#define WIN32_LEAN_AND_MEAN
#endif
#ifndef NOMINMAX
#define NOMINMAX
#define NOMINMAX 1
#endif
#ifdef __MINGW32__
walbourn marked this conversation as resolved.
Show resolved Hide resolved
#include <unknwn.h>
#endif
#ifndef _WIN32
#include <wsl/winadapter.h>
Expand Down