corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1187048 - Code clean up around nsScreenGonk's EGLSurface handling r=mwu

Browse Source
This commit is contained in:
Sotaro Ikeda
2015-07-24 10:56:05 -07:00
parent 9826e44a6a
commit 94c1a83c68
8 changed files with 48 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
widget/gonk/HwcComposer2D.cpp
View File

@@ -709,7 +709,7 @@ HwcComposer2D::TryHwComposition(nsScreenGonk* aScreen)
return false;
} else if (blitComposite) {
// BLIT Composition, flip DispSurface target
GetGonkDisplay()->UpdateDispSurface(aScreen->GetDpy(), aScreen->GetSur());
GetGonkDisplay()->UpdateDispSurface(aScreen->GetEGLDisplay(), aScreen->GetEGLSurface());
DisplaySurface* dispSurface = aScreen->GetDisplaySurface();
if (!dispSurface) {
LOGE("H/W Composition failed. NULL DispSurface.");
@@ -731,7 +731,7 @@ HwcComposer2D::Render(nsIWidget* aWidget)
// HWC module does not exist or mList is not created yet.
if (!mHal->HasHwc() || !mList) {
return GetGonkDisplay()->SwapBuffers(screen->GetDpy(), screen->GetSur());
return GetGonkDisplay()->SwapBuffers(screen->GetEGLDisplay(), screen->GetEGLSurface());
} else if (!mList && !ReallocLayerList()) {
LOGE("Cannot realloc layer list");
return false;
@@ -829,7 +829,7 @@ HwcComposer2D::Commit(nsScreenGonk* aScreen)
bool
HwcComposer2D::TryHwComposition(nsScreenGonk* aScreen)
{
mHal->SetEGLInfo(aScreen->GetDpy(), aScreen->GetSur());
mHal->SetEGLInfo(aScreen->GetEGLDisplay(), aScreen->GetEGLSurface());
return !mHal->Set(mList, aScreen->GetDisplayType());
}
@@ -837,7 +837,7 @@ bool
HwcComposer2D::Render(nsIWidget* aWidget)
{
nsScreenGonk* screen = static_cast<nsWindow*>(aWidget)->GetScreen();
GetGonkDisplay()->SwapBuffers(screen->GetDpy(), screen->GetSur());
GetGonkDisplay()->SwapBuffers(screen->GetEGLDisplay(), screen->GetEGLSurface());
if (!mHal->HasHwc()) {
return true;