diff options
author | Sean D'Epagnier <[email protected]> | 2006-08-18 10:38:15 +0000 |
---|---|---|
committer | Sean D'Epagnier <[email protected]> | 2006-08-18 10:38:15 +0000 |
commit | 7e4152f0ed46f644a4247444e18dc7ad6c9832b0 (patch) | |
tree | e281f83eff5b387fa4a92d81ced80c91716e0899 /src/glut/fbdev/fbdev.c | |
parent | bd87c303e94659941a7c623d0b836e3ff317cfb4 (diff) |
The driver now compiles correctly without any x headers or libraries installed
The bitmap and stroke code can't be shared with glx anymore because of this.
The model for the mini teapot is restored and I have tested it to work with
linux-fbdev and linux-solo
The driver recognizes 32bpp where there is no alpha (my radeon 7500) It also
sets the correct number of cmap entrees (instead of 256 which can be an error)
Diffstat (limited to 'src/glut/fbdev/fbdev.c')
-rw-r--r-- | src/glut/fbdev/fbdev.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/glut/fbdev/fbdev.c b/src/glut/fbdev/fbdev.c index ce7d187b66d..10bc6eacc14 100644 --- a/src/glut/fbdev/fbdev.c +++ b/src/glut/fbdev/fbdev.c @@ -112,11 +112,8 @@ static void Cleanup(void) /* close mouse */ CloseMouse(); - glFBDevMakeCurrent( NULL, NULL, NULL); - - glFBDevDestroyContext(Context); - glFBDevDestroyBuffer(Buffer); - glFBDevDestroyVisual(Visual); + if(Visual) + glutDestroyWindow(1); /* restore original variable screen info */ if(FrameBufferFD != -1) { @@ -735,6 +732,11 @@ int glutGetWindow(void) void glutDestroyWindow(int win) { + glFBDevMakeCurrent( NULL, NULL, NULL); + glFBDevDestroyContext(Context); + glFBDevDestroyBuffer(Buffer); + glFBDevDestroyVisual(Visual); + Visual = NULL; } void glutPostRedisplay(void) @@ -762,6 +764,7 @@ void glutSwapBuffers(void) Swapping = 0; } + /* if there was a vt switch while swapping, switch now */ if(VTSwitch) { if(ioctl(ConsoleFD, VT_ACTIVATE, VTSwitch) < 0) sprintf(exiterror, "Error switching console\n"); |