diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-08-19 15:52:51 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-08-19 15:52:51 +0000 |
| commit | 9ec58c2c5bbf90428a0e8e1c4f4af3805c602cd3 (patch) | |
| tree | 0519440b1cfa2b839ee1995b3e09d62dc05dd9d1 /include/GL | |
| parent | 3dc8cc4ebc63624dd521923271e63c2ac5a8aaae (diff) | |
DOS and glide driver updates from Daniel Borca
Diffstat (limited to 'include/GL')
| -rw-r--r-- | include/GL/dmesa.h | 6 | ||||
| -rw-r--r-- | include/GL/fxmesa.h | 4 | ||||
| -rw-r--r-- | include/GL/glut.h | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/include/GL/dmesa.h b/include/GL/dmesa.h index bb7d9b0cc9..7510fdb9f4 100644 --- a/include/GL/dmesa.h +++ b/include/GL/dmesa.h @@ -23,10 +23,10 @@ */ /* - * DOS/DJGPP device driver v1.3 for Mesa + * DOS/DJGPP device driver v1.4 for Mesa * * Copyright (C) 2002 - Borca Daniel - * Email : dborca@yahoo.com + * Email : dborca@users.sourceforge.net * Web : http://www.geocities.com/dborca */ @@ -90,7 +90,7 @@ void DMesaDestroyContext (DMesaContext c); /* * Return a handle to the current context. */ -DMesaContext DMesaGetCurrentContext (void); +void *DMesaGetCurrentContext (void); diff --git a/include/GL/fxmesa.h b/include/GL/fxmesa.h index 7697c72007..42f6ed8d72 100644 --- a/include/GL/fxmesa.h +++ b/include/GL/fxmesa.h @@ -76,7 +76,7 @@ GLAPI GLboolean GLAPIENTRY fxMesaSelectCurrentBoard(int n); GLAPI void GLAPIENTRY fxMesaMakeCurrent(fxMesaContext ctx); -GLAPI fxMesaContext GLAPIENTRY fxMesaGetCurrentContext(void); +GLAPI void * GLAPIENTRY fxMesaGetCurrentContext(void); GLAPI void GLAPIENTRY fxMesaSwapBuffers(void); @@ -88,6 +88,8 @@ GLAPI int GLAPIENTRY fxQueryHardware(void); GLAPI void GLAPIENTRY fxCloseHardware(void); +GLAPI void GLAPIENTRY fxGetScreenGeometry (GLint *w, GLint *h); + #if defined (__BEOS__) #pragma export off diff --git a/include/GL/glut.h b/include/GL/glut.h index 87fd6cee6c..27d937f7ce 100644 --- a/include/GL/glut.h +++ b/include/GL/glut.h @@ -350,7 +350,7 @@ WGLAPI int GLAPIENTRY SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR *); #define GLUT_NORMAL 0 #define GLUT_OVERLAY 1 -#if defined(_WIN32) +#if defined(_WIN32) || defined (GLUT_IMPORT_LIB) /* Stroke font constants (use these in GLUT program). */ #define GLUT_STROKE_ROMAN ((void*)0) #define GLUT_STROKE_MONO_ROMAN ((void*)1) |