diff options
| author | 2018-02-14 00:47:51 -0500 | |
|---|---|---|
| committer | 2018-02-14 01:52:55 -0500 | |
| commit | 983777a3179b6e65d37c6432a601185b5827706b (patch) | |
| tree | 025803996789865dacefbbed41f00c9d99e38506 /src | |
| parent | nvhost_ctrl: Silence formatting specifier warnings (diff) | |
| download | yuzu-983777a3179b6e65d37c6432a601185b5827706b.tar.gz yuzu-983777a3179b6e65d37c6432a601185b5827706b.tar.xz yuzu-983777a3179b6e65d37c6432a601185b5827706b.zip | |
nvhost_gpu: Silence formatting specifier warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp index 0b2ebd466..da44c65f3 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include <cinttypes> | ||
| 5 | #include <map> | 6 | #include <map> |
| 6 | #include "common/assert.h" | 7 | #include "common/assert.h" |
| 7 | #include "common/logging/log.h" | 8 | #include "common/logging/log.h" |
| @@ -13,8 +14,8 @@ namespace Nvidia { | |||
| 13 | namespace Devices { | 14 | namespace Devices { |
| 14 | 15 | ||
| 15 | u32 nvhost_gpu::ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) { | 16 | u32 nvhost_gpu::ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) { |
| 16 | LOG_DEBUG(Service_NVDRV, "called, command=0x%08x, input_size=0x%llx, output_size=0x%llx", | 17 | LOG_DEBUG(Service_NVDRV, "called, command=0x%08x, input_size=0x%zx, output_size=0x%zx", |
| 17 | command, input.size(), output.size()); | 18 | command.raw, input.size(), output.size()); |
| 18 | 19 | ||
| 19 | switch (static_cast<IoctlCommand>(command.raw)) { | 20 | switch (static_cast<IoctlCommand>(command.raw)) { |
| 20 | case IoctlCommand::IocSetNVMAPfdCommand: | 21 | case IoctlCommand::IocSetNVMAPfdCommand: |
| @@ -74,7 +75,8 @@ u32 nvhost_gpu::GetClientData(const std::vector<u8>& input, std::vector<u8>& out | |||
| 74 | 75 | ||
| 75 | u32 nvhost_gpu::ZCullBind(const std::vector<u8>& input, std::vector<u8>& output) { | 76 | u32 nvhost_gpu::ZCullBind(const std::vector<u8>& input, std::vector<u8>& output) { |
| 76 | std::memcpy(&zcull_params, input.data(), input.size()); | 77 | std::memcpy(&zcull_params, input.data(), input.size()); |
| 77 | LOG_DEBUG(Service_NVDRV, "called, gpu_va=%lx, mode=%x", zcull_params.gpu_va, zcull_params.mode); | 78 | LOG_DEBUG(Service_NVDRV, "called, gpu_va=%" PRIx64 ", mode=%x", zcull_params.gpu_va, |
| 79 | zcull_params.mode); | ||
| 78 | std::memcpy(output.data(), &zcull_params, output.size()); | 80 | std::memcpy(output.data(), &zcull_params, output.size()); |
| 79 | return 0; | 81 | return 0; |
| 80 | } | 82 | } |
| @@ -82,8 +84,8 @@ u32 nvhost_gpu::ZCullBind(const std::vector<u8>& input, std::vector<u8>& output) | |||
| 82 | u32 nvhost_gpu::SetErrorNotifier(const std::vector<u8>& input, std::vector<u8>& output) { | 84 | u32 nvhost_gpu::SetErrorNotifier(const std::vector<u8>& input, std::vector<u8>& output) { |
| 83 | IoctlSetErrorNotifier params{}; | 85 | IoctlSetErrorNotifier params{}; |
| 84 | std::memcpy(¶ms, input.data(), input.size()); | 86 | std::memcpy(¶ms, input.data(), input.size()); |
| 85 | LOG_WARNING(Service_NVDRV, "(STUBBED) called, offset=%lx, size=%lx, mem=%x", params.offset, | 87 | LOG_WARNING(Service_NVDRV, "(STUBBED) called, offset=%" PRIx64 ", size=%" PRIx64 ", mem=%x", |
| 86 | params.size, params.mem); | 88 | params.offset, params.size, params.mem); |
| 87 | std::memcpy(output.data(), ¶ms, output.size()); | 89 | std::memcpy(output.data(), ¶ms, output.size()); |
| 88 | return 0; | 90 | return 0; |
| 89 | } | 91 | } |
| @@ -123,7 +125,7 @@ u32 nvhost_gpu::SubmitGPFIFO(const std::vector<u8>& input, std::vector<u8>& outp | |||
| 123 | UNIMPLEMENTED(); | 125 | UNIMPLEMENTED(); |
| 124 | IoctlSubmitGpfifo params{}; | 126 | IoctlSubmitGpfifo params{}; |
| 125 | std::memcpy(¶ms, input.data(), sizeof(IoctlSubmitGpfifo)); | 127 | std::memcpy(¶ms, input.data(), sizeof(IoctlSubmitGpfifo)); |
| 126 | LOG_WARNING(Service_NVDRV, "(STUBBED) called, gpfifo=%lx, num_entries=%x, flags=%x", | 128 | LOG_WARNING(Service_NVDRV, "(STUBBED) called, gpfifo=%" PRIx64 ", num_entries=%x, flags=%x", |
| 127 | params.gpfifo, params.num_entries, params.flags); | 129 | params.gpfifo, params.num_entries, params.flags); |
| 128 | 130 | ||
| 129 | auto entries = std::vector<IoctlGpfifoEntry>(); | 131 | auto entries = std::vector<IoctlGpfifoEntry>(); |