diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/glut/dos/util.c | 71 | ||||
| -rw-r--r-- | src/mesa/Makefile.DJ | 4 | ||||
| -rw-r--r-- | src/mesa/Makefile.mgw | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dos/dmesa.c | 4 |
4 files changed, 78 insertions, 3 deletions
diff --git a/src/glut/dos/util.c b/src/glut/dos/util.c new file mode 100644 index 00000000000..3eec9616cf6 --- /dev/null +++ b/src/glut/dos/util.c @@ -0,0 +1,71 @@ +/* + * Mesa 3-D graphics library + * Version: 3.4 + * Copyright (C) 1995-1998 Brian Paul + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/* + * DOS/DJGPP glut driver v1.4 for Mesa + * + * Copyright (C) 2002 - Borca Daniel + * Email : [email protected] + * Web : http://www.geocities.com/dborca + */ + + +#include "glutint.h" +#include "glutbitmap.h" +#include "glutstroke.h" + + + +#ifdef GLUT_IMPORT_LIB +extern StrokeFontRec glutStrokeRoman, glutStrokeMonoRoman; +extern BitmapFontRec glutBitmap8By13, glutBitmap9By15, glutBitmapTimesRoman10, glutBitmapTimesRoman24, glutBitmapHelvetica10, glutBitmapHelvetica12, glutBitmapHelvetica18; + +/* To get around the fact that DJGPP DXEs only allow functions + to be exported and no data addresses (as Unix DSOs support), the + GLUT API constants such as GLUT_STROKE_ROMAN have to get passed + through a case statement to get mapped to the actual data structure + address. */ +void *__glutFont (void *font) +{ + switch ((int)font) { + case (int)GLUT_STROKE_ROMAN: + return &glutStrokeRoman; + case (int)GLUT_STROKE_MONO_ROMAN: + return &glutStrokeMonoRoman; + case (int)GLUT_BITMAP_9_BY_15: + return &glutBitmap9By15; + case (int)GLUT_BITMAP_8_BY_13: + return &glutBitmap8By13; + case (int)GLUT_BITMAP_TIMES_ROMAN_10: + return &glutBitmapTimesRoman10; + case (int)GLUT_BITMAP_TIMES_ROMAN_24: + return &glutBitmapTimesRoman24; + case (int)GLUT_BITMAP_HELVETICA_10: + return &glutBitmapHelvetica10; + case (int)GLUT_BITMAP_HELVETICA_12: + return &glutBitmapHelvetica12; + case (int)GLUT_BITMAP_HELVETICA_18: + return &glutBitmapHelvetica18; + default: /* NOTREACHED */ + __glutFatalError("bad font!"); + return NULL; + } +} +#endif diff --git a/src/mesa/Makefile.DJ b/src/mesa/Makefile.DJ index 2d9c2d94efd..893a91bc1cb 100644 --- a/src/mesa/Makefile.DJ +++ b/src/mesa/Makefile.DJ @@ -106,6 +106,8 @@ MAIN_SOURCES = \ main/api_validate.c \ main/accum.c \ main/arbprogram.c \ + main/arbfragparse.c \ + main/arbvertparse.c \ main/attrib.c \ main/blend.c \ main/bufferobj.c \ @@ -343,7 +345,7 @@ ifeq ($(HAVEDXE3),) $(warning Missing DXE3 package... Skipping $(GL_DXE)) else ifeq ($(FX),1) - -dxe3gen -o $(LIBDIR)/$(GL_DXE) -Y $(LIBDIR)/$(GL_IMP) -D $(LIBNAME) -E _gl -E _DMesa -P glid3.dxe -U $^ + -dxe3gen -o $(LIBDIR)/$(GL_DXE) -Y $(LIBDIR)/$(GL_IMP) -D $(LIBNAME) -E _gl -E _DMesa -P glide3x.dxe -U $^ else -dxe3gen -o $(LIBDIR)/$(GL_DXE) -Y $(LIBDIR)/$(GL_IMP) -D $(LIBNAME) -E _gl -E _DMesa -U $^ endif diff --git a/src/mesa/Makefile.mgw b/src/mesa/Makefile.mgw index 3d72ae35a74..d8fb47c9328 100644 --- a/src/mesa/Makefile.mgw +++ b/src/mesa/Makefile.mgw @@ -97,6 +97,8 @@ MAIN_SOURCES = \ main/api_validate.c \ main/accum.c \ main/arbprogram.c \ + main/arbfragparse.c \ + main/arbvertparse.c \ main/attrib.c \ main/blend.c \ main/bufferobj.c \ diff --git a/src/mesa/drivers/dos/dmesa.c b/src/mesa/drivers/dos/dmesa.c index 7918fe9e9df..73b47569d9b 100644 --- a/src/mesa/drivers/dos/dmesa.c +++ b/src/mesa/drivers/dos/dmesa.c @@ -1474,7 +1474,7 @@ void DMesaDestroyVisual (DMesaVisual v) #endif #else - fxMesaDestroyContext((tdfxContextPtr)v); + fxMesaDestroyContext((fxMesaContext)v); #endif } @@ -1645,7 +1645,7 @@ GLboolean DMesaMakeCurrent (DMesaContext c, DMesaBuffer b) } #else - fxMesaMakeCurrent((tdfxContextPtr)c); + fxMesaMakeCurrent((fxMesaContext)c); #endif return GL_TRUE; |