ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'm' of git://codeaurora.org/platform/frameworks/native into cm-13.0 

Change-Id: I7830f596b2e7da809a759491d8115ff158c43734
This commit is contained in:
Steve Kondik 2015-10-21 16:56:23 -07:00
parent bfcd443950 dfab0ee254
commit 8f0e75211f
7 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
services/surfaceflinger/Android.mk
View File

@ -109,7 +109,8 @@ LOCAL_SHARED_LIBRARIES := \
ifeq ($(TARGET_USES_QCOM_BSP), true)
LOCAL_WHOLE_STATIC_LIBRARIES += libexsurfaceflinger
LOCAL_C_INCLUDES += $(ANDROID_BUILD_TOP)/vendor/qcom/opensource/display-frameworks/native/services/surfaceflinger/
LOCAL_C_INCLUDES += vendor/qcom/opensource/display-frameworks/native/services/surfaceflinger
LOCAL_C_INCLUDES += vendor/qcom/opensource/display-frameworks/include
LOCAL_C_INCLUDES += $(call project-path-for,qcom-display)/libgralloc
LOCAL_C_INCLUDES += $(call project-path-for,qcom-display)/libqdutils
LOCAL_SHARED_LIBRARIES += libqdutils

7
services/surfaceflinger/DisplayHardware/HWComposer.cpp
View File

@ -707,6 +707,9 @@ status_t HWComposer::prepare() {
if (l.compositionType == HWC_OVERLAY) {
disp.hasOvComp = true;
}
if (isCompositionTypeBlit(l.compositionType)) {
disp.hasFbComp = true;
}
if (l.compositionType == HWC_CURSOR_OVERLAY) {
disp.hasOvComp = true;
}
@ -1242,7 +1245,7 @@ void HWComposer::dump(String8& result) const {
if (hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_3)) {
result.appendFormat(
" %9s | %08" PRIxPTR " | %04x | %04x | %02x | %04x | %-11s |%7.1f,%7.1f,%7.1f,%7.1f |%5d,%5d,%5d,%5d | %s\n",
compositionTypeName[type],
(isCompositionTypeBlit(l.compositionType)) ? "HWC_BLIT" : compositionTypeName[type],
intptr_t(l.handle), l.hints, l.flags, l.transform, l.blending, formatStr.string(),
l.sourceCropf.left, l.sourceCropf.top, l.sourceCropf.right, l.sourceCropf.bottom,
l.displayFrame.left, l.displayFrame.top, l.displayFrame.right, l.displayFrame.bottom,
@ -1250,7 +1253,7 @@ void HWComposer::dump(String8& result) const {
} else {
result.appendFormat(
" %9s | %08" PRIxPTR " | %04x | %04x | %02x | %04x | %-11s |%7d,%7d,%7d,%7d |%5d,%5d,%5d,%5d | %s\n",
compositionTypeName[type],
(isCompositionTypeBlit(l.compositionType)) ? "HWC_BLIT" : compositionTypeName[type],
intptr_t(l.handle), l.hints, l.flags, l.transform, l.blending, formatStr.string(),
l.sourceCrop.left, l.sourceCrop.top, l.sourceCrop.right, l.sourceCrop.bottom,
l.displayFrame.left, l.displayFrame.top, l.displayFrame.right, l.displayFrame.bottom,

3
services/surfaceflinger/DisplayHardware/HWComposer.h
View File

@ -312,6 +312,9 @@ public:
* Extensions
*/
virtual inline bool isVDSEnabled() const { return true; };
virtual inline bool isCompositionTypeBlit(const int32_t /*compType*/) const {
return false;
};
private:
void loadHwcModule();

3
services/surfaceflinger/Layer.cpp
View File

@ -579,6 +579,7 @@ void Layer::setAcquireFence(const sp<const DisplayDevice>& /* hw */,
}
}
}
setAcquiredFenceIfBlit(fenceFd, layer);
layer.setAcquireFenceFd(fenceFd);
}
@ -665,7 +666,7 @@ void Layer::onDraw(const sp<const DisplayDevice>& hw, const Region& clip,
RenderEngine& engine(mFlinger->getRenderEngine());
if (!blackOutLayer) {
if (!blackOutLayer || canAllowGPUForProtected()) {
// TODO: we could be more subtle with isFixedSize()
const bool useFiltering = getFiltering() || needsFiltering(hw) || isFixedSize();

4
services/surfaceflinger/Layer.h
View File

@ -298,6 +298,10 @@ public:
virtual void setPosition(const sp<const DisplayDevice>& /*hw*/,
HWComposer::HWCLayerInterface& /*layer*/,
const State& /*state*/) { }
virtual void setAcquiredFenceIfBlit(int& /*fenceFd */,
HWComposer::HWCLayerInterface& /*layer */) { }
virtual bool canAllowGPUForProtected() const { return false; }
/*
* returns the rectangle that crops the content of the layer and scales it

9
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -1965,7 +1965,7 @@ bool SurfaceFlinger::doComposeSurfaces(const sp<const DisplayDevice>& hw, const
// screen is already cleared here
if (!region.isEmpty()) {
// can happen with SurfaceView
drawWormhole(hw, region);
drawWormHoleIfRequired(cur, end, hw, region);
}
}
@ -3563,6 +3563,13 @@ bool SurfaceFlinger::canDrawLayerinScreenShot(
return layer->isVisible();
}
void SurfaceFlinger::drawWormHoleIfRequired(HWComposer::LayerListIterator& /*cur*/,
const HWComposer::LayerListIterator& /*end*/,
const sp<const DisplayDevice>& hw,
const Region& region) {
drawWormhole(hw, region);
}
// ---------------------------------------------------------------------------
SurfaceFlinger::LayerVector::LayerVector() {

5
services/surfaceflinger/SurfaceFlinger.h
View File

@ -272,6 +272,11 @@ private:
const int32_t& /*id*/) { }
virtual void updateVisibleRegionsDirty() { }
virtual void drawWormHoleIfRequired(HWComposer::LayerListIterator &cur,
const HWComposer::LayerListIterator &end,
const sp<const DisplayDevice>& hw,
const Region& region);
/* ------------------------------------------------------------------------
* Message handling
*/