diff options
| author | 2016-05-07 00:54:31 -0400 | |
|---|---|---|
| committer | 2016-05-07 00:54:31 -0400 | |
| commit | 1a6cd7eb4b0b17f51d5cce036aa586f909a068e0 (patch) | |
| tree | 0b6ce13f42bd581d7dce3228f05992bd9e84aa7e /src | |
| parent | Merge pull request #1544 from linkmauve/move-glad-init (diff) | |
| download | yuzu-1a6cd7eb4b0b17f51d5cce036aa586f909a068e0.tar.gz yuzu-1a6cd7eb4b0b17f51d5cce036aa586f909a068e0.tar.xz yuzu-1a6cd7eb4b0b17f51d5cce036aa586f909a068e0.zip | |
HLE: Fix recent DSP change for Visual Studio.
Diffstat (limited to 'src')
| -rw-r--r-- | src/audio_core/hle/dsp.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/audio_core/hle/dsp.h b/src/audio_core/hle/dsp.h index 4459a5668..f6e53f68f 100644 --- a/src/audio_core/hle/dsp.h +++ b/src/audio_core/hle/dsp.h | |||
| @@ -33,13 +33,9 @@ namespace HLE { | |||
| 33 | // double-buffer. The frame counter is located as the very last u16 of each region and is incremented | 33 | // double-buffer. The frame counter is located as the very last u16 of each region and is incremented |
| 34 | // each audio tick. | 34 | // each audio tick. |
| 35 | 35 | ||
| 36 | struct SharedMemory; | ||
| 37 | |||
| 38 | constexpr VAddr region0_base = 0x1FF50000; | 36 | constexpr VAddr region0_base = 0x1FF50000; |
| 39 | constexpr VAddr region1_base = 0x1FF70000; | 37 | constexpr VAddr region1_base = 0x1FF70000; |
| 40 | 38 | ||
| 41 | extern std::array<SharedMemory, 2> g_regions; | ||
| 42 | |||
| 43 | /** | 39 | /** |
| 44 | * The DSP is native 16-bit. The DSP also appears to be big-endian. When reading 32-bit numbers from | 40 | * The DSP is native 16-bit. The DSP also appears to be big-endian. When reading 32-bit numbers from |
| 45 | * its memory regions, the higher and lower 16-bit halves are swapped compared to the little-endian | 41 | * its memory regions, the higher and lower 16-bit halves are swapped compared to the little-endian |
| @@ -507,6 +503,8 @@ struct SharedMemory { | |||
| 507 | }; | 503 | }; |
| 508 | ASSERT_DSP_STRUCT(SharedMemory, 0x8000); | 504 | ASSERT_DSP_STRUCT(SharedMemory, 0x8000); |
| 509 | 505 | ||
| 506 | extern std::array<SharedMemory, 2> g_regions; | ||
| 507 | |||
| 510 | // Structures must have an offset that is a multiple of two. | 508 | // Structures must have an offset that is a multiple of two. |
| 511 | static_assert(offsetof(SharedMemory, frame_counter) % 2 == 0, "Structures in DSP::HLE::SharedMemory must be 2-byte aligned"); | 509 | static_assert(offsetof(SharedMemory, frame_counter) % 2 == 0, "Structures in DSP::HLE::SharedMemory must be 2-byte aligned"); |
| 512 | static_assert(offsetof(SharedMemory, source_configurations) % 2 == 0, "Structures in DSP::HLE::SharedMemory must be 2-byte aligned"); | 510 | static_assert(offsetof(SharedMemory, source_configurations) % 2 == 0, "Structures in DSP::HLE::SharedMemory must be 2-byte aligned"); |