From b4f701f96229f0ecfd75a7293bd72f23e3b9c977 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Sat, 30 Apr 2022 02:54:33 +0800 Subject: [PATCH] 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 Reviewed-by: Jesse Natalie Part-of: --- src/gallium/drivers/d3d12/D3D12ResourceState.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/d3d12/D3D12ResourceState.h b/src/gallium/drivers/d3d12/D3D12ResourceState.h index 76657b14562..e4d84f049f1 100644 --- a/src/gallium/drivers/d3d12/D3D12ResourceState.h +++ b/src/gallium/drivers/d3d12/D3D12ResourceState.h @@ -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 |