Browse Source

a few changes according to android docs

pull/120/head
Maufeat 8 months ago
committed by crueter
parent
commit
4db92a6ea4
  1. 22
      src/core/hle/service/nvnflinger/buffer_queue_producer.cpp

22
src/core/hle/service/nvnflinger/buffer_queue_producer.cpp

@ -728,31 +728,24 @@ Status BufferQueueProducer::Connect(const std::shared_ptr<IProducerListener>& li
return status;
}
// https://android.googlesource.com/platform/frameworks/native/%2B/master/libs/gui/BufferQueueProducer.cpp#1457
Status BufferQueueProducer::Disconnect(NativeWindowApi api) {
LOG_DEBUG(Service_Nvnflinger, "api = {}", api);
LOG_DEBUG(Service_Nvnflinger, "disconnect api = {}", api);
Status status = Status::NoError;
std::shared_ptr<IConsumerListener> listener;
Status status = Status::NoError;
{
std::scoped_lock lock{core->mutex};
core->WaitWhileAllocatingLocked();
if (core->is_abandoned) {
// Disconnecting after the surface has been abandoned is a no-op.
return Status::NoError;
}
if (core->connected_api == NativeWindowApi::NoConnectedApi) {
LOG_DEBUG(Service_Nvnflinger, "already disconnected (req = {})", api);
return Status::NoError;
}
if (core->connected_api != api) {
LOG_WARNING(Service_Nvnflinger,
"Disconnect api mismatch (cur = {} req = {}) — forcing disconnect",
core->connected_api, api);
LOG_DEBUG(Service_Nvnflinger, "disconnect: not connected (req = {})", api);
return Status::NoInit;
}
switch (api) {
@ -769,13 +762,14 @@ Status BufferQueueProducer::Disconnect(NativeWindowApi api) {
buffer_wait_event->Signal();
listener = core->consumer_listener;
} else {
LOG_ERROR(Service_Nvnflinger, "still connected to another api (cur = {} req = {})",
LOG_ERROR(Service_Nvnflinger,
"disconnect: still connected to another api (cur = {} req = {})",
core->connected_api, api);
status = Status::BadValue;
}
break;
default:
LOG_ERROR(Service_Nvnflinger, "unknown api = {}", api);
LOG_ERROR(Service_Nvnflinger, "disconnect: unknown api = {}", api);
status = Status::BadValue;
break;
}

Loading…
Cancel
Save