Hash :
36f2c80a
Author :
Date :
2019-07-31T13:36:04
Fuchsia: Fix size & position of test window on Scenic Scenic places our window in with its center in the corner if we don't apply any translation. Therefore we only see 1/4 of the surface. Translate the surface so the full size is visible. Also account for display scaling as we're sizing in pixels and scenic is sizing in density independent pixels. Bug: angleproject:4382 Test: angle_end2end_tests Change-Id: I1ae0b877c0ed7cf9d810bb2c8317b9842bd322a1 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1716226 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108
//
// 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);
void onViewMetrics(const fuchsia::ui::gfx::Metrics &metrics);
void onViewProperties(const fuchsia::ui::gfx::ViewProperties &properties);
private:
void updateViewSize();
// 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;
// View geometry.
float mDisplayHeightDips = 0.f;
float mDisplayWidthDips = 0.f;
float mDisplayScaleX = 0.f;
float mDisplayScaleY = 0.f;
bool mHasViewProperties = false;
bool mHasViewMetrics = false;
bool mViewSizeDirty = false;
// EGL native window.
std::unique_ptr<fuchsia_egl_window, FuchsiaEGLWindowDeleter> mFuchsiaEGLWindow;
};
#endif // UTIL_FUCHSIA_SCENIC_WINDOW_H