WebGLContext patch

WebGLContext.cpp

#define VRB_LOG(format, ...) __android_log_print(ANDROID_LOG_INFO, "VRB", format, ##__VA_ARGS__);

static already_AddRefed<SharedSurfaceTextureClient>
CloneSurface(gl::SharedSurface* src, gl::SurfaceFactory* factory)
{
    RefPtr<SharedSurfaceTextureClient> dest = factory->NewTexClient(src->mSize);
    if (!dest) {
      return nullptr;
    }

    gl::SharedSurface* destSurf = dest->Surf();

    destSurf->ProducerAcquire();
    SharedSurface::ProdCopy(src, dest->Surf(), factory);
    destSurf->ProducerRelease();

    return dest.forget();
}

already_AddRefed<layers::SharedSurfaceTextureClient>
WebGLContext::GetVRFrame()
{
    VRB_LOG("WebGLContext::GetVRFrame");

  if (IsContextLost())
      return nullptr;

  gl::GLScreenBuffer* screen = gl->Screen();
  if (!screen)
      return nullptr;

  RefPtr<SharedSurfaceTextureClient> sharedSurface = screen->Front();
  if (!sharedSurface)
      return nullptr;

  /*gl::SharedSurface* surface = sharedSurface->Surf();
  layers::SurfaceDescriptor desc;
  if (!surface->ToSurfaceDescriptor(&desc)) {
    VRB_LOG("mortimer SharedSurface::ToSurfaceDescriptor failed in WebGLContext::GetVRFrame");
    return nullptr;
  }

  const SurfaceTextureDescriptor& sfDesc = desc.get_SurfaceTextureDescriptor();
  java::GeckoSurfaceTexture::LocalRef surfaceTexture = java::GeckoSurfaceTexture::Lookup(sfDesc.handle());
  VRB_LOG("GetVRFrame descriptor: %llu singleBuffer: %d", sfDesc.handle(), surfaceTexture->IsSingleBuffer() ? 1 : 0);*/
  //surfaceTexture->DetachFromGLContext();

  gl->MakeCurrent();
  VRB_LOG("GetVRFrame BeginComposition begin");
  // BeginComposition();
  const bool succeeded = PresentScreenBuffer();
  mDrawCallsSinceLastFlush = 0;

  VRB_LOG("GetVRFrame EndComposition begin");
  EndComposition();

  // CloneSurface call seems to not be needed, I didn´t notice any difference
  // CloneSurface(sharedSurface->Surf(), gl->Screen()->Factory());

  VRB_LOG("GetVRFrame commit begin");
  if (succeeded) {
    sharedSurface->Surf()->Commit();
  }
  VRB_LOG("GetVRFrame commit end");

  return sharedSurface.forget();
}