From: Elias N. <eli...@us...> - 2002-12-11 07:16:36
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/linux In directory sc8-pr-cvs1:/tmp/cvs-serv22313/linux Modified Files: org_lwjgl_Display.cpp Log Message: Switched to dynamic loading of gl functions and libs Index: org_lwjgl_Display.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Display.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Display.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- org_lwjgl_Display.cpp 4 Dec 2002 15:17:49 -0000 1.6 +++ org_lwjgl_Display.cpp 11 Dec 2002 07:16:31 -0000 1.7 @@ -40,13 +40,11 @@ */ +#include "extgl.h" #include <X11/X.h> #include <X11/Xlib.h> #include <X11/extensions/xf86vmode.h> -#include <GL/glx.h> #include <X11/Xutil.h> -#include <GL/gl.h> -#include <GL/glu.h> #include <stdio.h> #include <jni.h> #include "org_lwjgl_Display.h" @@ -144,7 +142,7 @@ return JNI_FALSE; } root_win = RootWindow(disp, screen); - + extgl_Open(); vis_info = glXChooseVisual(disp, screen, attriblist); /* might be a better way to handle not being able to set GLX_ALPHA_SIZE... */ @@ -213,6 +211,7 @@ XFree(avail_modes); XFree(vis_info); XCloseDisplay(disp); + extgl_Close(); #ifdef _DEBUG printf("Closed X connection\n"); #endif |