Verified Commit 7a932edc authored by Sotaro Ikeda's avatar Sotaro Ikeda Committed by ma1
Browse files

Bug 2061532 a=RyanVM DONTBUILD 

ANGLE Metal backend usage is also going to disable RenderExternalTextureHost usage.

Original Revision: https://phabricator.services.mozilla.com/D318624

Differential Revision: https://phabricator.services.mozilla.com/D320769
parent bbe2eee1

gfx/webrender_bindings/RenderExternalTextureHost.cpp

+13 −2
Original line number Diff line number Diff line
@@ -126,7 +126,14 @@ bool RenderExternalTextureHost::IsReadyForDeletion() { 


  auto& textureSource = mTextureSources[0];

  if (textureSource) {

    return textureSource->Sync(false);

    if (textureSource->Sync(/* aBlocking */ true)) {

      return true;

    }

    if (mGL && mGL->MakeCurrent() && !mGL->IsDestroyed()) {

      mGL->fFinish();

      return true;

    }

    return false;

  }



  return true;
@@ -153,7 +160,11 @@ wr::WrExternalImage RenderExternalTextureHost::Lock(uint8_t aChannelIndex, 


void RenderExternalTextureHost::PrepareForUse() { mTextureUpdateNeeded = true; }



void RenderExternalTextureHost::Unlock() {}

void RenderExternalTextureHost::Unlock() {

  if (mInitialized && mTextureSources[0]) {

    mTextureSources[0]->MaybeFenceTexture();

  }

}



void RenderExternalTextureHost::UpdateTexture(size_t aIndex) {

  MOZ_ASSERT(mSurfaces[aIndex]);

modules/libpref/init/StaticPrefList.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7826,7 +7826,7 @@ 
#ifdef XP_MACOSX

- name: gfx.webrender.enable-client-storage

  type: bool

  value: true

  value: false

  mirror: once

#endif