summaryrefslogtreecommitdiffstats
path: root/services/surfaceflinger/DisplayHardware
diff options
context:
space:
mode:
authorDan Stoza <stoza@google.com>2014-06-30 17:38:44 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-06-27 15:56:14 +0000
commitdc56bf721a9f29621fd57e1d861142fa9b2d3663 (patch)
tree798493ee885dbc05107019a2c5b2bb97616f07c4 /services/surfaceflinger/DisplayHardware
parentff0d588db52e29cf679d10c53affea9b8d867f26 (diff)
parent29a3e90879fd96404c971e7187cd0e05927bbce0 (diff)
downloadframeworks_native-dc56bf721a9f29621fd57e1d861142fa9b2d3663.zip
frameworks_native-dc56bf721a9f29621fd57e1d861142fa9b2d3663.tar.gz
frameworks_native-dc56bf721a9f29621fd57e1d861142fa9b2d3663.tar.bz2
Merge "BufferQueue: Add allocateBuffers method"
Diffstat (limited to 'services/surfaceflinger/DisplayHardware')
-rw-r--r--services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp6
-rw-r--r--services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h2
2 files changed, 8 insertions, 0 deletions
diff --git a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp
index c415560..3442c65 100644
--- a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp
+++ b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp
@@ -486,6 +486,12 @@ status_t VirtualDisplaySurface::setSidebandStream(const sp<NativeHandle>& /*stre
return INVALID_OPERATION;
}
+void VirtualDisplaySurface::allocateBuffers(bool /* async */,
+ uint32_t /* width */, uint32_t /* height */, uint32_t /* format */,
+ uint32_t /* usage */) {
+ // TODO: Should we actually allocate buffers for a virtual display?
+}
+
void VirtualDisplaySurface::updateQueueBufferOutput(
const QueueBufferOutput& qbo) {
uint32_t w, h, transformHint, numPendingBuffers;
diff --git a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h
index 0ae9804..5c00ab4 100644
--- a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h
+++ b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h
@@ -112,6 +112,8 @@ private:
int api, bool producerControlledByApp, QueueBufferOutput* output);
virtual status_t disconnect(int api);
virtual status_t setSidebandStream(const sp<NativeHandle>& stream);
+ virtual void allocateBuffers(bool async, uint32_t width, uint32_t height,
+ uint32_t format, uint32_t usage);
//
// Utility methods