Jiga228/glfw
0
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-09-21 00:30:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into tls

Browse Source 
Conflicts:
	src/x11_window.c
This commit is contained in:
Camilla Berglund
2012-08-26 21:56:20 +02:00
parent 9af03e141b bb635729ec
commit 035a8f4a49
16 changed files with 468 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/events.c
+5 -2
View File
@@ -242,8 +242,11 @@ static void window_refresh_callback(GLFWwindow window)
{
printf("%08x at %0.3f: Window refresh\n", counter++, glfwGetTime());
glClear(GL_COLOR_BUFFER_BIT);
glfwSwapBuffers(window);
if (glfwGetCurrentContext())
{
glClear(GL_COLOR_BUFFER_BIT);
glfwSwapBuffers(window);
}
}
static void window_focus_callback(GLFWwindow window, int activated)