diff options
| author |  bunnei | 2014-08-25 16:12:10 -0400 |
|---|---|---|
| committer | bunnei | 2014-08-25 16:12:10 -0400 |
| commit | 97fd8fc38d4f9c288779cddb06538860124c6263 (patch) | |
| tree | bc99e0fceaae732f9c8d4831fcdb8f661b49ccb8 /src/core/hw | |
| parent | Merge pull request #75 from xsacha/qt5 (diff) | |
| parent | Pica/Rasterizer: Clarify a TODO. (diff) | |
| download | yuzu-97fd8fc38d4f9c288779cddb06538860124c6263.tar.gz yuzu-97fd8fc38d4f9c288779cddb06538860124c6263.tar.xz yuzu-97fd8fc38d4f9c288779cddb06538860124c6263.zip | |
Merge pull request #50 from neobrain/pica
Further work on Pica emulation
Diffstat (limited to 'src/core/hw')
| -rw-r--r-- | src/core/hw/gpu.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hw/gpu.h b/src/core/hw/gpu.h index d20311a00..7186bfa84 100644 --- a/src/core/hw/gpu.h +++ b/src/core/hw/gpu.h | |||
| @@ -42,7 +42,7 @@ struct Regs { | |||
| 42 | // depending on the current source line to make sure variable names are unique. | 42 | // depending on the current source line to make sure variable names are unique. |
| 43 | #define INSERT_PADDING_WORDS_HELPER1(x, y) x ## y | 43 | #define INSERT_PADDING_WORDS_HELPER1(x, y) x ## y |
| 44 | #define INSERT_PADDING_WORDS_HELPER2(x, y) INSERT_PADDING_WORDS_HELPER1(x, y) | 44 | #define INSERT_PADDING_WORDS_HELPER2(x, y) INSERT_PADDING_WORDS_HELPER1(x, y) |
| 45 | #define INSERT_PADDING_WORDS(num_words) u32 INSERT_PADDING_WORDS_HELPER2(pad, __LINE__)[(num_words)]; | 45 | #define INSERT_PADDING_WORDS(num_words) u32 INSERT_PADDING_WORDS_HELPER2(pad, __LINE__)[(num_words)] |
| 46 | 46 | ||
| 47 | // helper macro to make sure the defined structures are of the expected size. | 47 | // helper macro to make sure the defined structures are of the expected size. |
| 48 | #if defined(_MSC_VER) | 48 | #if defined(_MSC_VER) |
| @@ -53,7 +53,7 @@ struct Regs { | |||
| 53 | #else | 53 | #else |
| 54 | #define ASSERT_MEMBER_SIZE(name, size_in_bytes) \ | 54 | #define ASSERT_MEMBER_SIZE(name, size_in_bytes) \ |
| 55 | static_assert(sizeof(name) == size_in_bytes, \ | 55 | static_assert(sizeof(name) == size_in_bytes, \ |
| 56 | "Structure size and register block length don't match"); | 56 | "Structure size and register block length don't match") |
| 57 | #endif | 57 | #endif |
| 58 | 58 | ||
| 59 | enum class FramebufferFormat : u32 { | 59 | enum class FramebufferFormat : u32 { |