summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-05-16 10:45:14 +0200
committerGitHub <noreply@github.com>2021-05-16 10:45:14 +0200
commitd5131805ce5fff9dcda4d1b695281e4e852c9aae (patch)
treeab71aca47c57aed890ba8e6a79548e813a574b42
parentMerge pull request #6296 from lioncash/shadow-error (diff)
parentnvflinger: Create layers when they are queried but not found (diff)
downloadyuzu-d5131805ce5fff9dcda4d1b695281e4e852c9aae.tar
yuzu-d5131805ce5fff9dcda4d1b695281e4e852c9aae.tar.gz
yuzu-d5131805ce5fff9dcda4d1b695281e4e852c9aae.tar.bz2
yuzu-d5131805ce5fff9dcda4d1b695281e4e852c9aae.tar.lz
yuzu-d5131805ce5fff9dcda4d1b695281e4e852c9aae.tar.xz
yuzu-d5131805ce5fff9dcda4d1b695281e4e852c9aae.tar.zst
yuzu-d5131805ce5fff9dcda4d1b695281e4e852c9aae.zip
-rw-r--r--src/core/hle/service/nvflinger/nvflinger.cpp30
-rw-r--r--src/core/hle/service/nvflinger/nvflinger.h10
2 files changed, 35 insertions, 5 deletions
diff --git a/src/core/hle/service/nvflinger/nvflinger.cpp b/src/core/hle/service/nvflinger/nvflinger.cpp
index 72c630b4e..d1dbc659b 100644
--- a/src/core/hle/service/nvflinger/nvflinger.cpp
+++ b/src/core/hle/service/nvflinger/nvflinger.cpp
@@ -139,11 +139,15 @@ std::optional<u64> NVFlinger::CreateLayer(u64 display_id) {
}
const u64 layer_id = next_layer_id++;
+ CreateLayerAtId(*display, layer_id);
+ return layer_id;
+}
+
+void NVFlinger::CreateLayerAtId(VI::Display& display, u64 layer_id) {
const u32 buffer_queue_id = next_buffer_queue_id++;
buffer_queues.emplace_back(
std::make_unique<BufferQueue>(system.Kernel(), buffer_queue_id, layer_id));
- display->CreateLayer(layer_id, *buffer_queues.back());
- return layer_id;
+ display.CreateLayer(layer_id, *buffer_queues.back());
}
void NVFlinger::CloseLayer(u64 layer_id) {
@@ -154,9 +158,9 @@ void NVFlinger::CloseLayer(u64 layer_id) {
}
}
-std::optional<u32> NVFlinger::FindBufferQueueId(u64 display_id, u64 layer_id) const {
+std::optional<u32> NVFlinger::FindBufferQueueId(u64 display_id, u64 layer_id) {
const auto lock_guard = Lock();
- const auto* const layer = FindLayer(display_id, layer_id);
+ const auto* const layer = FindOrCreateLayer(display_id, layer_id);
if (layer == nullptr) {
return std::nullopt;
@@ -232,6 +236,24 @@ const VI::Layer* NVFlinger::FindLayer(u64 display_id, u64 layer_id) const {
return display->FindLayer(layer_id);
}
+VI::Layer* NVFlinger::FindOrCreateLayer(u64 display_id, u64 layer_id) {
+ auto* const display = FindDisplay(display_id);
+
+ if (display == nullptr) {
+ return nullptr;
+ }
+
+ auto* layer = display->FindLayer(layer_id);
+
+ if (layer == nullptr) {
+ LOG_DEBUG(Service, "Layer at id {} not found. Trying to create it.", layer_id);
+ CreateLayerAtId(*display, layer_id);
+ return display->FindLayer(layer_id);
+ }
+
+ return layer;
+}
+
void NVFlinger::Compose() {
for (auto& display : displays) {
// Trigger vsync for this display at the end of drawing
diff --git a/src/core/hle/service/nvflinger/nvflinger.h b/src/core/hle/service/nvflinger/nvflinger.h
index b1cab7db3..d80fd07ef 100644
--- a/src/core/hle/service/nvflinger/nvflinger.h
+++ b/src/core/hle/service/nvflinger/nvflinger.h
@@ -67,7 +67,7 @@ public:
/// Finds the buffer queue ID of the specified layer in the specified display.
///
/// If an invalid display ID or layer ID is provided, then an empty optional is returned.
- [[nodiscard]] std::optional<u32> FindBufferQueueId(u64 display_id, u64 layer_id) const;
+ [[nodiscard]] std::optional<u32> FindBufferQueueId(u64 display_id, u64 layer_id);
/// Gets the vsync event for the specified display.
///
@@ -100,6 +100,14 @@ private:
/// Finds the layer identified by the specified ID in the desired display.
[[nodiscard]] const VI::Layer* FindLayer(u64 display_id, u64 layer_id) const;
+ /// Finds the layer identified by the specified ID in the desired display,
+ /// or creates the layer if it is not found.
+ /// To be used when the system expects the specified ID to already exist.
+ [[nodiscard]] VI::Layer* FindOrCreateLayer(u64 display_id, u64 layer_id);
+
+ /// Creates a layer with the specified layer ID in the desired display.
+ void CreateLayerAtId(VI::Display& display, u64 layer_id);
+
static void VSyncThread(NVFlinger& nv_flinger);
void SplitVSync();