diff options
| author | 2018-08-09 19:30:51 -0400 | |
|---|---|---|
| committer | 2018-08-09 19:30:51 -0400 | |
| commit | 5191c20b71310fcaea70a32e20ccebdeb50e145f (patch) | |
| tree | a7186115b592d23d9b255c9a384c6ef3e47adfec | |
| parent | Merge pull request #989 from lioncash/log (diff) | |
| parent | buffer_queue: Make reference parameter of SetPreallocatedBuffer const (diff) | |
| download | yuzu-5191c20b71310fcaea70a32e20ccebdeb50e145f.tar.gz yuzu-5191c20b71310fcaea70a32e20ccebdeb50e145f.tar.xz yuzu-5191c20b71310fcaea70a32e20ccebdeb50e145f.zip | |
Merge pull request #997 from lioncash/const-func
core: Make function reference parameters const where applicable
| -rw-r--r-- | src/core/hle/kernel/hle_ipc.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/hle_ipc.h | 2 | ||||
| -rw-r--r-- | src/core/hle/service/nvflinger/buffer_queue.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/nvflinger/buffer_queue.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp index 5dd1b68d7..82a3fb5a8 100644 --- a/src/core/hle/kernel/hle_ipc.cpp +++ b/src/core/hle/kernel/hle_ipc.cpp | |||
| @@ -201,7 +201,7 @@ ResultCode HLERequestContext::PopulateFromIncomingCommandBuffer(u32_le* src_cmdb | |||
| 201 | return RESULT_SUCCESS; | 201 | return RESULT_SUCCESS; |
| 202 | } | 202 | } |
| 203 | 203 | ||
| 204 | ResultCode HLERequestContext::WriteToOutgoingCommandBuffer(Thread& thread) { | 204 | ResultCode HLERequestContext::WriteToOutgoingCommandBuffer(const Thread& thread) { |
| 205 | std::array<u32, IPC::COMMAND_BUFFER_LENGTH> dst_cmdbuf; | 205 | std::array<u32, IPC::COMMAND_BUFFER_LENGTH> dst_cmdbuf; |
| 206 | Memory::ReadBlock(*thread.owner_process, thread.GetTLSAddress(), dst_cmdbuf.data(), | 206 | Memory::ReadBlock(*thread.owner_process, thread.GetTLSAddress(), dst_cmdbuf.data(), |
| 207 | dst_cmdbuf.size() * sizeof(u32)); | 207 | dst_cmdbuf.size() * sizeof(u32)); |
diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h index 9ce52db24..f0d07f1b6 100644 --- a/src/core/hle/kernel/hle_ipc.h +++ b/src/core/hle/kernel/hle_ipc.h | |||
| @@ -132,7 +132,7 @@ public: | |||
| 132 | ResultCode PopulateFromIncomingCommandBuffer(u32_le* src_cmdbuf, Process& src_process, | 132 | ResultCode PopulateFromIncomingCommandBuffer(u32_le* src_cmdbuf, Process& src_process, |
| 133 | HandleTable& src_table); | 133 | HandleTable& src_table); |
| 134 | /// Writes data from this context back to the requesting process/thread. | 134 | /// Writes data from this context back to the requesting process/thread. |
| 135 | ResultCode WriteToOutgoingCommandBuffer(Thread& thread); | 135 | ResultCode WriteToOutgoingCommandBuffer(const Thread& thread); |
| 136 | 136 | ||
| 137 | u32_le GetCommand() const { | 137 | u32_le GetCommand() const { |
| 138 | return command; | 138 | return command; |
diff --git a/src/core/hle/service/nvflinger/buffer_queue.cpp b/src/core/hle/service/nvflinger/buffer_queue.cpp index adf180509..ef5713a71 100644 --- a/src/core/hle/service/nvflinger/buffer_queue.cpp +++ b/src/core/hle/service/nvflinger/buffer_queue.cpp | |||
| @@ -16,7 +16,7 @@ BufferQueue::BufferQueue(u32 id, u64 layer_id) : id(id), layer_id(layer_id) { | |||
| 16 | Kernel::Event::Create(Kernel::ResetType::Sticky, "BufferQueue NativeHandle"); | 16 | Kernel::Event::Create(Kernel::ResetType::Sticky, "BufferQueue NativeHandle"); |
| 17 | } | 17 | } |
| 18 | 18 | ||
| 19 | void BufferQueue::SetPreallocatedBuffer(u32 slot, IGBPBuffer& igbp_buffer) { | 19 | void BufferQueue::SetPreallocatedBuffer(u32 slot, const IGBPBuffer& igbp_buffer) { |
| 20 | Buffer buffer{}; | 20 | Buffer buffer{}; |
| 21 | buffer.slot = slot; | 21 | buffer.slot = slot; |
| 22 | buffer.igbp_buffer = igbp_buffer; | 22 | buffer.igbp_buffer = igbp_buffer; |
diff --git a/src/core/hle/service/nvflinger/buffer_queue.h b/src/core/hle/service/nvflinger/buffer_queue.h index 004170538..f86e1056c 100644 --- a/src/core/hle/service/nvflinger/buffer_queue.h +++ b/src/core/hle/service/nvflinger/buffer_queue.h | |||
| @@ -72,7 +72,7 @@ public: | |||
| 72 | MathUtil::Rectangle<int> crop_rect; | 72 | MathUtil::Rectangle<int> crop_rect; |
| 73 | }; | 73 | }; |
| 74 | 74 | ||
| 75 | void SetPreallocatedBuffer(u32 slot, IGBPBuffer& buffer); | 75 | void SetPreallocatedBuffer(u32 slot, const IGBPBuffer& igbp_buffer); |
| 76 | boost::optional<u32> DequeueBuffer(u32 width, u32 height); | 76 | boost::optional<u32> DequeueBuffer(u32 width, u32 height); |
| 77 | const IGBPBuffer& RequestBuffer(u32 slot) const; | 77 | const IGBPBuffer& RequestBuffer(u32 slot) const; |
| 78 | void QueueBuffer(u32 slot, BufferTransformFlags transform, | 78 | void QueueBuffer(u32 slot, BufferTransformFlags transform, |