kc3-lang/angle/util/fuchsia/ScenicWindow.h

• Show log

  Commit

• Hash : f63fbcd5
  Author :
  Date : 2020-01-29T16:13:56
  

  Fuchsia: Limit number of concurrent presents in ScenicWindow
  
  The test suite occasionally runs into the following error:
  
  [02036.794449][326733][326738][klog] INFO: [ERROR:src/ui/scenic/lib/scenic/session.cc(412)] Scenic session error (session_id: 1): Present2() called with no more present calls allowed. Terminating session.
  
  This is actually a problem with the test harness as resetting the window
  triggers a present with no fences and no OnFramePresentedCallback which
  means there is no way to know if we will exceed the limit.
  
  Add an OnFramePresentedCallback and count presents to stay under the
  limit. This blocks if there's more than 2 in flight presents. A dedicated
  async loop is used to avoid re-entering other code while waiting to
  present (there is no such case in the ANGLE test suite currently, but
  better safe than sorry).
  
  Typically if we run the whole suite there will be a failure in the
  middle, but re-trying the test that failed won't repro the issue. Add a
  test that reliably exhausts the limit by calling resetNativeWindow() in a
  loop.
  
  Bug: angleproject:4360
  Change-Id: I24eb01fd72fc0be57c36e49b5875023a80d6ab91
  Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2027934
  Commit-Queue: Michael Spang <spang@chromium.org>
  Reviewed-by: Jamie Madill <jmadill@chromium.org>
  

Download

• util/fuchsia/ScenicWindow.h

• //
  // Copyright 2019 The ANGLE Project Authors. All rights reserved.
  // Use of this source code is governed by a BSD-style license that can be
  // found in the LICENSE file.
  //
  // ScenicWindow.h:
  //    Subclasses OSWindow for Fuchsia's Scenic compositor.
  //
  
  #ifndef UTIL_FUCHSIA_SCENIC_WINDOW_H
  #define UTIL_FUCHSIA_SCENIC_WINDOW_H
  
  #include "common/debug.h"
  #include "util/OSWindow.h"
  #include "util/util_export.h"
  
  // Disable ANGLE-specific warnings that pop up in fuchsia headers.
  ANGLE_DISABLE_DESTRUCTOR_OVERRIDE_WARNING
  
  #include <fuchsia/ui/policy/cpp/fidl.h>
  #include <fuchsia/ui/scenic/cpp/fidl.h>
  #include <fuchsia_egl.h>
  #include <lib/async-loop/cpp/loop.h>
  #include <lib/ui/scenic/cpp/commands.h>
  #include <lib/ui/scenic/cpp/resources.h>
  #include <lib/ui/scenic/cpp/session.h>
  #include <zircon/types.h>
  #include <string>
  
  ANGLE_REENABLE_DESTRUCTOR_OVERRIDE_WARNING
  
  struct FuchsiaEGLWindowDeleter
  {
      void operator()(fuchsia_egl_window *eglWindow) { fuchsia_egl_window_destroy(eglWindow); }
  };
  
  class ANGLE_UTIL_EXPORT ScenicWindow : public OSWindow
  {
    public:
      ScenicWindow();
      ~ScenicWindow() override;
  
      // OSWindow:
      bool initialize(const std::string &name, int width, int height) override;
      void destroy() override;
      void resetNativeWindow() override;
      EGLNativeWindowType getNativeWindow() const override;
      EGLNativeDisplayType getNativeDisplay() const override;
      void messageLoop() override;
      void setMousePosition(int x, int y) override;
      bool setPosition(int x, int y) override;
      bool resize(int width, int height) override;
      void setVisible(bool isVisible) override;
      void signalTestEvent() override;
  
      // Presents the window to Scenic.
      //
      // We need to do this once per EGL window surface after adding the
      // surface's image pipe as a child of our window.
      void present();
  
      // FIDL callbacks:
      void onScenicEvents(std::vector<fuchsia::ui::scenic::Event> events);
      void onScenicError(zx_status_t status);
      void onFramePresented(fuchsia::scenic::scheduling::FramePresentedInfo info);
  
    private:
      // ScenicWindow async loop.
      async::Loop *const mLoop;
  
      // System services.
      zx::channel mServiceRoot;
      fuchsia::ui::scenic::ScenicPtr mScenic;
      fuchsia::ui::policy::PresenterPtr mPresenter;
  
      // Scenic session & resources.
      scenic::Session mScenicSession;
      scenic::ShapeNode mShape;
      scenic::Material mMaterial;
  
      // Whether our scenic session has disconnected.
      bool mLostSession = false;
  
      // Present limiting.
      static constexpr int kMaxInFlightPresents = 2;
      int mInFlightPresents                     = 0;
  
      // Scenic view.
      std::unique_ptr<scenic::View> mView;
  
      // EGL native window.
      std::unique_ptr<fuchsia_egl_window, FuchsiaEGLWindowDeleter> mFuchsiaEGLWindow;
  };
  
  #endif  // UTIL_FUCHSIA_SCENIC_WINDOW_H
  

Download