summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPawit Pornkitprasan <p.pawit@gmail.com>2014-11-18 08:38:33 +0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2015-10-16 14:45:10 -0700
commitfd1fb639a1dd9325a9bebb0cd3ca6ebd7d48931d (patch)
treeaae42e1747ba307ff2aa25e518aa85280728be2d /include
parentbcce313feab557ab7cbb06cc1de941a7bf6657b0 (diff)
downloadframeworks_native-fd1fb639a1dd9325a9bebb0cd3ca6ebd7d48931d.zip
frameworks_native-fd1fb639a1dd9325a9bebb0cd3ca6ebd7d48931d.tar.gz
frameworks_native-fd1fb639a1dd9325a9bebb0cd3ca6ebd7d48931d.tar.bz2
Bring back support for glReadPixels screenshot path
Squashed commit of the following: commit 012d3fe41d1d6cd38a0858b59145e9a4447641fa Author: Hashcode <hashcode0f@gmail.com> Date: Sun Dec 8 19:36:50 2013 +0000 sf: Always use opengles for screen capture Go back to the usage of GRALLOC_USAGE_HW_TEXTURE and GRALLOC_USAGE_HW_RENDERER in captureScreenImplLocked regardless of useReadPixels value This fixes the EGL_NO_IMAGE_KHR error returned from eglCreateImageKHR (blank images returned from screenshot path) Change-Id: I62fe90a081607b9e89c67f3dcfd34c84efc89d35 commit 4866ddf98ac98d8e22a1cd6a21894bb17f274588 Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org> Date: Thu Oct 31 03:53:39 2013 +0000 Revert "remove support for glReadPixels screenshot path" This reverts commit 3ca76f416bc8665a97636ca8a2d0128b9da9d92c. Conflicts: include/gui/ISurfaceComposer.h libs/gui/ISurfaceComposer.cpp libs/gui/SurfaceComposerClient.cpp services/surfaceflinger/SurfaceFlinger.cpp services/surfaceflinger/SurfaceFlinger.h Change-Id: I8c239e533757af770e418dbb198f5a86c736961f Change-Id: I8c239e533757af770e418dbb198f5a86c736961f
Diffstat (limited to 'include')
-rw-r--r--include/gui/ISurfaceComposer.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/gui/ISurfaceComposer.h b/include/gui/ISurfaceComposer.h
index d5570ea..84ddb27 100644
--- a/include/gui/ISurfaceComposer.h
+++ b/include/gui/ISurfaceComposer.h
@@ -145,7 +145,8 @@ public:
Rect sourceCrop, uint32_t reqWidth, uint32_t reqHeight,
uint32_t minLayerZ, uint32_t maxLayerZ,
bool useIdentityTransform,
- Rotation rotation = eRotateNone) = 0;
+ Rotation rotation = eRotateNone,
+ bool isCpuConsumer = false) = 0;
/* Clears the frame statistics for animations.
*