diff options
| author | 2018-06-20 16:46:14 -0400 | |
|---|---|---|
| committer | 2018-06-20 16:46:14 -0400 | |
| commit | c3e95086b66dfa4214892dcddb9fd6f865037c1e (patch) | |
| tree | 859f41acecbdcfcbdf19df80903a045d6e2b0bcb /src/core/hle/service | |
| parent | Implement GetAvailableLanguageCodes2 (#575) (diff) | |
| parent | Build: Fixed some MSVC warnings in various parts of the code. (diff) | |
| download | yuzu-c3e95086b66dfa4214892dcddb9fd6f865037c1e.tar.gz yuzu-c3e95086b66dfa4214892dcddb9fd6f865037c1e.tar.xz yuzu-c3e95086b66dfa4214892dcddb9fd6f865037c1e.zip | |
Merge pull request #576 from Subv/warnings1
Build: Fixed some MSVC warnings in various parts of the code.
Diffstat (limited to 'src/core/hle/service')
| -rw-r--r-- | src/core/hle/service/audio/audren_u.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp index 6e8002bc9..c7653f654 100644 --- a/src/core/hle/service/audio/audren_u.cpp +++ b/src/core/hle/service/audio/audren_u.cpp | |||
| @@ -328,7 +328,7 @@ bool AudRenU::IsFeatureSupported(AudioFeatures feature, u32_le revision) const { | |||
| 328 | u32_be version_num = (revision - Common::MakeMagic('R', 'E', 'V', '0')); // Byte swap | 328 | u32_be version_num = (revision - Common::MakeMagic('R', 'E', 'V', '0')); // Byte swap |
| 329 | switch (feature) { | 329 | switch (feature) { |
| 330 | case AudioFeatures::Splitter: | 330 | case AudioFeatures::Splitter: |
| 331 | return version_num >= 2; | 331 | return version_num >= 2u; |
| 332 | default: | 332 | default: |
| 333 | return false; | 333 | return false; |
| 334 | } | 334 | } |
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp index 79aab87f9..ed7b6dc03 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp | |||
| @@ -121,8 +121,9 @@ u32 nvhost_gpu::AllocateObjectContext(const std::vector<u8>& input, std::vector< | |||
| 121 | } | 121 | } |
| 122 | 122 | ||
| 123 | u32 nvhost_gpu::SubmitGPFIFO(const std::vector<u8>& input, std::vector<u8>& output) { | 123 | u32 nvhost_gpu::SubmitGPFIFO(const std::vector<u8>& input, std::vector<u8>& output) { |
| 124 | if (input.size() < sizeof(IoctlSubmitGpfifo)) | 124 | if (input.size() < sizeof(IoctlSubmitGpfifo)) { |
| 125 | UNIMPLEMENTED(); | 125 | UNIMPLEMENTED(); |
| 126 | } | ||
| 126 | IoctlSubmitGpfifo params{}; | 127 | IoctlSubmitGpfifo params{}; |
| 127 | std::memcpy(¶ms, input.data(), sizeof(IoctlSubmitGpfifo)); | 128 | std::memcpy(¶ms, input.data(), sizeof(IoctlSubmitGpfifo)); |
| 128 | NGLOG_WARNING(Service_NVDRV, "(STUBBED) called, gpfifo={:X}, num_entries={:X}, flags={:X}", | 129 | NGLOG_WARNING(Service_NVDRV, "(STUBBED) called, gpfifo={:X}, num_entries={:X}, flags={:X}", |