Hash :
229fc83d
Author :
Date :
2019-01-21T18:09:15
Vulkan: Port renderer to Fuchsia (reland) Add DisplayVk and WindowSurfaceVk subclasses for Fuchsia to the vulkan renderer, as well as an implementation of OSWindow that renders fullscreen for the test suite. Disallow use of the vulkan loader from third_party as Fuchsia uses a fork of the loader and has not sent those changes upstream yet. Add a small wayland-inspired library libfuchsia-egl to provide a type "struct fuchsia_egl_window" to use as EGLNativeWindowType. This type combines a zx_handle_t to an image pipe channel and a surface size. Image pipes can only be used once to create a VkSurfaceKHR. This means we have to recreate the pipe in tests that call eglCreateWindowSurface more than once with a single OSWindow, or the second call will fail. Add a resetNativeWindow() method to accomplish this. Reland disabling -Wextra-semi. BUG=angleproject:2475 TEST=angle_end2end_tests on Fuchsia Change-Id: Ie91715bcd760c6c04d4b8a02a91daa71e32ee30c Reviewed-on: https://chromium-review.googlesource.com/c/1467603 Commit-Queue: Michael Spang <spang@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 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149
//
// Copyright (c) 2016 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.
//
// AndroidWindow.cpp: Implementation of OSWindow for Android
#include "util/android/AndroidWindow.h"
#include <pthread.h>
#include "common/debug.h"
#include "util/android/third_party/android_native_app_glue.h"
namespace
{
struct android_app *sApp = nullptr;
pthread_mutex_t sInitWindowMutex;
pthread_cond_t sInitWindowCond;
bool sInitWindowDone = false;
} // namespace
AndroidWindow::AndroidWindow() {}
AndroidWindow::~AndroidWindow() {}
bool AndroidWindow::initialize(const std::string &name, size_t width, size_t height)
{
return resize(width, height);
}
void AndroidWindow::destroy() {}
void AndroidWindow::resetNativeWindow() {}
EGLNativeWindowType AndroidWindow::getNativeWindow() const
{
// Return the entire Activity Surface for now
// sApp->window is valid only after sInitWindowDone, which is true after initialize()
return sApp->window;
}
EGLNativeDisplayType AndroidWindow::getNativeDisplay() const
{
return EGL_DEFAULT_DISPLAY;
}
void AndroidWindow::messageLoop()
{
// TODO: accumulate events in the real message loop of android_main,
// and process them here
}
void AndroidWindow::setMousePosition(int x, int y)
{
UNIMPLEMENTED();
}
bool AndroidWindow::setPosition(int x, int y)
{
UNIMPLEMENTED();
return false;
}
bool AndroidWindow::resize(int width, int height)
{
mWidth = width;
mHeight = height;
// sApp->window used below is valid only after Activity Surface is created
pthread_mutex_lock(&sInitWindowMutex);
while (!sInitWindowDone)
{
pthread_cond_wait(&sInitWindowCond, &sInitWindowMutex);
}
pthread_mutex_unlock(&sInitWindowMutex);
// TODO: figure out a way to set the format as well,
// which is available only after EGLWindow initialization
int32_t err = ANativeWindow_setBuffersGeometry(sApp->window, mWidth, mHeight, 0);
return err == 0;
}
void AndroidWindow::setVisible(bool isVisible) {}
void AndroidWindow::signalTestEvent()
{
UNIMPLEMENTED();
}
static void onAppCmd(struct android_app *app, int32_t cmd)
{
switch (cmd)
{
case APP_CMD_INIT_WINDOW:
pthread_mutex_lock(&sInitWindowMutex);
sInitWindowDone = true;
pthread_cond_broadcast(&sInitWindowCond);
pthread_mutex_unlock(&sInitWindowMutex);
break;
// TODO: process other commands and pass them to AndroidWindow for handling
// TODO: figure out how to handle APP_CMD_PAUSE,
// which should immediately halt all the rendering,
// since Activity Surface is no longer available.
// Currently tests crash when paused, for example, due to device changing orientation
}
}
static int32_t onInputEvent(struct android_app *app, AInputEvent *event)
{
// TODO: Handle input events
return 0; // 0 == not handled
}
void android_main(struct android_app *app)
{
int events;
struct android_poll_source *source;
sApp = app;
pthread_mutex_init(&sInitWindowMutex, nullptr);
pthread_cond_init(&sInitWindowCond, nullptr);
// Event handlers, invoked from source->process()
app->onAppCmd = onAppCmd;
app->onInputEvent = onInputEvent;
// Message loop, polling for events indefinitely (due to -1 timeout)
// Must be here in order to handle APP_CMD_INIT_WINDOW event,
// which occurs after AndroidWindow::initialize(), but before AndroidWindow::messageLoop
while (ALooper_pollAll(-1, nullptr, &events, reinterpret_cast<void **>(&source)) >= 0)
{
if (source != nullptr)
{
source->process(app, source);
}
}
}
// static
OSWindow *OSWindow::New()
{
// There should be only one live instance of AndroidWindow at a time,
// as there is only one Activity Surface behind it.
// Creating a new AndroidWindow each time works for ANGLETest,
// as it destroys an old window before creating a new one.
// TODO: use GLSurfaceView to support multiple windows
return new AndroidWindow();
}