diff options
| author | 2017-02-17 22:17:35 +0000 | |
|---|---|---|
| committer | 2017-02-17 22:17:36 +0000 | |
| commit | f810b29ebc8564f94ff7fb14f2d13a0f4d111703 (patch) | |
| tree | d99aec6c734c984cfb96779aedc1549646ebc3a5 /services/surfaceflinger/SurfaceFlinger.cpp | |
| parent | 873e2eee781f323a8aa0283cab5924fa4cd7ecfe (diff) | |
| parent | 5ea5e5905170f32d5cf45ad35c552d64743892c3 (diff) | |
Merge changes from topic 'GPU_replace_GL'
* changes:
Fix unexpected FrameEvents on BufferQueue reconnect
Add FrameEvents::isValidTimestamp
Change GL references to GPU for getFrameTimestamps.
Clean up FrameTimestamp log messages.
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.cpp')
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 462e5a6758..215628de0f 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -639,7 +639,7 @@ status_t SurfaceFlinger::getSupportedFrameTimestamps( FrameEvent::LATCH, FrameEvent::FIRST_REFRESH_START, FrameEvent::LAST_REFRESH_START, - FrameEvent::GL_COMPOSITION_DONE, + FrameEvent::GPU_COMPOSITION_DONE, getHwComposer().presentFenceRepresentsStartOfScanout() ? FrameEvent::DISPLAY_PRESENT : FrameEvent::DISPLAY_RETIRE, FrameEvent::DEQUEUE_READY, |