diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/nvflinger/buffer_queue.cpp | 206 | ||||
| -rw-r--r-- | src/core/hle/service/nvflinger/buffer_queue.h | 154 |
2 files changed, 0 insertions, 360 deletions
diff --git a/src/core/hle/service/nvflinger/buffer_queue.cpp b/src/core/hle/service/nvflinger/buffer_queue.cpp deleted file mode 100644 index 5fead6d1b..000000000 --- a/src/core/hle/service/nvflinger/buffer_queue.cpp +++ /dev/null | |||
| @@ -1,206 +0,0 @@ | |||
| 1 | // Copyright 2018 yuzu emulator team | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #include <algorithm> | ||
| 6 | |||
| 7 | #include "common/assert.h" | ||
| 8 | #include "common/logging/log.h" | ||
| 9 | #include "core/core.h" | ||
| 10 | #include "core/hle/kernel/k_writable_event.h" | ||
| 11 | #include "core/hle/kernel/kernel.h" | ||
| 12 | #include "core/hle/service/kernel_helpers.h" | ||
| 13 | #include "core/hle/service/nvflinger/buffer_queue.h" | ||
| 14 | |||
| 15 | namespace Service::NVFlinger { | ||
| 16 | |||
| 17 | BufferQueue::BufferQueue(Kernel::KernelCore& kernel, u32 id_, u64 layer_id_, | ||
| 18 | KernelHelpers::ServiceContext& service_context_) | ||
| 19 | : id(id_), layer_id(layer_id_), service_context{service_context_} { | ||
| 20 | buffer_wait_event = service_context.CreateEvent("BufferQueue:WaitEvent"); | ||
| 21 | } | ||
| 22 | |||
| 23 | BufferQueue::~BufferQueue() { | ||
| 24 | service_context.CloseEvent(buffer_wait_event); | ||
| 25 | } | ||
| 26 | |||
| 27 | void BufferQueue::SetPreallocatedBuffer(u32 slot, const IGBPBuffer& igbp_buffer) { | ||
| 28 | ASSERT(slot < buffer_slots); | ||
| 29 | LOG_WARNING(Service, "Adding graphics buffer {}", slot); | ||
| 30 | |||
| 31 | { | ||
| 32 | std::unique_lock lock{free_buffers_mutex}; | ||
| 33 | free_buffers.push_back(slot); | ||
| 34 | } | ||
| 35 | free_buffers_condition.notify_one(); | ||
| 36 | |||
| 37 | buffers[slot] = { | ||
| 38 | .slot = slot, | ||
| 39 | .status = Buffer::Status::Free, | ||
| 40 | .igbp_buffer = igbp_buffer, | ||
| 41 | .transform = {}, | ||
| 42 | .crop_rect = {}, | ||
| 43 | .swap_interval = 0, | ||
| 44 | .multi_fence = {}, | ||
| 45 | }; | ||
| 46 | |||
| 47 | buffer_wait_event->GetWritableEvent().Signal(); | ||
| 48 | } | ||
| 49 | |||
| 50 | std::optional<std::pair<u32, Service::Nvidia::MultiFence*>> BufferQueue::DequeueBuffer(u32 width, | ||
| 51 | u32 height) { | ||
| 52 | // Wait for first request before trying to dequeue | ||
| 53 | { | ||
| 54 | std::unique_lock lock{free_buffers_mutex}; | ||
| 55 | free_buffers_condition.wait(lock, [this] { return !free_buffers.empty() || !is_connect; }); | ||
| 56 | } | ||
| 57 | |||
| 58 | if (!is_connect) { | ||
| 59 | // Buffer was disconnected while the thread was blocked, this is most likely due to | ||
| 60 | // emulation being stopped | ||
| 61 | return std::nullopt; | ||
| 62 | } | ||
| 63 | |||
| 64 | std::unique_lock lock{free_buffers_mutex}; | ||
| 65 | |||
| 66 | auto f_itr = free_buffers.begin(); | ||
| 67 | auto slot = buffers.size(); | ||
| 68 | |||
| 69 | while (f_itr != free_buffers.end()) { | ||
| 70 | const Buffer& buffer = buffers[*f_itr]; | ||
| 71 | if (buffer.status == Buffer::Status::Free && buffer.igbp_buffer.width == width && | ||
| 72 | buffer.igbp_buffer.height == height) { | ||
| 73 | slot = *f_itr; | ||
| 74 | free_buffers.erase(f_itr); | ||
| 75 | break; | ||
| 76 | } | ||
| 77 | ++f_itr; | ||
| 78 | } | ||
| 79 | if (slot == buffers.size()) { | ||
| 80 | return std::nullopt; | ||
| 81 | } | ||
| 82 | buffers[slot].status = Buffer::Status::Dequeued; | ||
| 83 | return {{buffers[slot].slot, &buffers[slot].multi_fence}}; | ||
| 84 | } | ||
| 85 | |||
| 86 | const IGBPBuffer& BufferQueue::RequestBuffer(u32 slot) const { | ||
| 87 | ASSERT(slot < buffers.size()); | ||
| 88 | ASSERT(buffers[slot].status == Buffer::Status::Dequeued); | ||
| 89 | ASSERT(buffers[slot].slot == slot); | ||
| 90 | |||
| 91 | return buffers[slot].igbp_buffer; | ||
| 92 | } | ||
| 93 | |||
| 94 | void BufferQueue::QueueBuffer(u32 slot, BufferTransformFlags transform, | ||
| 95 | const Common::Rectangle<int>& crop_rect, u32 swap_interval, | ||
| 96 | Service::Nvidia::MultiFence& multi_fence) { | ||
| 97 | ASSERT(slot < buffers.size()); | ||
| 98 | ASSERT(buffers[slot].status == Buffer::Status::Dequeued); | ||
| 99 | ASSERT(buffers[slot].slot == slot); | ||
| 100 | |||
| 101 | buffers[slot].status = Buffer::Status::Queued; | ||
| 102 | buffers[slot].transform = transform; | ||
| 103 | buffers[slot].crop_rect = crop_rect; | ||
| 104 | buffers[slot].swap_interval = swap_interval; | ||
| 105 | buffers[slot].multi_fence = multi_fence; | ||
| 106 | std::unique_lock lock{queue_sequence_mutex}; | ||
| 107 | queue_sequence.push_back(slot); | ||
| 108 | } | ||
| 109 | |||
| 110 | void BufferQueue::CancelBuffer(u32 slot, const Service::Nvidia::MultiFence& multi_fence) { | ||
| 111 | ASSERT(slot < buffers.size()); | ||
| 112 | ASSERT(buffers[slot].status != Buffer::Status::Free); | ||
| 113 | ASSERT(buffers[slot].slot == slot); | ||
| 114 | |||
| 115 | buffers[slot].status = Buffer::Status::Free; | ||
| 116 | buffers[slot].multi_fence = multi_fence; | ||
| 117 | buffers[slot].swap_interval = 0; | ||
| 118 | |||
| 119 | { | ||
| 120 | std::unique_lock lock{free_buffers_mutex}; | ||
| 121 | free_buffers.push_back(slot); | ||
| 122 | } | ||
| 123 | free_buffers_condition.notify_one(); | ||
| 124 | |||
| 125 | buffer_wait_event->GetWritableEvent().Signal(); | ||
| 126 | } | ||
| 127 | |||
| 128 | std::optional<std::reference_wrapper<const BufferQueue::Buffer>> BufferQueue::AcquireBuffer() { | ||
| 129 | std::unique_lock lock{queue_sequence_mutex}; | ||
| 130 | std::size_t buffer_slot = buffers.size(); | ||
| 131 | // Iterate to find a queued buffer matching the requested slot. | ||
| 132 | while (buffer_slot == buffers.size() && !queue_sequence.empty()) { | ||
| 133 | const auto slot = static_cast<std::size_t>(queue_sequence.front()); | ||
| 134 | ASSERT(slot < buffers.size()); | ||
| 135 | if (buffers[slot].status == Buffer::Status::Queued) { | ||
| 136 | ASSERT(buffers[slot].slot == slot); | ||
| 137 | buffer_slot = slot; | ||
| 138 | } | ||
| 139 | queue_sequence.pop_front(); | ||
| 140 | } | ||
| 141 | if (buffer_slot == buffers.size()) { | ||
| 142 | return std::nullopt; | ||
| 143 | } | ||
| 144 | buffers[buffer_slot].status = Buffer::Status::Acquired; | ||
| 145 | return {{buffers[buffer_slot]}}; | ||
| 146 | } | ||
| 147 | |||
| 148 | void BufferQueue::ReleaseBuffer(u32 slot) { | ||
| 149 | ASSERT(slot < buffers.size()); | ||
| 150 | ASSERT(buffers[slot].status == Buffer::Status::Acquired); | ||
| 151 | ASSERT(buffers[slot].slot == slot); | ||
| 152 | |||
| 153 | buffers[slot].status = Buffer::Status::Free; | ||
| 154 | { | ||
| 155 | std::unique_lock lock{free_buffers_mutex}; | ||
| 156 | free_buffers.push_back(slot); | ||
| 157 | } | ||
| 158 | free_buffers_condition.notify_one(); | ||
| 159 | |||
| 160 | buffer_wait_event->GetWritableEvent().Signal(); | ||
| 161 | } | ||
| 162 | |||
| 163 | void BufferQueue::Connect() { | ||
| 164 | std::unique_lock lock{queue_sequence_mutex}; | ||
| 165 | queue_sequence.clear(); | ||
| 166 | is_connect = true; | ||
| 167 | } | ||
| 168 | |||
| 169 | void BufferQueue::Disconnect() { | ||
| 170 | buffers.fill({}); | ||
| 171 | { | ||
| 172 | std::unique_lock lock{queue_sequence_mutex}; | ||
| 173 | queue_sequence.clear(); | ||
| 174 | } | ||
| 175 | buffer_wait_event->GetWritableEvent().Signal(); | ||
| 176 | is_connect = false; | ||
| 177 | free_buffers_condition.notify_one(); | ||
| 178 | } | ||
| 179 | |||
| 180 | u32 BufferQueue::Query(QueryType type) { | ||
| 181 | LOG_WARNING(Service, "(STUBBED) called type={}", type); | ||
| 182 | |||
| 183 | switch (type) { | ||
| 184 | case QueryType::NativeWindowFormat: | ||
| 185 | return static_cast<u32>(PixelFormat::RGBA8888); | ||
| 186 | case QueryType::NativeWindowWidth: | ||
| 187 | case QueryType::NativeWindowHeight: | ||
| 188 | break; | ||
| 189 | case QueryType::NativeWindowMinUndequeuedBuffers: | ||
| 190 | return 0; | ||
| 191 | case QueryType::NativeWindowConsumerUsageBits: | ||
| 192 | return 0; | ||
| 193 | } | ||
| 194 | UNIMPLEMENTED_MSG("Unimplemented query type={}", type); | ||
| 195 | return 0; | ||
| 196 | } | ||
| 197 | |||
| 198 | Kernel::KWritableEvent& BufferQueue::GetWritableBufferWaitEvent() { | ||
| 199 | return buffer_wait_event->GetWritableEvent(); | ||
| 200 | } | ||
| 201 | |||
| 202 | Kernel::KReadableEvent& BufferQueue::GetBufferWaitEvent() { | ||
| 203 | return buffer_wait_event->GetReadableEvent(); | ||
| 204 | } | ||
| 205 | |||
| 206 | } // namespace Service::NVFlinger | ||
diff --git a/src/core/hle/service/nvflinger/buffer_queue.h b/src/core/hle/service/nvflinger/buffer_queue.h deleted file mode 100644 index f2a579133..000000000 --- a/src/core/hle/service/nvflinger/buffer_queue.h +++ /dev/null | |||
| @@ -1,154 +0,0 @@ | |||
| 1 | // Copyright 2018 yuzu emulator team | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #pragma once | ||
| 6 | |||
| 7 | #include <condition_variable> | ||
| 8 | #include <list> | ||
| 9 | #include <mutex> | ||
| 10 | #include <optional> | ||
| 11 | |||
| 12 | #include "common/common_funcs.h" | ||
| 13 | #include "common/math_util.h" | ||
| 14 | #include "common/swap.h" | ||
| 15 | #include "core/hle/kernel/k_event.h" | ||
| 16 | #include "core/hle/kernel/k_readable_event.h" | ||
| 17 | #include "core/hle/service/nvdrv/nvdata.h" | ||
| 18 | |||
| 19 | namespace Kernel { | ||
| 20 | class KernelCore; | ||
| 21 | class KEvent; | ||
| 22 | class KReadableEvent; | ||
| 23 | class KWritableEvent; | ||
| 24 | } // namespace Kernel | ||
| 25 | |||
| 26 | namespace Service::KernelHelpers { | ||
| 27 | class ServiceContext; | ||
| 28 | } // namespace Service::KernelHelpers | ||
| 29 | |||
| 30 | namespace Service::NVFlinger { | ||
| 31 | |||
| 32 | constexpr u32 buffer_slots = 0x40; | ||
| 33 | struct IGBPBuffer { | ||
| 34 | u32_le magic; | ||
| 35 | u32_le width; | ||
| 36 | u32_le height; | ||
| 37 | u32_le stride; | ||
| 38 | u32_le format; | ||
| 39 | u32_le usage; | ||
| 40 | INSERT_PADDING_WORDS(1); | ||
| 41 | u32_le index; | ||
| 42 | INSERT_PADDING_WORDS(3); | ||
| 43 | u32_le gpu_buffer_id; | ||
| 44 | INSERT_PADDING_WORDS(6); | ||
| 45 | u32_le external_format; | ||
| 46 | INSERT_PADDING_WORDS(10); | ||
| 47 | u32_le nvmap_handle; | ||
| 48 | u32_le offset; | ||
| 49 | INSERT_PADDING_WORDS(60); | ||
| 50 | }; | ||
| 51 | |||
| 52 | static_assert(sizeof(IGBPBuffer) == 0x16C, "IGBPBuffer has wrong size"); | ||
| 53 | |||
| 54 | class BufferQueue final { | ||
| 55 | public: | ||
| 56 | enum class QueryType { | ||
| 57 | NativeWindowWidth = 0, | ||
| 58 | NativeWindowHeight = 1, | ||
| 59 | NativeWindowFormat = 2, | ||
| 60 | /// The minimum number of buffers that must remain un-dequeued after a buffer has been | ||
| 61 | /// queued | ||
| 62 | NativeWindowMinUndequeuedBuffers = 3, | ||
| 63 | /// The consumer gralloc usage bits currently set by the consumer | ||
| 64 | NativeWindowConsumerUsageBits = 10, | ||
| 65 | }; | ||
| 66 | |||
| 67 | explicit BufferQueue(Kernel::KernelCore& kernel, u32 id_, u64 layer_id_, | ||
| 68 | KernelHelpers::ServiceContext& service_context_); | ||
| 69 | ~BufferQueue(); | ||
| 70 | |||
| 71 | enum class BufferTransformFlags : u32 { | ||
| 72 | /// No transform flags are set | ||
| 73 | Unset = 0x00, | ||
| 74 | /// Flip source image horizontally (around the vertical axis) | ||
| 75 | FlipH = 0x01, | ||
| 76 | /// Flip source image vertically (around the horizontal axis) | ||
| 77 | FlipV = 0x02, | ||
| 78 | /// Rotate source image 90 degrees clockwise | ||
| 79 | Rotate90 = 0x04, | ||
| 80 | /// Rotate source image 180 degrees | ||
| 81 | Rotate180 = 0x03, | ||
| 82 | /// Rotate source image 270 degrees clockwise | ||
| 83 | Rotate270 = 0x07, | ||
| 84 | }; | ||
| 85 | |||
| 86 | enum class PixelFormat : u32 { | ||
| 87 | RGBA8888 = 1, | ||
| 88 | RGBX8888 = 2, | ||
| 89 | RGB888 = 3, | ||
| 90 | RGB565 = 4, | ||
| 91 | BGRA8888 = 5, | ||
| 92 | RGBA5551 = 6, | ||
| 93 | RRGBA4444 = 7, | ||
| 94 | }; | ||
| 95 | |||
| 96 | struct Buffer { | ||
| 97 | enum class Status { Free = 0, Queued = 1, Dequeued = 2, Acquired = 3 }; | ||
| 98 | |||
| 99 | u32 slot; | ||
| 100 | Status status = Status::Free; | ||
| 101 | IGBPBuffer igbp_buffer; | ||
| 102 | BufferTransformFlags transform; | ||
| 103 | Common::Rectangle<int> crop_rect; | ||
| 104 | u32 swap_interval; | ||
| 105 | Service::Nvidia::MultiFence multi_fence; | ||
| 106 | }; | ||
| 107 | |||
| 108 | void SetPreallocatedBuffer(u32 slot, const IGBPBuffer& igbp_buffer); | ||
| 109 | std::optional<std::pair<u32, Service::Nvidia::MultiFence*>> DequeueBuffer(u32 width, | ||
| 110 | u32 height); | ||
| 111 | const IGBPBuffer& RequestBuffer(u32 slot) const; | ||
| 112 | void QueueBuffer(u32 slot, BufferTransformFlags transform, | ||
| 113 | const Common::Rectangle<int>& crop_rect, u32 swap_interval, | ||
| 114 | Service::Nvidia::MultiFence& multi_fence); | ||
| 115 | void CancelBuffer(u32 slot, const Service::Nvidia::MultiFence& multi_fence); | ||
| 116 | std::optional<std::reference_wrapper<const Buffer>> AcquireBuffer(); | ||
| 117 | void ReleaseBuffer(u32 slot); | ||
| 118 | void Connect(); | ||
| 119 | void Disconnect(); | ||
| 120 | u32 Query(QueryType type); | ||
| 121 | |||
| 122 | u32 GetId() const { | ||
| 123 | return id; | ||
| 124 | } | ||
| 125 | |||
| 126 | bool IsConnected() const { | ||
| 127 | return is_connect; | ||
| 128 | } | ||
| 129 | |||
| 130 | Kernel::KWritableEvent& GetWritableBufferWaitEvent(); | ||
| 131 | |||
| 132 | Kernel::KReadableEvent& GetBufferWaitEvent(); | ||
| 133 | |||
| 134 | private: | ||
| 135 | BufferQueue(const BufferQueue&) = delete; | ||
| 136 | |||
| 137 | u32 id{}; | ||
| 138 | u64 layer_id{}; | ||
| 139 | std::atomic_bool is_connect{}; | ||
| 140 | |||
| 141 | std::list<u32> free_buffers; | ||
| 142 | std::array<Buffer, buffer_slots> buffers; | ||
| 143 | std::list<u32> queue_sequence; | ||
| 144 | Kernel::KEvent* buffer_wait_event{}; | ||
| 145 | |||
| 146 | std::mutex free_buffers_mutex; | ||
| 147 | std::condition_variable free_buffers_condition; | ||
| 148 | |||
| 149 | std::mutex queue_sequence_mutex; | ||
| 150 | |||
| 151 | KernelHelpers::ServiceContext& service_context; | ||
| 152 | }; | ||
| 153 | |||
| 154 | } // namespace Service::NVFlinger | ||