summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-08-07 20:26:51 +0200
committerGitHub <noreply@github.com>2018-08-07 20:26:51 +0200
commit573a66c23d0db0f61bbb0795af6f712224825de8 (patch)
tree057736013f98f6fc0162ad8cfe881c09a4fb6828 /src/core
parentMerge pull request #953 from lioncash/time (diff)
parentnvflinger: Get rid of indirect inclusions (diff)
downloadyuzu-573a66c23d0db0f61bbb0795af6f712224825de8.tar
yuzu-573a66c23d0db0f61bbb0795af6f712224825de8.tar.gz
yuzu-573a66c23d0db0f61bbb0795af6f712224825de8.tar.bz2
yuzu-573a66c23d0db0f61bbb0795af6f712224825de8.tar.lz
yuzu-573a66c23d0db0f61bbb0795af6f712224825de8.tar.xz
yuzu-573a66c23d0db0f61bbb0795af6f712224825de8.tar.zst
yuzu-573a66c23d0db0f61bbb0795af6f712224825de8.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/service/nvflinger/nvflinger.cpp5
-rw-r--r--src/core/hle/service/nvflinger/nvflinger.h8
2 files changed, 10 insertions, 3 deletions
diff --git a/src/core/hle/service/nvflinger/nvflinger.cpp b/src/core/hle/service/nvflinger/nvflinger.cpp
index 0bf51062c..1e287ab62 100644
--- a/src/core/hle/service/nvflinger/nvflinger.cpp
+++ b/src/core/hle/service/nvflinger/nvflinger.cpp
@@ -3,8 +3,11 @@
// Refer to the license.txt file included.
#include <algorithm>
+#include <boost/optional.hpp>
#include "common/alignment.h"
+#include "common/assert.h"
+#include "common/logging/log.h"
#include "common/microprofile.h"
#include "common/scope_exit.h"
#include "core/core.h"
@@ -43,7 +46,7 @@ NVFlinger::~NVFlinger() {
CoreTiming::UnscheduleEvent(composition_event, 0);
}
-u64 NVFlinger::OpenDisplay(const std::string& name) {
+u64 NVFlinger::OpenDisplay(std::string_view name) {
LOG_WARNING(Service, "Opening display {}", name);
// TODO(Subv): Currently we only support the Default display.
diff --git a/src/core/hle/service/nvflinger/nvflinger.h b/src/core/hle/service/nvflinger/nvflinger.h
index 2c908297b..5374df175 100644
--- a/src/core/hle/service/nvflinger/nvflinger.h
+++ b/src/core/hle/service/nvflinger/nvflinger.h
@@ -5,7 +5,11 @@
#pragma once
#include <memory>
-#include <boost/optional.hpp>
+#include <string>
+#include <string_view>
+#include <vector>
+
+#include "common/common_types.h"
#include "core/hle/kernel/event.h"
namespace CoreTiming {
@@ -41,7 +45,7 @@ public:
~NVFlinger();
/// Opens the specified display and returns the id.
- u64 OpenDisplay(const std::string& name);
+ u64 OpenDisplay(std::string_view name);
/// Creates a layer on the specified display and returns the layer id.
u64 CreateLayer(u64 display_id);