diff options
| author | 2016-01-28 15:22:57 -0500 | |
|---|---|---|
| committer | 2016-01-28 15:22:57 -0500 | |
| commit | 3ab6d77c206c33e5036fcde1de0663c2f72777ea (patch) | |
| tree | 9a7a1f11dc7be8f530c9cb4a83561b3eaa4c03e9 | |
| parent | Merge pull request #1367 from yuriks/jit-jmp (diff) | |
| parent | color: Make trivial helpers constexpr (diff) | |
| download | yuzu-3ab6d77c206c33e5036fcde1de0663c2f72777ea.tar.gz yuzu-3ab6d77c206c33e5036fcde1de0663c2f72777ea.tar.xz yuzu-3ab6d77c206c33e5036fcde1de0663c2f72777ea.zip | |
Merge pull request #1379 from lioncash/color
color: Make trivial helpers constexpr
Diffstat (limited to '')
| -rw-r--r-- | src/common/color.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/common/color.h b/src/common/color.h index eb199e308..908879ea6 100644 --- a/src/common/color.h +++ b/src/common/color.h | |||
| @@ -11,42 +11,42 @@ | |||
| 11 | namespace Color { | 11 | namespace Color { |
| 12 | 12 | ||
| 13 | /// Convert a 1-bit color component to 8 bit | 13 | /// Convert a 1-bit color component to 8 bit |
| 14 | inline u8 Convert1To8(u8 value) { | 14 | constexpr u8 Convert1To8(u8 value) { |
| 15 | return value * 255; | 15 | return value * 255; |
| 16 | } | 16 | } |
| 17 | 17 | ||
| 18 | /// Convert a 4-bit color component to 8 bit | 18 | /// Convert a 4-bit color component to 8 bit |
| 19 | inline u8 Convert4To8(u8 value) { | 19 | constexpr u8 Convert4To8(u8 value) { |
| 20 | return (value << 4) | value; | 20 | return (value << 4) | value; |
| 21 | } | 21 | } |
| 22 | 22 | ||
| 23 | /// Convert a 5-bit color component to 8 bit | 23 | /// Convert a 5-bit color component to 8 bit |
| 24 | inline u8 Convert5To8(u8 value) { | 24 | constexpr u8 Convert5To8(u8 value) { |
| 25 | return (value << 3) | (value >> 2); | 25 | return (value << 3) | (value >> 2); |
| 26 | } | 26 | } |
| 27 | 27 | ||
| 28 | /// Convert a 6-bit color component to 8 bit | 28 | /// Convert a 6-bit color component to 8 bit |
| 29 | inline u8 Convert6To8(u8 value) { | 29 | constexpr u8 Convert6To8(u8 value) { |
| 30 | return (value << 2) | (value >> 4); | 30 | return (value << 2) | (value >> 4); |
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | /// Convert a 8-bit color component to 1 bit | 33 | /// Convert a 8-bit color component to 1 bit |
| 34 | inline u8 Convert8To1(u8 value) { | 34 | constexpr u8 Convert8To1(u8 value) { |
| 35 | return value >> 7; | 35 | return value >> 7; |
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | /// Convert a 8-bit color component to 4 bit | 38 | /// Convert a 8-bit color component to 4 bit |
| 39 | inline u8 Convert8To4(u8 value) { | 39 | constexpr u8 Convert8To4(u8 value) { |
| 40 | return value >> 4; | 40 | return value >> 4; |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | /// Convert a 8-bit color component to 5 bit | 43 | /// Convert a 8-bit color component to 5 bit |
| 44 | inline u8 Convert8To5(u8 value) { | 44 | constexpr u8 Convert8To5(u8 value) { |
| 45 | return value >> 3; | 45 | return value >> 3; |
| 46 | } | 46 | } |
| 47 | 47 | ||
| 48 | /// Convert a 8-bit color component to 6 bit | 48 | /// Convert a 8-bit color component to 6 bit |
| 49 | inline u8 Convert8To6(u8 value) { | 49 | constexpr u8 Convert8To6(u8 value) { |
| 50 | return value >> 2; | 50 | return value >> 2; |
| 51 | } | 51 | } |
| 52 | 52 | ||