Merge pull request #955 from lioncash/view
nvflinger: Use std::string_view in OpenDisplay()
This commit is contained in:
		| @@ -3,8 +3,11 @@ | |||||||
| // Refer to the license.txt file included. | // Refer to the license.txt file included. | ||||||
|  |  | ||||||
| #include <algorithm> | #include <algorithm> | ||||||
|  | #include <boost/optional.hpp> | ||||||
|  |  | ||||||
| #include "common/alignment.h" | #include "common/alignment.h" | ||||||
|  | #include "common/assert.h" | ||||||
|  | #include "common/logging/log.h" | ||||||
| #include "common/microprofile.h" | #include "common/microprofile.h" | ||||||
| #include "common/scope_exit.h" | #include "common/scope_exit.h" | ||||||
| #include "core/core.h" | #include "core/core.h" | ||||||
| @@ -43,7 +46,7 @@ NVFlinger::~NVFlinger() { | |||||||
|     CoreTiming::UnscheduleEvent(composition_event, 0); |     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); |     LOG_WARNING(Service, "Opening display {}", name); | ||||||
|  |  | ||||||
|     // TODO(Subv): Currently we only support the Default display. |     // TODO(Subv): Currently we only support the Default display. | ||||||
|   | |||||||
| @@ -5,7 +5,11 @@ | |||||||
| #pragma once | #pragma once | ||||||
|  |  | ||||||
| #include <memory> | #include <memory> | ||||||
| #include <boost/optional.hpp> | #include <string> | ||||||
|  | #include <string_view> | ||||||
|  | #include <vector> | ||||||
|  |  | ||||||
|  | #include "common/common_types.h" | ||||||
| #include "core/hle/kernel/event.h" | #include "core/hle/kernel/event.h" | ||||||
|  |  | ||||||
| namespace CoreTiming { | namespace CoreTiming { | ||||||
| @@ -41,7 +45,7 @@ public: | |||||||
|     ~NVFlinger(); |     ~NVFlinger(); | ||||||
|  |  | ||||||
|     /// Opens the specified display and returns the id. |     /// 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. |     /// Creates a layer on the specified display and returns the layer id. | ||||||
|     u64 CreateLayer(u64 display_id); |     u64 CreateLayer(u64 display_id); | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user