OSDN Git Service
(root)
/
android-x86
/
external-drm_hwcomposer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm_hwcomposer: ground work for squashing
[android-x86/external-drm_hwcomposer.git]
/
drmcompositor.cpp
diff --git
a/drmcompositor.cpp
b/drmcompositor.cpp
index
b486d7b
..
6b3c294
100644
(file)
--- a/
drmcompositor.cpp
+++ b/
drmcompositor.cpp
@@
-64,11
+64,15
@@
DrmComposition *DrmCompositor::CreateComposition(Importer *importer) {
int DrmCompositor::QueueComposition(
std::unique_ptr<DrmComposition> composition) {
int DrmCompositor::QueueComposition(
std::unique_ptr<DrmComposition> composition) {
- int ret = composition->DisableUnusedPlanes();
- if (ret) {
- ALOGE("Failed to disable unused planes %d", ret);
+ int ret;
+
+ ret = composition->Plan(compositor_map_);
+ if (ret)
+ return ret;
+
+ ret = composition->DisableUnusedPlanes();
+ if (ret)
return ret;
return ret;
- }
for (DrmResources::ConnectorIter iter = drm_->begin_connectors();
iter != drm_->end_connectors(); ++iter) {
for (DrmResources::ConnectorIter iter = drm_->begin_connectors();
iter != drm_->end_connectors(); ++iter) {