SF: Use CompositionInfo to program HWComposer
Test: Build and run manually
Merged-Id: I3a4fd676781d0b7db1665430e0d84a6bc9b83f60
Change-Id: I3a4fd676781d0b7db1665430e0d84a6bc9b83f60
diff --git a/services/surfaceflinger/BufferLayer.cpp b/services/surfaceflinger/BufferLayer.cpp
index a6caf29..916576a 100644
--- a/services/surfaceflinger/BufferLayer.cpp
+++ b/services/surfaceflinger/BufferLayer.cpp
@@ -593,32 +593,14 @@
const auto& viewport = displayDevice->getViewport();
Region visible = tr.transform(visibleRegion.intersect(viewport));
auto hwcId = displayDevice->getHwcDisplayId();
- auto& hwcInfo = getBE().mHwcLayers[hwcId];
- auto& hwcLayer = hwcInfo.layer;
- auto error = (*hwcLayer)->setVisibleRegion(visible);
- if (error != HWC2::Error::None) {
- ALOGE("[%s] Failed to set visible region: %s (%d)", mName.string(),
- to_string(error).c_str(), static_cast<int32_t>(error));
- visible.dump(LOG_TAG);
- }
- error = (*hwcLayer)->setSurfaceDamage(surfaceDamageRegion);
- if (error != HWC2::Error::None) {
- ALOGE("[%s] Failed to set surface damage: %s (%d)", mName.string(),
- to_string(error).c_str(), static_cast<int32_t>(error));
- surfaceDamageRegion.dump(LOG_TAG);
- }
+ getBE().compositionInfo.hwc.visibleRegion = visible;
+ getBE().compositionInfo.hwc.surfaceDamage = surfaceDamageRegion;
// Sideband layers
if (getBE().compositionInfo.hwc.sidebandStream.get()) {
setCompositionType(hwcId, HWC2::Composition::Sideband);
- ALOGV("[%s] Requesting Sideband composition", mName.string());
- error = (*hwcLayer)->setSidebandStream(getBE().compositionInfo.hwc.sidebandStream->handle());
- if (error != HWC2::Error::None) {
- ALOGE("[%s] Failed to set sideband stream %p: %s (%d)", mName.string(),
- getBE().compositionInfo.hwc.sidebandStream->handle(), to_string(error).c_str(),
- static_cast<int32_t>(error));
- }
+ getBE().compositionInfo.compositionType = HWC2::Composition::Sideband;
return;
}
@@ -631,32 +613,13 @@
setCompositionType(hwcId, HWC2::Composition::Device);
}
- ALOGV("setPerFrameData: dataspace = %d", mDrawingState.dataSpace);
- error = (*hwcLayer)->setDataspace(mDrawingState.dataSpace);
- if (error != HWC2::Error::None) {
- ALOGE("[%s] Failed to set dataspace %d: %s (%d)", mName.string(), mDrawingState.dataSpace,
- to_string(error).c_str(), static_cast<int32_t>(error));
- }
-
- const HdrMetadata& metadata = mConsumer->getCurrentHdrMetadata();
- error = (*hwcLayer)->setHdrMetadata(metadata);
- if (error != HWC2::Error::None && error != HWC2::Error::Unsupported) {
- ALOGE("[%s] Failed to set hdrMetadata: %s (%d)", mName.string(),
- to_string(error).c_str(), static_cast<int32_t>(error));
- }
-
- uint32_t hwcSlot = 0;
- sp<GraphicBuffer> hwcBuffer;
- getBE().mHwcLayers[hwcId].bufferCache.getHwcBuffer(mActiveBufferSlot, mActiveBuffer, &hwcSlot,
- &hwcBuffer);
+ getBE().compositionInfo.hwc.dataspace = mDrawingState.dataSpace;
+ getBE().compositionInfo.hwc.hdrMetadata = mConsumer->getCurrentHdrMetadata();
auto acquireFence = mConsumer->getCurrentFence();
- error = (*hwcLayer)->setBuffer(hwcSlot, hwcBuffer, acquireFence);
- if (error != HWC2::Error::None) {
- ALOGE("[%s] Failed to set buffer %p: %s (%d)", mName.string(),
- getBE().compositionInfo.mBuffer->handle, to_string(error).c_str(),
- static_cast<int32_t>(error));
- }
+ getBE().compositionInfo.mBufferSlot = mActiveBufferSlot;
+ getBE().compositionInfo.mBuffer = mActiveBuffer;
+ getBE().compositionInfo.hwc.fence = acquireFence;
}
bool BufferLayer::isOpaque(const Layer::State& s) const {
diff --git a/services/surfaceflinger/ColorLayer.cpp b/services/surfaceflinger/ColorLayer.cpp
index 71975c8..5990a61 100644
--- a/services/surfaceflinger/ColorLayer.cpp
+++ b/services/surfaceflinger/ColorLayer.cpp
@@ -77,38 +77,18 @@
const auto& viewport = displayDevice->getViewport();
Region visible = tr.transform(visibleRegion.intersect(viewport));
auto hwcId = displayDevice->getHwcDisplayId();
- auto& hwcInfo = getBE().mHwcLayers[hwcId];
- auto& hwcLayer = hwcInfo.layer;
- auto error = (*hwcLayer)->setVisibleRegion(visible);
- if (error != HWC2::Error::None) {
- ALOGE("[%s] Failed to set visible region: %s (%d)", mName.string(),
- to_string(error).c_str(), static_cast<int32_t>(error));
- visible.dump(LOG_TAG);
- }
+ getBE().compositionInfo.hwc.visibleRegion = visible;
+ getBE().compositionInfo.hwc.dataspace = mDrawingState.dataSpace;
setCompositionType(hwcId, HWC2::Composition::SolidColor);
- error = (*hwcLayer)->setDataspace(mDrawingState.dataSpace);
- if (error != HWC2::Error::None) {
- ALOGE("[%s] Failed to set dataspace %d: %s (%d)", mName.string(), mDrawingState.dataSpace,
- to_string(error).c_str(), static_cast<int32_t>(error));
- }
-
half4 color = getColor();
- error = (*hwcLayer)->setColor({static_cast<uint8_t>(std::round(255.0f * color.r)),
- static_cast<uint8_t>(std::round(255.0f * color.g)),
- static_cast<uint8_t>(std::round(255.0f * color.b)), 255});
- if (error != HWC2::Error::None) {
- ALOGE("[%s] Failed to set color: %s (%d)", mName.string(), to_string(error).c_str(),
- static_cast<int32_t>(error));
- }
+ getBE().compositionInfo.hwc.color = { static_cast<uint8_t>(std::round(255.0f * color.r)),
+ static_cast<uint8_t>(std::round(255.0f * color.g)),
+ static_cast<uint8_t>(std::round(255.0f * color.b)), 255 };
// Clear out the transform, because it doesn't make sense absent a source buffer
- error = (*hwcLayer)->setTransform(HWC2::Transform::None);
- if (error != HWC2::Error::None) {
- ALOGE("[%s] Failed to clear transform: %s (%d)", mName.string(), to_string(error).c_str(),
- static_cast<int32_t>(error));
- }
+ getBE().compositionInfo.hwc.transform = HWC2::Transform::None;
}
// ---------------------------------------------------------------------------
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index ba2d0a0..b072213 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -490,8 +490,6 @@
hwcInfo.forceClientComposition = true;
}
- auto& hwcLayer = hwcInfo.layer;
-
// this gives us only the "orientation" component of the transform
const State& s(getDrawingState());
auto blendMode = HWC2::BlendMode::None;
@@ -499,12 +497,7 @@
blendMode =
mPremultipliedAlpha ? HWC2::BlendMode::Premultiplied : HWC2::BlendMode::Coverage;
}
- auto error = (*hwcLayer)->setBlendMode(blendMode);
- ALOGE_IF(error != HWC2::Error::None,
- "[%s] Failed to set blend mode %s:"
- " %s (%d)",
- mName.string(), to_string(blendMode).c_str(), to_string(error).c_str(),
- static_cast<int32_t>(error));
+ getBE().compositionInfo.hwc.blendMode = blendMode;
// apply the layer's transform, followed by the display's global transform
// here we're guaranteed that the layer's transform preserves rects
@@ -547,36 +540,15 @@
}
const Transform& tr(displayDevice->getTransform());
Rect transformedFrame = tr.transform(frame);
- error = (*hwcLayer)->setDisplayFrame(transformedFrame);
- if (error != HWC2::Error::None) {
- ALOGE("[%s] Failed to set display frame [%d, %d, %d, %d]: %s (%d)", mName.string(),
- transformedFrame.left, transformedFrame.top, transformedFrame.right,
- transformedFrame.bottom, to_string(error).c_str(), static_cast<int32_t>(error));
- } else {
- hwcInfo.displayFrame = transformedFrame;
- }
+ getBE().compositionInfo.hwc.displayFrame = transformedFrame;
FloatRect sourceCrop = computeCrop(displayDevice);
- error = (*hwcLayer)->setSourceCrop(sourceCrop);
- if (error != HWC2::Error::None) {
- ALOGE("[%s] Failed to set source crop [%.3f, %.3f, %.3f, %.3f]: "
- "%s (%d)",
- mName.string(), sourceCrop.left, sourceCrop.top, sourceCrop.right, sourceCrop.bottom,
- to_string(error).c_str(), static_cast<int32_t>(error));
- } else {
- hwcInfo.sourceCrop = sourceCrop;
- }
+ getBE().compositionInfo.hwc.sourceCrop = sourceCrop;
float alpha = static_cast<float>(getAlpha());
- error = (*hwcLayer)->setPlaneAlpha(alpha);
- ALOGE_IF(error != HWC2::Error::None,
- "[%s] Failed to set plane alpha %.3f: "
- "%s (%d)",
- mName.string(), alpha, to_string(error).c_str(), static_cast<int32_t>(error));
+ getBE().compositionInfo.hwc.alpha = alpha;
- error = (*hwcLayer)->setZOrder(z);
- ALOGE_IF(error != HWC2::Error::None, "[%s] Failed to set Z %u: %s (%d)", mName.string(), z,
- to_string(error).c_str(), static_cast<int32_t>(error));
+ getBE().compositionInfo.hwc.z = z;
int type = s.type;
int appId = s.appId;
@@ -587,9 +559,8 @@
appId = parentState.appId;
}
- error = (*hwcLayer)->setInfo(type, appId);
- ALOGE_IF(error != HWC2::Error::None, "[%s] Failed to set info (%d)", mName.string(),
- static_cast<int32_t>(error));
+ getBE().compositionInfo.hwc.type = type;
+ getBE().compositionInfo.hwc.appId = appId;
/*
* Transformations are applied in this order:
@@ -636,12 +607,109 @@
} else {
auto transform = static_cast<HWC2::Transform>(orientation);
hwcInfo.transform = transform;
- auto error = (*hwcLayer)->setTransform(transform);
+ getBE().compositionInfo.hwc.transform = transform;
+ }
+}
+
+void Layer::configureHwcLayer(const sp<const DisplayDevice>& displayDevice) {
+ ATRACE_CALL();
+
+ auto hwcId = displayDevice->getHwcDisplayId();
+ auto& hwcInfo = getBE().mHwcLayers[hwcId];
+ auto& hwcLayer = hwcInfo.layer;
+
+ auto error = (*hwcLayer)->setBlendMode(getBE().compositionInfo.hwc.blendMode);
+ ALOGE_IF(error != HWC2::Error::None,
+ "[%s] Failed to set blend mode %s:"
+ " %s (%d)",
+ mName.string(),
+ to_string(getBE().compositionInfo.hwc.blendMode).c_str(), to_string(error).c_str(),
+ static_cast<int32_t>(error));
+
+ error = (*hwcLayer)->setDisplayFrame(getBE().compositionInfo.hwc.displayFrame);
+ ALOGE_IF(error != HWC2::Error::None,
+ "[%s] Failed to set the display frame [%d, %d, %d, %d] %s (%d)",
+ mName.string(),
+ getBE().compositionInfo.hwc.displayFrame.left,
+ getBE().compositionInfo.hwc.displayFrame.right,
+ getBE().compositionInfo.hwc.displayFrame.top,
+ getBE().compositionInfo.hwc.displayFrame.bottom,
+ to_string(error).c_str(), static_cast<int32_t>(error));
+
+
+ error = (*hwcLayer)->setPlaneAlpha(getBE().compositionInfo.hwc.alpha);
+ ALOGE_IF(error != HWC2::Error::None,
+ "[%s] Failed to set plane alpha %.3f: "
+ "%s (%d)",
+ mName.string(), getBE().compositionInfo.hwc.alpha,
+ to_string(error).c_str(), static_cast<int32_t>(error));
+
+ error = (*hwcLayer)->setSourceCrop(getBE().compositionInfo.hwc.sourceCrop);
+ ALOGE_IF(error != HWC2::Error::None,
+ "[%s] Failed to set source crop [%.3f, %.3f, %.3f, %.3f]: %s (%d)",
+ mName.string(),
+ getBE().compositionInfo.hwc.sourceCrop.left,
+ getBE().compositionInfo.hwc.sourceCrop.right,
+ getBE().compositionInfo.hwc.sourceCrop.top,
+ getBE().compositionInfo.hwc.sourceCrop.bottom,
+ to_string(error).c_str(), static_cast<int32_t>(error));
+
+ error = (*hwcLayer)->setTransform(getBE().compositionInfo.hwc.transform);
+ ALOGE_IF(error != HWC2::Error::None,
+ "[%s] Failed to set transform %s: "
+ "%s (%d)",
+ mName.string(),
+ to_string(getBE().compositionInfo.hwc.transform).c_str(), to_string(error).c_str(),
+ static_cast<int32_t>(error));
+
+ error = (*hwcLayer)->setZOrder(getBE().compositionInfo.hwc.z);
+ ALOGE_IF(error != HWC2::Error::None,
+ "[%s] Failed to set Z %u: %s (%d)",
+ mName.string(), getBE().compositionInfo.hwc.z,
+ to_string(error).c_str(), static_cast<int32_t>(error));
+
+ error = (*hwcLayer)->setInfo(getBE().compositionInfo.hwc.type, getBE().compositionInfo.hwc.appId);
+ ALOGE_IF(error != HWC2::Error::None,
+ "[%s] Failed to set info (%d)",
+ mName.string(), static_cast<int32_t>(error));
+
+ error = (*hwcLayer)->setVisibleRegion(getBE().compositionInfo.hwc.visibleRegion);
+ ALOGE_IF(error != HWC2::Error::None,
+ "[%s] Failed to set visible region: %s (%d)",
+ mName.string(), to_string(error).c_str(), static_cast<int32_t>(error));
+
+ error = (*hwcLayer)->setSurfaceDamage(getBE().compositionInfo.hwc.surfaceDamage);
+ ALOGE_IF(error != HWC2::Error::None,
+ "[%s] Failed to set surface damage: %s (%d)",
+ mName.string(), to_string(error).c_str(), static_cast<int32_t>(error));
+
+ error = (*hwcLayer)->setCompositionType(getBE().compositionInfo.compositionType);
+ ALOGE_IF(error != HWC2::Error::None,
+ "[%s] Failed to set composition type: %s (%d)",
+ mName.string(), to_string(error).c_str(), static_cast<int32_t>(error));
+
+ error = (*hwcLayer)->setDataspace(getBE().compositionInfo.hwc.dataspace);
+ ALOGE_IF(error != HWC2::Error::None,
+ "[%s] Failed to set dataspace: %s (%d)",
+ mName.string(), to_string(error).c_str(), static_cast<int32_t>(error));
+
+ error = (*hwcLayer)->setHdrMetadata(getBE().compositionInfo.hwc.hdrMetadata);
+ if (error != HWC2::Error::None && error != HWC2::Error::Unsupported) {
+ ALOGE("[%s] Failed to set hdrMetadata: %s (%d)", mName.string(),
+ to_string(error).c_str(), static_cast<int32_t>(error));
+ }
+
+ error = (*hwcLayer)->setColor(getBE().compositionInfo.hwc.color);
+ ALOGE_IF(error != HWC2::Error::None,
+ "[%s] Failed to set color: %s (%d)",
+ mName.string(), to_string(error).c_str(), static_cast<int32_t>(error));
+
+ if (getBE().compositionInfo.hwc.fence) {
+ error = (*hwcLayer)->setBuffer(getBE().compositionInfo.mBufferSlot,
+ getBE().compositionInfo.mBuffer, getBE().compositionInfo.hwc.fence);
ALOGE_IF(error != HWC2::Error::None,
- "[%s] Failed to set transform %s: "
- "%s (%d)",
- mName.string(), to_string(transform).c_str(), to_string(error).c_str(),
- static_cast<int32_t>(error));
+ "[%s] Failed to set buffer: %s (%d)",
+ mName.string(), to_string(error).c_str(), static_cast<int32_t>(error));
}
}
@@ -1488,12 +1556,11 @@
result.appendFormat(" %s\n", name.string());
const Layer::State& layerState(getDrawingState());
- const LayerBE::HWCInfo& hwcInfo = getBE().mHwcLayers.at(hwcId);
result.appendFormat(" %10d | ", layerState.z);
result.appendFormat("%10s | ", to_string(getCompositionType(hwcId)).c_str());
- const Rect& frame = hwcInfo.displayFrame;
+ const Rect& frame = getBE().compositionInfo.hwc.displayFrame;
result.appendFormat("%4d %4d %4d %4d | ", frame.left, frame.top, frame.right, frame.bottom);
- const FloatRect& crop = hwcInfo.sourceCrop;
+ const FloatRect& crop = getBE().compositionInfo.hwc.sourceCrop;
result.appendFormat("%6.1f %6.1f %6.1f %6.1f\n", crop.left, crop.top, crop.right, crop.bottom);
result.append("- - - - - - - - - - - - - - - - - - - - ");
diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h
index cac1c20..87f9489 100644
--- a/services/surfaceflinger/Layer.h
+++ b/services/surfaceflinger/Layer.h
@@ -309,6 +309,7 @@
virtual void setDefaultBufferSize(uint32_t /*w*/, uint32_t /*h*/) {}
void setGeometry(const sp<const DisplayDevice>& displayDevice, uint32_t z);
+ void configureHwcLayer(const sp<const DisplayDevice>& displayDevice);
void forceClientComposition(int32_t hwcId);
bool getForceClientComposition(int32_t hwcId);
virtual void setPerFrameData(const sp<const DisplayDevice>& displayDevice) = 0;
diff --git a/services/surfaceflinger/LayerBE.h b/services/surfaceflinger/LayerBE.h
index 854cdd6..06c88a4 100644
--- a/services/surfaceflinger/LayerBE.h
+++ b/services/surfaceflinger/LayerBE.h
@@ -19,6 +19,7 @@
#include <stdint.h>
#include <sys/types.h>
+#include <gui/HdrMetadata.h>
#include <ui/Region.h>
#include "SurfaceFlinger.h"
@@ -80,6 +81,7 @@
sp<NativeHandle> sidebandStream;
android_dataspace dataspace;
hwc_color_t color;
+ HdrMetadata hdrMetadata;
} hwc;
struct {
Mesh* mesh;
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 2c0dec9..8d5c496 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -647,6 +647,7 @@
// set initial conditions (e.g. unblank default device)
initializeDisplays();
+ ALOGV("Displays initialized");
getBE().mRenderEngine->primeCache();
@@ -1971,6 +1972,18 @@
mPreviousColorMatrix = colorMatrix;
+ for (size_t dpy = 0; dpy < mDisplays.size(); dpy++) {
+ sp<const DisplayDevice> displayDevice(mDisplays[dpy]);
+ const auto hwcId = displayDevice->getHwcDisplayId();
+ if (hwcId >= 0) {
+ const Vector<sp<Layer>>& currentLayers(
+ displayDevice->getVisibleLayersSortedByZ());
+ for (auto& layer : currentLayers) {
+ layer->configureHwcLayer(displayDevice);
+ }
+ }
+ }
+
for (size_t displayId = 0; displayId < mDisplays.size(); ++displayId) {
auto& displayDevice = mDisplays[displayId];
if (!displayDevice->isDisplayOn()) {
@@ -2762,6 +2775,7 @@
}
bool hasClientComposition = getBE().mHwc->hasClientComposition(hwcId);
+ ATRACE_INT("hasClientComposition", hasClientComposition);
if (hasClientComposition) {
ALOGV("hasClientComposition");
@@ -4872,7 +4886,6 @@
}; // namespace android
-
#if defined(__gl_h_)
#error "don't include gl/gl.h in this file"
#endif