diff options
| author | 2018-08-11 14:08:12 -0400 | |
|---|---|---|
| committer | 2018-08-11 14:08:12 -0400 | |
| commit | b8b9f41b6b3488de84877d34453ca6a0338aeeaf (patch) | |
| tree | b641ce5b4b3732439b324321d2ddc7cf079edc0c | |
| parent | Implement R16S & R16UI & R16I RenderTargetFormats & PixelFormats and more (R1... (diff) | |
| parent | video_core: Use variable template variants of type_traits interfaces where ap... (diff) | |
| download | yuzu-b8b9f41b6b3488de84877d34453ca6a0338aeeaf.tar.gz yuzu-b8b9f41b6b3488de84877d34453ca6a0338aeeaf.tar.xz yuzu-b8b9f41b6b3488de84877d34453ca6a0338aeeaf.zip | |
Merge pull request #1003 from lioncash/var
video_core: Use variable template variants of type_traits interfaces where applicable
| -rw-r--r-- | src/video_core/command_processor.h | 3 | ||||
| -rw-r--r-- | src/video_core/engines/shader_bytecode.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/video_core/command_processor.h b/src/video_core/command_processor.h index f7214ffec..a01153e0b 100644 --- a/src/video_core/command_processor.h +++ b/src/video_core/command_processor.h | |||
| @@ -30,8 +30,7 @@ union CommandHeader { | |||
| 30 | 30 | ||
| 31 | BitField<29, 3, SubmissionMode> mode; | 31 | BitField<29, 3, SubmissionMode> mode; |
| 32 | }; | 32 | }; |
| 33 | static_assert(std::is_standard_layout<CommandHeader>::value == true, | 33 | static_assert(std::is_standard_layout_v<CommandHeader>, "CommandHeader is not standard layout"); |
| 34 | "CommandHeader does not use standard layout"); | ||
| 35 | static_assert(sizeof(CommandHeader) == sizeof(u32), "CommandHeader has incorrect size!"); | 34 | static_assert(sizeof(CommandHeader) == sizeof(u32), "CommandHeader has incorrect size!"); |
| 36 | 35 | ||
| 37 | } // namespace Tegra | 36 | } // namespace Tegra |
diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h index 3d4557b7e..3e409c2e1 100644 --- a/src/video_core/engines/shader_bytecode.h +++ b/src/video_core/engines/shader_bytecode.h | |||
| @@ -477,8 +477,7 @@ union Instruction { | |||
| 477 | u64 value; | 477 | u64 value; |
| 478 | }; | 478 | }; |
| 479 | static_assert(sizeof(Instruction) == 0x8, "Incorrect structure size"); | 479 | static_assert(sizeof(Instruction) == 0x8, "Incorrect structure size"); |
| 480 | static_assert(std::is_standard_layout<Instruction>::value, | 480 | static_assert(std::is_standard_layout_v<Instruction>, "Instruction is not standard layout"); |
| 481 | "Structure does not have standard layout"); | ||
| 482 | 481 | ||
| 483 | class OpCode { | 482 | class OpCode { |
| 484 | public: | 483 | public: |