From f939d5122a7a072d6dcab20844b905c8c6304053 Mon Sep 17 00:00:00 2001 From: Martin Schaffner Date: Sun, 14 Nov 2004 09:34:23 +0000 Subject: [PATCH] make Mac OS 9 Voodoo display textures --- ChangeLog | 4 ++++ arch/ogl/gr.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 542448d5..49c69071 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-11-14 Chris Taylor + + * arch/ogl/ogl.c: make Mac OS 9 Voodoo display textures + 2004-10-30 Martin Schaffner * main/gamemine.c, main/piggy.c: read descent 1 textures also from diff --git a/arch/ogl/gr.c b/arch/ogl/gr.c index 3b688a7f..da04bcef 100644 --- a/arch/ogl/gr.c +++ b/arch/ogl/gr.c @@ -1,4 +1,4 @@ -/* $Id: gr.c,v 1.35 2004-08-06 20:36:02 schaffner Exp $ */ +/* $Id: gr.c,v 1.36 2004-11-14 09:34:23 schaffner Exp $ */ /* * * OGL video functions. - Added 9/15/99 Matthew Mueller @@ -224,6 +224,11 @@ void ogl_get_verinfo(void) // orulz (Matrox G200) ogl_intensity4_ok=0; } +#ifdef macintosh + if (stricmp(gl_renderer,"3dfx Voodoo 3")==0){ // strangely, includes Voodoo 2 + ogl_gettexlevelparam_ok=0; // Always returns 0 + } +#endif //allow overriding of stuff. #ifdef GL_ARB_multitexture -- 2.39.2