diff options
| author | Mathias Agopian <mathias@google.com> | 2012-08-21 23:34:09 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2012-08-23 16:03:37 -0700 |
| commit | e60b0687c8d49871d0c8786cabe6851f7a7783b5 (patch) | |
| tree | afef903dcaa648d2862278e289c254a99390f400 /services/surfaceflinger/DisplayDevice.cpp | |
| parent | 7c9e82633c5c4f85b896a5879bdb25cdf659646e (diff) | |
| download | frameworks_native-e60b0687c8d49871d0c8786cabe6851f7a7783b5.zip frameworks_native-e60b0687c8d49871d0c8786cabe6851f7a7783b5.tar.gz frameworks_native-e60b0687c8d49871d0c8786cabe6851f7a7783b5.tar.bz2 | |
HWComposer now has its own concept of display IDs
HWComposer can now create IDs representing a display
it can deal with. IDs MAIN and HDMI are reserved.
SurfaceFlinger associate HWComposer IDs with a
DisplayDevice and uses that when it talks to HWComposer.
A DisplayDevice doesn't have to have a HWComposer ID,
in that case it just can't use h/w composer composition.
Change-Id: Iec3d7ac92e0c22bf975052ae2847402f58bade71
Diffstat (limited to 'services/surfaceflinger/DisplayDevice.cpp')
| -rw-r--r-- | services/surfaceflinger/DisplayDevice.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp index 2289444..821a329 100644 --- a/services/surfaceflinger/DisplayDevice.cpp +++ b/services/surfaceflinger/DisplayDevice.cpp @@ -68,12 +68,12 @@ void checkGLErrors() DisplayDevice::DisplayDevice( const sp<SurfaceFlinger>& flinger, - int display, + int32_t display, int32_t hwcDisplayId, const sp<ANativeWindow>& nativeWindow, const sp<FramebufferSurface>& framebufferSurface, EGLConfig config) : mFlinger(flinger), - mId(display), + mId(display), mHwcDisplayId(hwcDisplayId), mNativeWindow(nativeWindow), mFramebufferSurface(framebufferSurface), mDisplay(EGL_NO_DISPLAY), |