Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-26 03:52:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into tls

Browse Source
This commit is contained in:
Camilla Berglund 2012-08-12 16:47:40 +02:00
commit c9896a2f75
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/win32_opengl.c
View File

@ -30,6 +30,8 @@
#include "internal.h" #include "internal.h"
#include <stdlib.h>
//======================================================================== //========================================================================
// The per-thread current context/window pointer // The per-thread current context/window pointer

4
tests/windows.c
View File

@ -67,8 +67,8 @@ int main(void)
glfwMakeContextCurrent(windows[i]); glfwMakeContextCurrent(windows[i]);
glClearColor((GLclampf) (i & 1), glClearColor((GLclampf) (i & 1),
(GLclampf) (i >> 1), (GLclampf) (i >> 1),
i ? 0.0 : 1.0, i ? 0.f : 1.f,
0.0); 0.f);
glfwSetWindowPos(windows[i], 100 + (i & 1) * 300, 100 + (i >> 1) * 300); glfwSetWindowPos(windows[i], 100 + (i & 1) * 300, 100 + (i >> 1) * 300);
} }