From 99c7dbb24994df2f3e175f7b25dd2c9dd92a72f0 Mon Sep 17 00:00:00 2001 From: Jesse Hall Date: Thu, 14 Mar 2013 14:29:29 -0700 Subject: Add DisplaySurface abstraction DisplayDevice now has a DisplaySurface instead of using FramebufferSurface directly. FramebufferSurface implements DisplaySurface, and so does the new VirtualDisplaySurface class. DisplayDevice now always has a surface, not just for virtual displays. In this change VirtualDisplaySurface is just a stub; buffers still go directly from GLES to the final consumer. Bug: 8384764 Change-Id: I57cb668edbc6c37bfebda90b9222d435bf589f37 --- .../DisplayHardware/VirtualDisplaySurface.cpp | 60 ++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp (limited to 'services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp') diff --git a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp new file mode 100644 index 0000000..d30e9bf --- /dev/null +++ b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp @@ -0,0 +1,60 @@ +/* + * Copyright 2013 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include "VirtualDisplaySurface.h" + +// --------------------------------------------------------------------------- +namespace android { +// --------------------------------------------------------------------------- + +VirtualDisplaySurface::VirtualDisplaySurface(HWComposer& hwc, int disp, + const sp& sink, const String8& name) +: mHwc(hwc), + mDisplayId(disp), + mSink(sink), + mName(name) +{} + +VirtualDisplaySurface::~VirtualDisplaySurface() { +} + +sp VirtualDisplaySurface::getIGraphicBufferProducer() const { + return mSink; +} + +status_t VirtualDisplaySurface::compositionComplete() { + return NO_ERROR; +} + +status_t VirtualDisplaySurface::advanceFrame() { + return NO_ERROR; +} + +status_t VirtualDisplaySurface::setReleaseFenceFd(int fenceFd) { + if (fenceFd >= 0) { + ALOGW("[%s] unexpected release fence", mName.string()); + close(fenceFd); + } + return NO_ERROR; +} + +void VirtualDisplaySurface::dump(String8& result) const { +} + +// --------------------------------------------------------------------------- +} // namespace android +// --------------------------------------------------------------------------- -- cgit v1.1