Add display manager instance which hands relevant information to emugl layer

This commit is contained in:
Simon Fels 2016-11-08 08:14:38 +01:00
commit d5d2f8d36f
6 changed files with 92 additions and 21 deletions

View file

@ -46,6 +46,7 @@ GLRendererServer::GLRendererServer(const std::shared_ptr<WindowCreator> &window_
BOOST_THROW_EXCEPTION(std::runtime_error("Failed to initialize OpenGL renderer"));
registerSubWindowHandler(window_creator_);
registerDisplayManager(window_creator_);
}
GLRendererServer::~GLRendererServer() {
@ -81,14 +82,6 @@ void GLRendererServer::start() {
BOOST_THROW_EXCEPTION(std::runtime_error("Failed to setup OpenGL renderer"));
socket_path_ = server_addr;
#if 0
// Create the window we use for rendering the output we get from the
// Android container. This will internally construct a Mir surface
// and use the host EGL/GLES libraries for rendering.
if (!showOpenGLSubwindow(0, 0, 0, width, height, width, height, 1.0f, 0))
BOOST_THROW_EXCEPTION(std::runtime_error("Failed to setup GL based window"));
#endif
}
std::string GLRendererServer::socket_path() const {

View file

@ -19,23 +19,19 @@
#define ANBOX_GRAPHICS_WINDOW_CREATOR_H_
#include "external/android-emugl/host/libs/libOpenglRender/NativeSubWindow.h"
#include "external/android-emugl/host/libs/libOpenglRender/DisplayManager.h"
namespace anbox {
namespace input {
class Manager;
} // namespace input
namespace graphics {
class WindowCreator : public SubWindowHandler {
class WindowCreator : public SubWindowHandler,
public DisplayManager {
public:
WindowCreator(const std::shared_ptr<input::Manager> &input_manager);
virtual ~WindowCreator();
struct DisplayInfo {
int horizontal_resolution;
int vertical_resolution;
};
virtual DisplayInfo display_info() const = 0;
virtual EGLNativeDisplayType native_display() const = 0;
protected: