Merge branch 'master' into transparent_windows

Merging in the latest code from the GLFW mainline.
This commit is contained in:
Cem Karan 2016-02-16 15:51:41 -05:00
commit d854f49239

View File

@ -98,8 +98,8 @@ typedef const GLubyte* (APIENTRY * PFNGLGETSTRINGIPROC)(GLenum,GLuint);
#define VK_NULL_HANDLE 0
typedef GLFWuint64 VkInstance;
typedef GLFWuint64 VkPhysicalDevice;
typedef void* VkInstance;
typedef void* VkPhysicalDevice;
typedef GLFWuint64 VkSurfaceKHR;
typedef unsigned int VkFlags;
typedef unsigned int VkBool32;