d3d12: Fixes d3d12 compiling errors in `D3D12ResourceState.h` for mingw
``` In file included from ../../src/gallium/drivers/d3d12/D3D12ResourceState.cpp:24: ../../src/gallium/drivers/d3d12/D3D12ResourceState.h:51:45: error: call to non-'constexpr' function 'D3D12_RESOURCE_STATES operator|(D3D12_RESOURCE_STATES, D3D12_RESOURCE_STATES)' 45 | D3D12_RESOURCE_STATE_RENDER_TARGET | | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 46 | D3D12_RESOURCE_STATE_UNORDERED_ACCESS | | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 47 | D3D12_RESOURCE_STATE_DEPTH_WRITE | | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 48 | D3D12_RESOURCE_STATE_STREAM_OUT | | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 49 | D3D12_RESOURCE_STATE_COPY_DEST | | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 50 | D3D12_RESOURCE_STATE_RESOLVE_DEST | | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 51 | D3D12_RESOURCE_STATE_VIDEO_DECODE_WRITE | | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^ 52 | D3D12_RESOURCE_STATE_VIDEO_PROCESS_WRITE; | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from C:/CI-Tools/msys64/mingw64/include/minwindef.h:163, from C:/CI-Tools/msys64/mingw64/include/windef.h:9, from C:/CI-Tools/msys64/mingw64/include/windows.h:69, from C:/CI-Tools/msys64/mingw64/include/rpc.h:16, from ../../subprojects/DirectX-Headers-1.0/include/directx/d3d12.h:26, from ../../src/gallium/drivers/d3d12/D3D12ResourceState.h:33, from ../../src/gallium/drivers/d3d12/D3D12ResourceState.cpp:24: ../../subprojects/DirectX-Headers-1.0/include/directx/d3d12.h:2865:1: note: 'D3D12_RESOURCE_STATES operator|(D3D12_RESOURCE_STATES, D3D12_RESOURCE_STATES)' declared here 2865 | DEFINE_ENUM_FLAG_OPERATORS( D3D12_RESOURCE_STATES ); | ^~~~~~~~~~~~~~~~~~~~~~~~~~ ``` Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> Reviewed-by: Jesse Natalie <jenatali@microsoft.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16767>
This commit is contained in:
parent
50bc8efe18
commit
b4f701f962
|
@ -41,7 +41,7 @@
|
|||
#define UNKNOWN_RESOURCE_STATE (D3D12_RESOURCE_STATES)0x8000u
|
||||
#define RESOURCE_STATE_VALID_BITS 0x2f3fff
|
||||
#define RESOURCE_STATE_VALID_INTERNAL_BITS 0x2fffff
|
||||
constexpr D3D12_RESOURCE_STATES RESOURCE_STATE_ALL_WRITE_BITS =
|
||||
const D3D12_RESOURCE_STATES RESOURCE_STATE_ALL_WRITE_BITS =
|
||||
D3D12_RESOURCE_STATE_RENDER_TARGET |
|
||||
D3D12_RESOURCE_STATE_UNORDERED_ACCESS |
|
||||
D3D12_RESOURCE_STATE_DEPTH_WRITE |
|
||||
|
|
Loading…
Reference in New Issue