Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nvdrv: Get rid of global std::weak_ptr

Browse source 
Rather than use global state, we can simply pass the instance into the
NVFlinger instance directly.
This commit is contained in:
Lioncash 2018-08-07 09:17:09 -04:00
parent 825e8cb925
commit d378d98e26
5 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/core/hle/service/nvflinger/nvflinger.cpp
View file

@ -46,6 +46,10 @@ NVFlinger::~NVFlinger() {
CoreTiming::UnscheduleEvent(composition_event, 0);
}
void NVFlinger::SetNVDrvInstance(std::shared_ptr<Nvidia::Module> instance) {
nvdrv = std::move(instance);
}
u64 NVFlinger::OpenDisplay(std::string_view name) {
LOG_WARNING(Service, "Opening display {}", name);
@ -141,9 +145,6 @@ void NVFlinger::Compose() {
auto& igbp_buffer = buffer->igbp_buffer;
// Now send the buffer to the GPU for drawing.
auto nvdrv = Nvidia::nvdrv.lock();
ASSERT(nvdrv);
// TODO(Subv): Support more than just disp0. The display device selection is probably based
// on which display we're drawing (Default, Internal, External, etc)
auto nvdisp = nvdrv->GetDevice<Nvidia::Devices::nvdisp_disp0>("/dev/nvdisp_disp0");

9
src/core/hle/service/nvflinger/nvflinger.h
View file

@ -16,6 +16,10 @@ namespace CoreTiming {
struct EventType;
}
namespace Service::Nvidia {
class Module;
}
namespace Service::NVFlinger {
class BufferQueue;
@ -44,6 +48,9 @@ public:
NVFlinger();
~NVFlinger();
/// Sets the NVDrv module instance to use to send buffers to the GPU.
void SetNVDrvInstance(std::shared_ptr<Nvidia::Module> instance);
/// Opens the specified display and returns the id.
u64 OpenDisplay(std::string_view name);
@ -70,6 +77,8 @@ private:
/// Returns the layer identified by the specified id in the desired display.
Layer& GetLayer(u64 display_id, u64 layer_id);
std::shared_ptr<Nvidia::Module> nvdrv;
std::vector<Display> displays;
std::vector<std::shared_ptr<BufferQueue>> buffer_queues;