Use new BackendManager::CreateBackendForConnector
Remove the old CreateBackendForDisplay and related functions that are now obsolete. Change-Id: Ic41c065b65a50e6a68ccc1e40b210e5aed6d009e
This commit is contained in:
parent
fbd684e3e0
commit
b112216f38
4 changed files with 4 additions and 18 deletions
|
|
@ -43,15 +43,6 @@ int BackendManager::RegisterBackend(const std::string &name,
|
|||
return 0;
|
||||
}
|
||||
|
||||
int BackendManager::SetBackendForDisplay(HwcDisplay *display) {
|
||||
display->set_backend(
|
||||
CreateBackendForConnector(display->GetPipe().connector->Get()));
|
||||
if (display->backend() == nullptr) {
|
||||
return -EINVAL;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
std::unique_ptr<Backend> BackendManager::CreateBackendForConnector(
|
||||
const DrmConnector *connector) {
|
||||
auto driver_name(connector->GetDev().GetName());
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@ class BackendManager {
|
|||
static BackendManager &GetInstance();
|
||||
int RegisterBackend(const std::string &name,
|
||||
BackendConstructorT backend_constructor);
|
||||
int SetBackendForDisplay(HwcDisplay *display);
|
||||
std::unique_ptr<Backend> CreateBackendForConnector(
|
||||
const DrmConnector *connector);
|
||||
std::unique_ptr<Backend> GetBackendByName(std::string &name);
|
||||
|
|
|
|||
|
|
@ -660,9 +660,10 @@ bool HwcDisplay::Init() {
|
|||
}
|
||||
|
||||
if (!IsInHeadlessMode()) {
|
||||
auto ret = BackendManager::GetInstance().SetBackendForDisplay(this);
|
||||
if (ret) {
|
||||
ALOGE("Failed to set backend for d=%d %d\n", int(handle_), ret);
|
||||
backend_ = BackendManager::GetInstance().CreateBackendForConnector(
|
||||
pipeline_->connector->Get());
|
||||
if (!backend_) {
|
||||
ALOGE("Failed to set backend for d=%d\n", int(handle_));
|
||||
return false;
|
||||
}
|
||||
auto flatcbk = (struct FlatConCallbacks){
|
||||
|
|
@ -1309,10 +1310,6 @@ const Backend *HwcDisplay::backend() const {
|
|||
return backend_.get();
|
||||
}
|
||||
|
||||
void HwcDisplay::set_backend(std::unique_ptr<Backend> backend) {
|
||||
backend_ = std::move(backend);
|
||||
}
|
||||
|
||||
bool HwcDisplay::NeedsClientLayerUpdate() const {
|
||||
return std::any_of(layers_.begin(), layers_.end(), [](const auto &pair) {
|
||||
const auto &layer = pair.second;
|
||||
|
|
|
|||
|
|
@ -186,7 +186,6 @@ class HwcDisplay {
|
|||
}
|
||||
|
||||
const Backend *backend() const;
|
||||
void set_backend(std::unique_ptr<Backend> backend);
|
||||
|
||||
auto layers() -> std::map<ILayerId, HwcLayer> & {
|
||||
return layers_;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue