diff options
| author | alk3pInjection <webmaster@raspii.tech> | 2023-04-20 00:08:54 +0800 |
|---|---|---|
| committer | alk3pInjection <webmaster@raspii.tech> | 2023-04-20 00:08:54 +0800 |
| commit | 700894222ef5c27947fba1d83e8717f1caad9673 (patch) | |
| tree | f13143e689ae969f564972cd44c845f516d301bb /libs/hwui/pipeline/skia/SkiaOpenGLPipeline.h | |
| parent | 170ac41d329349edb67163fbd5f49f4788a55fcc (diff) | |
| parent | 308c98f901f540b2a61bde5363434d613b27fd0b (diff) | |
Merge tag 'LA.QSSI.13.0.r1-09800-qssi.0' into tachibana
"LA.QSSI.13.0.r1-09800-qssi.0"
Conflicts:
core/java/android/app/StatusBarManager.java
core/java/android/provider/Settings.java
packages/SystemUI/res/values/config.xml
packages/SystemUI/res/values/styles.xml
packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
packages/SystemUI/src/com/android/systemui/flags/Flags.java
packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSFactoryImpl.java
packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java
packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
Change-Id: I991d734864d4fc3b542a52e4a0ab3a0a5ccd2a35
Diffstat (limited to 'libs/hwui/pipeline/skia/SkiaOpenGLPipeline.h')
| -rw-r--r-- | libs/hwui/pipeline/skia/SkiaOpenGLPipeline.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.h b/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.h index 186998a01745..a80c613697f2 100644 --- a/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.h +++ b/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.h @@ -61,7 +61,8 @@ protected: private: renderthread::EglManager& mEglManager; EGLSurface mEglSurface = EGL_NO_SURFACE; - bool mBufferPreserved = false; + sp<ANativeWindow> mNativeWindow; + renderthread::SwapBehavior mSwapBehavior = renderthread::SwapBehavior::kSwap_discardBuffer; }; } /* namespace skiapipeline */ |