mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-09-12 12:37:49 +02:00
Merge pull request #2144 from lioncash/factor
service/vi: Convert Display and Layer structs into classes
This commit is contained in:
commit
57985fb16a
@ -28,9 +28,13 @@ namespace Service::NVFlinger {
|
|||||||
constexpr std::size_t SCREEN_REFRESH_RATE = 60;
|
constexpr std::size_t SCREEN_REFRESH_RATE = 60;
|
||||||
constexpr u64 frame_ticks = static_cast<u64>(Core::Timing::BASE_CLOCK_RATE / SCREEN_REFRESH_RATE);
|
constexpr u64 frame_ticks = static_cast<u64>(Core::Timing::BASE_CLOCK_RATE / SCREEN_REFRESH_RATE);
|
||||||
|
|
||||||
NVFlinger::NVFlinger(Core::Timing::CoreTiming& core_timing)
|
NVFlinger::NVFlinger(Core::Timing::CoreTiming& core_timing) : core_timing{core_timing} {
|
||||||
: displays{{0, "Default"}, {1, "External"}, {2, "Edid"}, {3, "Internal"}, {4, "Null"}},
|
displays.emplace_back(0, "Default");
|
||||||
core_timing{core_timing} {
|
displays.emplace_back(1, "External");
|
||||||
|
displays.emplace_back(2, "Edid");
|
||||||
|
displays.emplace_back(3, "Internal");
|
||||||
|
displays.emplace_back(4, "Null");
|
||||||
|
|
||||||
// Schedule the screen composition events
|
// Schedule the screen composition events
|
||||||
composition_event =
|
composition_event =
|
||||||
core_timing.RegisterEvent("ScreenComposition", [this](u64 userdata, int cycles_late) {
|
core_timing.RegisterEvent("ScreenComposition", [this](u64 userdata, int cycles_late) {
|
||||||
@ -55,13 +59,14 @@ std::optional<u64> NVFlinger::OpenDisplay(std::string_view name) {
|
|||||||
// TODO(Subv): Currently we only support the Default display.
|
// TODO(Subv): Currently we only support the Default display.
|
||||||
ASSERT(name == "Default");
|
ASSERT(name == "Default");
|
||||||
|
|
||||||
const auto itr = std::find_if(displays.begin(), displays.end(),
|
const auto itr =
|
||||||
[&](const VI::Display& display) { return display.name == name; });
|
std::find_if(displays.begin(), displays.end(),
|
||||||
|
[&](const VI::Display& display) { return display.GetName() == name; });
|
||||||
if (itr == displays.end()) {
|
if (itr == displays.end()) {
|
||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
return itr->id;
|
return itr->GetID();
|
||||||
}
|
}
|
||||||
|
|
||||||
std::optional<u64> NVFlinger::CreateLayer(u64 display_id) {
|
std::optional<u64> NVFlinger::CreateLayer(u64 display_id) {
|
||||||
@ -71,13 +76,10 @@ std::optional<u64> NVFlinger::CreateLayer(u64 display_id) {
|
|||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
ASSERT_MSG(display->layers.empty(), "Only one layer is supported per display at the moment");
|
|
||||||
|
|
||||||
const u64 layer_id = next_layer_id++;
|
const u64 layer_id = next_layer_id++;
|
||||||
const u32 buffer_queue_id = next_buffer_queue_id++;
|
const u32 buffer_queue_id = next_buffer_queue_id++;
|
||||||
auto buffer_queue = std::make_shared<BufferQueue>(buffer_queue_id, layer_id);
|
buffer_queues.emplace_back(buffer_queue_id, layer_id);
|
||||||
display->layers.emplace_back(layer_id, buffer_queue);
|
display->CreateLayer(layer_id, buffer_queues.back());
|
||||||
buffer_queues.emplace_back(std::move(buffer_queue));
|
|
||||||
return layer_id;
|
return layer_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -88,7 +90,7 @@ std::optional<u32> NVFlinger::FindBufferQueueId(u64 display_id, u64 layer_id) co
|
|||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
return layer->buffer_queue->GetId();
|
return layer->GetBufferQueue().GetId();
|
||||||
}
|
}
|
||||||
|
|
||||||
Kernel::SharedPtr<Kernel::ReadableEvent> NVFlinger::FindVsyncEvent(u64 display_id) const {
|
Kernel::SharedPtr<Kernel::ReadableEvent> NVFlinger::FindVsyncEvent(u64 display_id) const {
|
||||||
@ -98,12 +100,20 @@ Kernel::SharedPtr<Kernel::ReadableEvent> NVFlinger::FindVsyncEvent(u64 display_i
|
|||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
return display->vsync_event.readable;
|
return display->GetVSyncEvent();
|
||||||
}
|
}
|
||||||
|
|
||||||
std::shared_ptr<BufferQueue> NVFlinger::FindBufferQueue(u32 id) const {
|
BufferQueue& NVFlinger::FindBufferQueue(u32 id) {
|
||||||
const auto itr = std::find_if(buffer_queues.begin(), buffer_queues.end(),
|
const auto itr = std::find_if(buffer_queues.begin(), buffer_queues.end(),
|
||||||
[&](const auto& queue) { return queue->GetId() == id; });
|
[id](const auto& queue) { return queue.GetId() == id; });
|
||||||
|
|
||||||
|
ASSERT(itr != buffer_queues.end());
|
||||||
|
return *itr;
|
||||||
|
}
|
||||||
|
|
||||||
|
const BufferQueue& NVFlinger::FindBufferQueue(u32 id) const {
|
||||||
|
const auto itr = std::find_if(buffer_queues.begin(), buffer_queues.end(),
|
||||||
|
[id](const auto& queue) { return queue.GetId() == id; });
|
||||||
|
|
||||||
ASSERT(itr != buffer_queues.end());
|
ASSERT(itr != buffer_queues.end());
|
||||||
return *itr;
|
return *itr;
|
||||||
@ -112,7 +122,7 @@ std::shared_ptr<BufferQueue> NVFlinger::FindBufferQueue(u32 id) const {
|
|||||||
VI::Display* NVFlinger::FindDisplay(u64 display_id) {
|
VI::Display* NVFlinger::FindDisplay(u64 display_id) {
|
||||||
const auto itr =
|
const auto itr =
|
||||||
std::find_if(displays.begin(), displays.end(),
|
std::find_if(displays.begin(), displays.end(),
|
||||||
[&](const VI::Display& display) { return display.id == display_id; });
|
[&](const VI::Display& display) { return display.GetID() == display_id; });
|
||||||
|
|
||||||
if (itr == displays.end()) {
|
if (itr == displays.end()) {
|
||||||
return nullptr;
|
return nullptr;
|
||||||
@ -124,7 +134,7 @@ VI::Display* NVFlinger::FindDisplay(u64 display_id) {
|
|||||||
const VI::Display* NVFlinger::FindDisplay(u64 display_id) const {
|
const VI::Display* NVFlinger::FindDisplay(u64 display_id) const {
|
||||||
const auto itr =
|
const auto itr =
|
||||||
std::find_if(displays.begin(), displays.end(),
|
std::find_if(displays.begin(), displays.end(),
|
||||||
[&](const VI::Display& display) { return display.id == display_id; });
|
[&](const VI::Display& display) { return display.GetID() == display_id; });
|
||||||
|
|
||||||
if (itr == displays.end()) {
|
if (itr == displays.end()) {
|
||||||
return nullptr;
|
return nullptr;
|
||||||
@ -140,14 +150,7 @@ VI::Layer* NVFlinger::FindLayer(u64 display_id, u64 layer_id) {
|
|||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto itr = std::find_if(display->layers.begin(), display->layers.end(),
|
return display->FindLayer(layer_id);
|
||||||
[&](const VI::Layer& layer) { return layer.id == layer_id; });
|
|
||||||
|
|
||||||
if (itr == display->layers.end()) {
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
return &*itr;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const VI::Layer* NVFlinger::FindLayer(u64 display_id, u64 layer_id) const {
|
const VI::Layer* NVFlinger::FindLayer(u64 display_id, u64 layer_id) const {
|
||||||
@ -157,33 +160,24 @@ const VI::Layer* NVFlinger::FindLayer(u64 display_id, u64 layer_id) const {
|
|||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto itr = std::find_if(display->layers.begin(), display->layers.end(),
|
return display->FindLayer(layer_id);
|
||||||
[&](const VI::Layer& layer) { return layer.id == layer_id; });
|
|
||||||
|
|
||||||
if (itr == display->layers.end()) {
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
return &*itr;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void NVFlinger::Compose() {
|
void NVFlinger::Compose() {
|
||||||
for (auto& display : displays) {
|
for (auto& display : displays) {
|
||||||
// Trigger vsync for this display at the end of drawing
|
// Trigger vsync for this display at the end of drawing
|
||||||
SCOPE_EXIT({ display.vsync_event.writable->Signal(); });
|
SCOPE_EXIT({ display.SignalVSyncEvent(); });
|
||||||
|
|
||||||
// Don't do anything for displays without layers.
|
// Don't do anything for displays without layers.
|
||||||
if (display.layers.empty())
|
if (!display.HasLayers())
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
// TODO(Subv): Support more than 1 layer.
|
// TODO(Subv): Support more than 1 layer.
|
||||||
ASSERT_MSG(display.layers.size() == 1, "Max 1 layer per display is supported");
|
VI::Layer& layer = display.GetLayer(0);
|
||||||
|
auto& buffer_queue = layer.GetBufferQueue();
|
||||||
VI::Layer& layer = display.layers[0];
|
|
||||||
auto& buffer_queue = layer.buffer_queue;
|
|
||||||
|
|
||||||
// Search for a queued buffer and acquire it
|
// Search for a queued buffer and acquire it
|
||||||
auto buffer = buffer_queue->AcquireBuffer();
|
auto buffer = buffer_queue.AcquireBuffer();
|
||||||
|
|
||||||
MicroProfileFlip();
|
MicroProfileFlip();
|
||||||
|
|
||||||
@ -208,7 +202,7 @@ void NVFlinger::Compose() {
|
|||||||
igbp_buffer.width, igbp_buffer.height, igbp_buffer.stride,
|
igbp_buffer.width, igbp_buffer.height, igbp_buffer.stride,
|
||||||
buffer->get().transform, buffer->get().crop_rect);
|
buffer->get().transform, buffer->get().crop_rect);
|
||||||
|
|
||||||
buffer_queue->ReleaseBuffer(buffer->get().slot);
|
buffer_queue.ReleaseBuffer(buffer->get().slot);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -28,8 +28,8 @@ class Module;
|
|||||||
} // namespace Service::Nvidia
|
} // namespace Service::Nvidia
|
||||||
|
|
||||||
namespace Service::VI {
|
namespace Service::VI {
|
||||||
struct Display;
|
class Display;
|
||||||
struct Layer;
|
class Layer;
|
||||||
} // namespace Service::VI
|
} // namespace Service::VI
|
||||||
|
|
||||||
namespace Service::NVFlinger {
|
namespace Service::NVFlinger {
|
||||||
@ -65,7 +65,10 @@ public:
|
|||||||
Kernel::SharedPtr<Kernel::ReadableEvent> FindVsyncEvent(u64 display_id) const;
|
Kernel::SharedPtr<Kernel::ReadableEvent> FindVsyncEvent(u64 display_id) const;
|
||||||
|
|
||||||
/// Obtains a buffer queue identified by the ID.
|
/// Obtains a buffer queue identified by the ID.
|
||||||
std::shared_ptr<BufferQueue> FindBufferQueue(u32 id) const;
|
BufferQueue& FindBufferQueue(u32 id);
|
||||||
|
|
||||||
|
/// Obtains a buffer queue identified by the ID.
|
||||||
|
const BufferQueue& FindBufferQueue(u32 id) const;
|
||||||
|
|
||||||
/// Performs a composition request to the emulated nvidia GPU and triggers the vsync events when
|
/// Performs a composition request to the emulated nvidia GPU and triggers the vsync events when
|
||||||
/// finished.
|
/// finished.
|
||||||
@ -87,7 +90,7 @@ private:
|
|||||||
std::shared_ptr<Nvidia::Module> nvdrv;
|
std::shared_ptr<Nvidia::Module> nvdrv;
|
||||||
|
|
||||||
std::vector<VI::Display> displays;
|
std::vector<VI::Display> displays;
|
||||||
std::vector<std::shared_ptr<BufferQueue>> buffer_queues;
|
std::vector<BufferQueue> buffer_queues;
|
||||||
|
|
||||||
/// Id to use for the next layer that is created, this counter is shared among all displays.
|
/// Id to use for the next layer that is created, this counter is shared among all displays.
|
||||||
u64 next_layer_id = 1;
|
u64 next_layer_id = 1;
|
||||||
|
@ -2,8 +2,12 @@
|
|||||||
// Licensed under GPLv2 or any later version
|
// Licensed under GPLv2 or any later version
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
|
#include <utility>
|
||||||
|
|
||||||
#include <fmt/format.h>
|
#include <fmt/format.h>
|
||||||
|
|
||||||
|
#include "common/assert.h"
|
||||||
#include "core/core.h"
|
#include "core/core.h"
|
||||||
#include "core/hle/kernel/readable_event.h"
|
#include "core/hle/kernel/readable_event.h"
|
||||||
#include "core/hle/service/vi/display/vi_display.h"
|
#include "core/hle/service/vi/display/vi_display.h"
|
||||||
@ -19,4 +23,49 @@ Display::Display(u64 id, std::string name) : id{id}, name{std::move(name)} {
|
|||||||
|
|
||||||
Display::~Display() = default;
|
Display::~Display() = default;
|
||||||
|
|
||||||
|
Layer& Display::GetLayer(std::size_t index) {
|
||||||
|
return layers.at(index);
|
||||||
|
}
|
||||||
|
|
||||||
|
const Layer& Display::GetLayer(std::size_t index) const {
|
||||||
|
return layers.at(index);
|
||||||
|
}
|
||||||
|
|
||||||
|
Kernel::SharedPtr<Kernel::ReadableEvent> Display::GetVSyncEvent() const {
|
||||||
|
return vsync_event.readable;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Display::SignalVSyncEvent() {
|
||||||
|
vsync_event.writable->Signal();
|
||||||
|
}
|
||||||
|
|
||||||
|
void Display::CreateLayer(u64 id, NVFlinger::BufferQueue& buffer_queue) {
|
||||||
|
// TODO(Subv): Support more than 1 layer.
|
||||||
|
ASSERT_MSG(layers.empty(), "Only one layer is supported per display at the moment");
|
||||||
|
|
||||||
|
layers.emplace_back(id, buffer_queue);
|
||||||
|
}
|
||||||
|
|
||||||
|
Layer* Display::FindLayer(u64 id) {
|
||||||
|
const auto itr = std::find_if(layers.begin(), layers.end(),
|
||||||
|
[id](const VI::Layer& layer) { return layer.GetID() == id; });
|
||||||
|
|
||||||
|
if (itr == layers.end()) {
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
return &*itr;
|
||||||
|
}
|
||||||
|
|
||||||
|
const Layer* Display::FindLayer(u64 id) const {
|
||||||
|
const auto itr = std::find_if(layers.begin(), layers.end(),
|
||||||
|
[id](const VI::Layer& layer) { return layer.GetID() == id; });
|
||||||
|
|
||||||
|
if (itr == layers.end()) {
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
return &*itr;
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace Service::VI
|
} // namespace Service::VI
|
||||||
|
@ -10,14 +10,84 @@
|
|||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
#include "core/hle/kernel/writable_event.h"
|
#include "core/hle/kernel/writable_event.h"
|
||||||
|
|
||||||
|
namespace Service::NVFlinger {
|
||||||
|
class BufferQueue;
|
||||||
|
}
|
||||||
|
|
||||||
namespace Service::VI {
|
namespace Service::VI {
|
||||||
|
|
||||||
struct Layer;
|
class Layer;
|
||||||
|
|
||||||
struct Display {
|
/// Represents a single display type
|
||||||
|
class Display {
|
||||||
|
public:
|
||||||
|
/// Constructs a display with a given unique ID and name.
|
||||||
|
///
|
||||||
|
/// @param id The unique ID for this display.
|
||||||
|
/// @param name The name for this display.
|
||||||
|
///
|
||||||
Display(u64 id, std::string name);
|
Display(u64 id, std::string name);
|
||||||
~Display();
|
~Display();
|
||||||
|
|
||||||
|
Display(const Display&) = delete;
|
||||||
|
Display& operator=(const Display&) = delete;
|
||||||
|
|
||||||
|
Display(Display&&) = default;
|
||||||
|
Display& operator=(Display&&) = default;
|
||||||
|
|
||||||
|
/// Gets the unique ID assigned to this display.
|
||||||
|
u64 GetID() const {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Gets the name of this display
|
||||||
|
const std::string& GetName() const {
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Whether or not this display has any layers added to it.
|
||||||
|
bool HasLayers() const {
|
||||||
|
return !layers.empty();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Gets a layer for this display based off an index.
|
||||||
|
Layer& GetLayer(std::size_t index);
|
||||||
|
|
||||||
|
/// Gets a layer for this display based off an index.
|
||||||
|
const Layer& GetLayer(std::size_t index) const;
|
||||||
|
|
||||||
|
/// Gets the readable vsync event.
|
||||||
|
Kernel::SharedPtr<Kernel::ReadableEvent> GetVSyncEvent() const;
|
||||||
|
|
||||||
|
/// Signals the internal vsync event.
|
||||||
|
void SignalVSyncEvent();
|
||||||
|
|
||||||
|
/// Creates and adds a layer to this display with the given ID.
|
||||||
|
///
|
||||||
|
/// @param id The ID to assign to the created layer.
|
||||||
|
/// @param buffer_queue The buffer queue for the layer instance to use.
|
||||||
|
///
|
||||||
|
void CreateLayer(u64 id, NVFlinger::BufferQueue& buffer_queue);
|
||||||
|
|
||||||
|
/// Attempts to find a layer with the given ID.
|
||||||
|
///
|
||||||
|
/// @param id The layer ID.
|
||||||
|
///
|
||||||
|
/// @returns If found, the Layer instance with the given ID.
|
||||||
|
/// If not found, then nullptr is returned.
|
||||||
|
///
|
||||||
|
Layer* FindLayer(u64 id);
|
||||||
|
|
||||||
|
/// Attempts to find a layer with the given ID.
|
||||||
|
///
|
||||||
|
/// @param id The layer ID.
|
||||||
|
///
|
||||||
|
/// @returns If found, the Layer instance with the given ID.
|
||||||
|
/// If not found, then nullptr is returned.
|
||||||
|
///
|
||||||
|
const Layer* FindLayer(u64 id) const;
|
||||||
|
|
||||||
|
private:
|
||||||
u64 id;
|
u64 id;
|
||||||
std::string name;
|
std::string name;
|
||||||
|
|
||||||
|
@ -6,8 +6,7 @@
|
|||||||
|
|
||||||
namespace Service::VI {
|
namespace Service::VI {
|
||||||
|
|
||||||
Layer::Layer(u64 id, std::shared_ptr<NVFlinger::BufferQueue> queue)
|
Layer::Layer(u64 id, NVFlinger::BufferQueue& queue) : id{id}, buffer_queue{queue} {}
|
||||||
: id{id}, buffer_queue{std::move(queue)} {}
|
|
||||||
|
|
||||||
Layer::~Layer() = default;
|
Layer::~Layer() = default;
|
||||||
|
|
||||||
|
@ -4,8 +4,6 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <memory>
|
|
||||||
|
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
|
|
||||||
namespace Service::NVFlinger {
|
namespace Service::NVFlinger {
|
||||||
@ -14,12 +12,41 @@ class BufferQueue;
|
|||||||
|
|
||||||
namespace Service::VI {
|
namespace Service::VI {
|
||||||
|
|
||||||
struct Layer {
|
/// Represents a single display layer.
|
||||||
Layer(u64 id, std::shared_ptr<NVFlinger::BufferQueue> queue);
|
class Layer {
|
||||||
|
public:
|
||||||
|
/// Constructs a layer with a given ID and buffer queue.
|
||||||
|
///
|
||||||
|
/// @param id The ID to assign to this layer.
|
||||||
|
/// @param queue The buffer queue for this layer to use.
|
||||||
|
///
|
||||||
|
Layer(u64 id, NVFlinger::BufferQueue& queue);
|
||||||
~Layer();
|
~Layer();
|
||||||
|
|
||||||
|
Layer(const Layer&) = delete;
|
||||||
|
Layer& operator=(const Layer&) = delete;
|
||||||
|
|
||||||
|
Layer(Layer&&) = default;
|
||||||
|
Layer& operator=(Layer&&) = delete;
|
||||||
|
|
||||||
|
/// Gets the ID for this layer.
|
||||||
|
u64 GetID() const {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Gets a reference to the buffer queue this layer is using.
|
||||||
|
NVFlinger::BufferQueue& GetBufferQueue() {
|
||||||
|
return buffer_queue;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Gets a const reference to the buffer queue this layer is using.
|
||||||
|
const NVFlinger::BufferQueue& GetBufferQueue() const {
|
||||||
|
return buffer_queue;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
u64 id;
|
u64 id;
|
||||||
std::shared_ptr<NVFlinger::BufferQueue> buffer_queue;
|
NVFlinger::BufferQueue& buffer_queue;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Service::VI
|
} // namespace Service::VI
|
||||||
|
@ -525,7 +525,7 @@ private:
|
|||||||
LOG_DEBUG(Service_VI, "called. id=0x{:08X} transaction={:X}, flags=0x{:08X}", id,
|
LOG_DEBUG(Service_VI, "called. id=0x{:08X} transaction={:X}, flags=0x{:08X}", id,
|
||||||
static_cast<u32>(transaction), flags);
|
static_cast<u32>(transaction), flags);
|
||||||
|
|
||||||
auto buffer_queue = nv_flinger->FindBufferQueue(id);
|
auto& buffer_queue = nv_flinger->FindBufferQueue(id);
|
||||||
|
|
||||||
if (transaction == TransactionId::Connect) {
|
if (transaction == TransactionId::Connect) {
|
||||||
IGBPConnectRequestParcel request{ctx.ReadBuffer()};
|
IGBPConnectRequestParcel request{ctx.ReadBuffer()};
|
||||||
@ -538,7 +538,7 @@ private:
|
|||||||
} else if (transaction == TransactionId::SetPreallocatedBuffer) {
|
} else if (transaction == TransactionId::SetPreallocatedBuffer) {
|
||||||
IGBPSetPreallocatedBufferRequestParcel request{ctx.ReadBuffer()};
|
IGBPSetPreallocatedBufferRequestParcel request{ctx.ReadBuffer()};
|
||||||
|
|
||||||
buffer_queue->SetPreallocatedBuffer(request.data.slot, request.buffer);
|
buffer_queue.SetPreallocatedBuffer(request.data.slot, request.buffer);
|
||||||
|
|
||||||
IGBPSetPreallocatedBufferResponseParcel response{};
|
IGBPSetPreallocatedBufferResponseParcel response{};
|
||||||
ctx.WriteBuffer(response.Serialize());
|
ctx.WriteBuffer(response.Serialize());
|
||||||
@ -546,7 +546,7 @@ private:
|
|||||||
IGBPDequeueBufferRequestParcel request{ctx.ReadBuffer()};
|
IGBPDequeueBufferRequestParcel request{ctx.ReadBuffer()};
|
||||||
const u32 width{request.data.width};
|
const u32 width{request.data.width};
|
||||||
const u32 height{request.data.height};
|
const u32 height{request.data.height};
|
||||||
std::optional<u32> slot = buffer_queue->DequeueBuffer(width, height);
|
std::optional<u32> slot = buffer_queue.DequeueBuffer(width, height);
|
||||||
|
|
||||||
if (slot) {
|
if (slot) {
|
||||||
// Buffer is available
|
// Buffer is available
|
||||||
@ -559,8 +559,8 @@ private:
|
|||||||
[=](Kernel::SharedPtr<Kernel::Thread> thread, Kernel::HLERequestContext& ctx,
|
[=](Kernel::SharedPtr<Kernel::Thread> thread, Kernel::HLERequestContext& ctx,
|
||||||
Kernel::ThreadWakeupReason reason) {
|
Kernel::ThreadWakeupReason reason) {
|
||||||
// Repeat TransactParcel DequeueBuffer when a buffer is available
|
// Repeat TransactParcel DequeueBuffer when a buffer is available
|
||||||
auto buffer_queue = nv_flinger->FindBufferQueue(id);
|
auto& buffer_queue = nv_flinger->FindBufferQueue(id);
|
||||||
std::optional<u32> slot = buffer_queue->DequeueBuffer(width, height);
|
std::optional<u32> slot = buffer_queue.DequeueBuffer(width, height);
|
||||||
ASSERT_MSG(slot != std::nullopt, "Could not dequeue buffer.");
|
ASSERT_MSG(slot != std::nullopt, "Could not dequeue buffer.");
|
||||||
|
|
||||||
IGBPDequeueBufferResponseParcel response{*slot};
|
IGBPDequeueBufferResponseParcel response{*slot};
|
||||||
@ -568,19 +568,19 @@ private:
|
|||||||
IPC::ResponseBuilder rb{ctx, 2};
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
rb.Push(RESULT_SUCCESS);
|
rb.Push(RESULT_SUCCESS);
|
||||||
},
|
},
|
||||||
buffer_queue->GetWritableBufferWaitEvent());
|
buffer_queue.GetWritableBufferWaitEvent());
|
||||||
}
|
}
|
||||||
} else if (transaction == TransactionId::RequestBuffer) {
|
} else if (transaction == TransactionId::RequestBuffer) {
|
||||||
IGBPRequestBufferRequestParcel request{ctx.ReadBuffer()};
|
IGBPRequestBufferRequestParcel request{ctx.ReadBuffer()};
|
||||||
|
|
||||||
auto& buffer = buffer_queue->RequestBuffer(request.slot);
|
auto& buffer = buffer_queue.RequestBuffer(request.slot);
|
||||||
|
|
||||||
IGBPRequestBufferResponseParcel response{buffer};
|
IGBPRequestBufferResponseParcel response{buffer};
|
||||||
ctx.WriteBuffer(response.Serialize());
|
ctx.WriteBuffer(response.Serialize());
|
||||||
} else if (transaction == TransactionId::QueueBuffer) {
|
} else if (transaction == TransactionId::QueueBuffer) {
|
||||||
IGBPQueueBufferRequestParcel request{ctx.ReadBuffer()};
|
IGBPQueueBufferRequestParcel request{ctx.ReadBuffer()};
|
||||||
|
|
||||||
buffer_queue->QueueBuffer(request.data.slot, request.data.transform,
|
buffer_queue.QueueBuffer(request.data.slot, request.data.transform,
|
||||||
request.data.GetCropRect());
|
request.data.GetCropRect());
|
||||||
|
|
||||||
IGBPQueueBufferResponseParcel response{1280, 720};
|
IGBPQueueBufferResponseParcel response{1280, 720};
|
||||||
@ -588,8 +588,8 @@ private:
|
|||||||
} else if (transaction == TransactionId::Query) {
|
} else if (transaction == TransactionId::Query) {
|
||||||
IGBPQueryRequestParcel request{ctx.ReadBuffer()};
|
IGBPQueryRequestParcel request{ctx.ReadBuffer()};
|
||||||
|
|
||||||
u32 value =
|
const u32 value =
|
||||||
buffer_queue->Query(static_cast<NVFlinger::BufferQueue::QueryType>(request.type));
|
buffer_queue.Query(static_cast<NVFlinger::BufferQueue::QueryType>(request.type));
|
||||||
|
|
||||||
IGBPQueryResponseParcel response{value};
|
IGBPQueryResponseParcel response{value};
|
||||||
ctx.WriteBuffer(response.Serialize());
|
ctx.WriteBuffer(response.Serialize());
|
||||||
@ -629,12 +629,12 @@ private:
|
|||||||
|
|
||||||
LOG_WARNING(Service_VI, "(STUBBED) called id={}, unknown={:08X}", id, unknown);
|
LOG_WARNING(Service_VI, "(STUBBED) called id={}, unknown={:08X}", id, unknown);
|
||||||
|
|
||||||
const auto buffer_queue = nv_flinger->FindBufferQueue(id);
|
const auto& buffer_queue = nv_flinger->FindBufferQueue(id);
|
||||||
|
|
||||||
// TODO(Subv): Find out what this actually is.
|
// TODO(Subv): Find out what this actually is.
|
||||||
IPC::ResponseBuilder rb{ctx, 2, 1};
|
IPC::ResponseBuilder rb{ctx, 2, 1};
|
||||||
rb.Push(RESULT_SUCCESS);
|
rb.Push(RESULT_SUCCESS);
|
||||||
rb.PushCopyObjects(buffer_queue->GetBufferWaitEvent());
|
rb.PushCopyObjects(buffer_queue.GetBufferWaitEvent());
|
||||||
}
|
}
|
||||||
|
|
||||||
std::shared_ptr<NVFlinger::NVFlinger> nv_flinger;
|
std::shared_ptr<NVFlinger::NVFlinger> nv_flinger;
|
||||||
|
Loading…
Reference in New Issue
Block a user