Edit

kc3-lang/angle/util/x11/X11Window.h

Branch :

  • Show log

    Commit

  • Author : Yuly Novikov
    Date : 2016-08-12 20:40:14
    Hash : e3352f94
    Message : Change angle_util to be a shared library So that there will be one instance of static thread synchronization variables in AndroidWindow. Previously there was one instance in lib_angle_deqp_gles2_tests__library and one in libangle_deqp_libgles2, resulting in AndroidWindow::initialize waiting forever. Also make the change in GYP build to fix standalone build, and fix rpath issues on Mac. BUG=angleproject:1471 TEST=end2end and deqp tests on standalone Win10 and end2end on GN Mac 10.11 Change-Id: I731578459400bb47d269df129aabed9b67b555e6 Reviewed-on: https://chromium-review.googlesource.com/376202 Reviewed-by: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>

  • util/x11/X11Window.h
  • //
    // Copyright (c) 2015 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.
    //
    
    // X11Window.h: Definition of the implementation of OSWindow for X11
    
    #ifndef UTIL_X11_WINDOW_H
    #define UTIL_X11_WINDOW_H
    
    #include <string>
    #include <X11/Xlib.h>
    #include <X11/Xutil.h>
    #include <X11/Xresource.h>
    
    #include <export.h>
    
    #include "OSWindow.h"
    
    class ANGLE_EXPORT X11Window : public OSWindow
    {
      public:
        X11Window();
        X11Window(int visualId);
        ~X11Window();
    
        bool initialize(const std::string &name, size_t width, size_t height) override;
        void destroy() 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;
    
      private:
        void processEvent(const XEvent &event);
    
        Atom WM_DELETE_WINDOW;
        Atom WM_PROTOCOLS;
        Atom TEST_EVENT;
    
        Display *mDisplay;
        Window mWindow;
        int mRequestedVisualId;
        bool mVisible;
    };
    
    #endif // UTIL_X11_WINDOW_H