Merge branch 'master' into EGL

Conflicts: readme.html src/win32_platform.h src/x11_platform.h
2026-09-21 08:39:45 +00:00 · 2012-12-02 16:17:59 +01:00
parent 1eef0f0869 8e5b2239d3
commit da02844457
11 changed files with 138 additions and 8 deletions
@@ -100,6 +100,7 @@ struct _GLFWhints
    GLboolean   resizable;
    GLboolean   visible;
    int         samples;
+    GLboolean   sRGB;
    int         clientAPI;
    int         glMajor;
    int         glMinor;
@@ -160,6 +161,7 @@ struct _GLFWfbconfig
    int         auxBuffers;
    GLboolean   stereo;
    int         samples;
+    GLboolean   sRGB;
    GLFWintptr  platformID;
 };

@@ -199,6 +201,7 @@ struct _GLFWwindow
    int       glRobustness;
    PFNGLGETSTRINGIPROC GetStringi;

+    GLFWwindowposfun     windowPosCallback;
    GLFWwindowsizefun    windowSizeCallback;
    GLFWwindowclosefun   windowCloseCallback;
    GLFWwindowrefreshfun windowRefreshCallback;