Merge branch 'master' into multi-monitor

2026-09-18 22:55:46 +00:00 · 2012-10-02 03:11:32 +02:00
parent bf8639e49f 5fcfcb2ddc
commit ff09d3a343
9 changed files with 260 additions and 160 deletions
@@ -101,6 +101,7 @@ struct _GLFWhints
    GLboolean   resizable;
    GLboolean   visible;
    int         samples;
+    int         clientAPI;
    int         glMajor;
    int         glMinor;
    GLboolean   glForward;
@@ -122,6 +123,7 @@ struct _GLFWwndconfig
    int           refreshRate;
    GLboolean     resizable;
    GLboolean     visible;
+    int           clientAPI;
    int           glMajor;
    int           glMinor;
    GLboolean     glForward;
@@ -190,6 +192,7 @@ struct _GLFWwindow
    char      key[GLFW_KEY_LAST + 1];

    // OpenGL extensions and context attributes
+    int       clientAPI;
    int       glMajor, glMinor, glRevision;
    GLboolean glForward, glDebug;
    int       glProfile;