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

Merge branch 'master' into EGL

Browse Source 
Conflicts:
	src/internal.h
	src/opengl.c
	tests/glfwinfo.c
This commit is contained in:
Camilla Berglund
2012-08-02 02:41:57 +02:00
parent 0f1ab5317f c047bd2efe
commit 7d222030da
10 changed files with 63 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/glfwinfo.c
+2 -8
View File
@@ -276,7 +276,7 @@ int main(int argc, char** argv)
printf(" debug");
putchar('\n');
printf("%s flags parsed by GLFW:", get_client_api_name(api));
printf("%s context flags parsed by GLFW:", get_client_api_name(api));
if (glfwGetWindowParam(window, GLFW_OPENGL_FORWARD_COMPAT))
printf(" forward-compatible");
@@ -293,13 +293,7 @@ int main(int argc, char** argv)
mask,
get_profile_name(mask));
printf("%s profile parsed by GLFW:\n", get_client_api_name(api));
if (glfwGetWindowParam(window, GLFW_OPENGL_FORWARD_COMPAT))
printf(" forward-compatible");
if (glfwGetWindowParam(window, GLFW_OPENGL_DEBUG_CONTEXT))
printf(" debug");
putchar('\n');
printf("%s profile mask parsed by GLFW:\n", get_client_api_name(api));
}
}