diff options
| author | 2022-06-13 20:06:38 -0400 | |
|---|---|---|
| committer | 2022-06-13 20:06:38 -0400 | |
| commit | bd3bfe411d8319b8300037a78c152ad7dab839f3 (patch) | |
| tree | 81b97113ce3f9b4782020f741e14b3a29ecf06eb | |
| parent | Merge pull request #8388 from liamwhite/simpler-pause (diff) | |
| parent | structured_control_flow: Remove constexpr Flow::Block (diff) | |
| download | yuzu-bd3bfe411d8319b8300037a78c152ad7dab839f3.tar.gz yuzu-bd3bfe411d8319b8300037a78c152ad7dab839f3.tar.xz yuzu-bd3bfe411d8319b8300037a78c152ad7dab839f3.zip | |
Merge pull request #8458 from lat9nq/no-constexpr-flow-block
structured_control_flow: Remove constexpr Flow::Block
| -rw-r--r-- | src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp b/src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp index 3dc7c9a11..578bc8c1b 100644 --- a/src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp +++ b/src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp | |||
| @@ -975,13 +975,7 @@ private: | |||
| 975 | Environment& env; | 975 | Environment& env; |
| 976 | IR::AbstractSyntaxList& syntax_list; | 976 | IR::AbstractSyntaxList& syntax_list; |
| 977 | bool uses_demote_to_helper{}; | 977 | bool uses_demote_to_helper{}; |
| 978 | |||
| 979 | // TODO: C++20 Remove this when all compilers support constexpr std::vector | ||
| 980 | #if __cpp_lib_constexpr_vector >= 201907 | ||
| 981 | static constexpr Flow::Block dummy_flow_block; | ||
| 982 | #else | ||
| 983 | const Flow::Block dummy_flow_block; | 978 | const Flow::Block dummy_flow_block; |
| 984 | #endif | ||
| 985 | }; | 979 | }; |
| 986 | } // Anonymous namespace | 980 | } // Anonymous namespace |
| 987 | 981 | ||