Demos (master): geom-outlining-150: Switch to core profile.

Kenneth Graunke kwg at kemper.freedesktop.org
Sat Mar 8 10:11:17 UTC 2014


Module: Demos
Branch: master
Commit: f827282a995db88f76666649cdd43b0a3cbc008f
URL:    http://cgit.freedesktop.org/mesa/demos/commit/?id=f827282a995db88f76666649cdd43b0a3cbc008f

Author: Fabian Bieler <fabianbieler at fastmail.fm>
Date:   Wed Feb  5 22:07:52 2014 +0100

geom-outlining-150: Switch to core profile.

Signed-off-by: Fabian Bieler <fabianbieler at fastmail.fm>
Acked-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/glsl/geom-outlining-150.c |   13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/glsl/geom-outlining-150.c b/src/glsl/geom-outlining-150.c
index 3dffa16..2e2a54a 100644
--- a/src/glsl/geom-outlining-150.c
+++ b/src/glsl/geom-outlining-150.c
@@ -364,9 +364,22 @@ main(int argc, char *argv[])
 {
    glutInit(&argc, argv);
    glutInitWindowSize(WinWidth, WinHeight);
+#ifdef HAVE_FREEGLUT
+   glutInitContextVersion(3, 2);
+   glutInitContextProfile(GLUT_CORE_PROFILE);
    glutInitDisplayMode(GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE);
+#elif defined __APPLE__
+   glutInitDisplayMode(GLUT_3_2_CORE_PROFILE | GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE);
+#else
+   glutInitDisplayMode(GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE);
+#endif
    Win = glutCreateWindow(argv[0]);
+   /* glewInit requires glewExperimentel set to true for core profiles.
+    * Depending on the glew version it also generates a GL_INVALID_ENUM.
+    */
+   glewExperimental = GL_TRUE;
    glewInit();
+   glGetError();
    glutReshapeFunc(Reshape);
    glutKeyboardFunc(Key);
    glutDisplayFunc(Redisplay);




More information about the mesa-commit mailing list