diff options
| author | 2015-02-20 11:41:30 -0500 | |
|---|---|---|
| committer | 2015-02-20 11:41:30 -0500 | |
| commit | 5f9939070e81691e04facca9ff431070988e5b05 (patch) | |
| tree | 9bd54cdde2c34dd2f63e0396260335f267a46ce1 /src/core/hw | |
| parent | Merge pull request #587 from archshift/assert (diff) | |
| parent | Misc cleanup of common and related functions (diff) | |
| download | yuzu-5f9939070e81691e04facca9ff431070988e5b05.tar.gz yuzu-5f9939070e81691e04facca9ff431070988e5b05.tar.xz yuzu-5f9939070e81691e04facca9ff431070988e5b05.zip | |
Merge pull request #588 from archshift/somebranch
Sweeping cleanup of Common
Diffstat (limited to 'src/core/hw')
| -rw-r--r-- | src/core/hw/gpu.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/core/hw/gpu.h b/src/core/hw/gpu.h index df9aa0d71..75f524465 100644 --- a/src/core/hw/gpu.h +++ b/src/core/hw/gpu.h | |||
| @@ -34,13 +34,6 @@ namespace GPU { | |||
| 34 | // MMIO region 0x1EFxxxxx | 34 | // MMIO region 0x1EFxxxxx |
| 35 | struct Regs { | 35 | struct Regs { |
| 36 | 36 | ||
| 37 | // helper macro to properly align structure members. | ||
| 38 | // Calling INSERT_PADDING_WORDS will add a new member variable with a name like "pad121", | ||
| 39 | // depending on the current source line to make sure variable names are unique. | ||
| 40 | #define INSERT_PADDING_WORDS_HELPER1(x, y) x ## y | ||
| 41 | #define INSERT_PADDING_WORDS_HELPER2(x, y) INSERT_PADDING_WORDS_HELPER1(x, y) | ||
| 42 | #define INSERT_PADDING_WORDS(num_words) u32 INSERT_PADDING_WORDS_HELPER2(pad, __LINE__)[(num_words)] | ||
| 43 | |||
| 44 | // helper macro to make sure the defined structures are of the expected size. | 37 | // helper macro to make sure the defined structures are of the expected size. |
| 45 | #if defined(_MSC_VER) | 38 | #if defined(_MSC_VER) |
| 46 | // TODO: MSVC does not support using sizeof() on non-static data members even though this | 39 | // TODO: MSVC does not support using sizeof() on non-static data members even though this |
| @@ -238,10 +231,6 @@ struct Regs { | |||
| 238 | 231 | ||
| 239 | INSERT_PADDING_WORDS(0x9c3); | 232 | INSERT_PADDING_WORDS(0x9c3); |
| 240 | 233 | ||
| 241 | #undef INSERT_PADDING_WORDS_HELPER1 | ||
| 242 | #undef INSERT_PADDING_WORDS_HELPER2 | ||
| 243 | #undef INSERT_PADDING_WORDS | ||
| 244 | |||
| 245 | static inline size_t NumIds() { | 234 | static inline size_t NumIds() { |
| 246 | return sizeof(Regs) / sizeof(u32); | 235 | return sizeof(Regs) / sizeof(u32); |
| 247 | } | 236 | } |