From 4170b79859ad1987e714be397d19060440a1da03 Mon Sep 17 00:00:00 2001 From: Martin Schaffner Date: Sat, 28 Aug 2004 18:11:19 +0000 Subject: [PATCH] enable -gl_mipmap switch --- ChangeLog | 12 ++++++++---- arch/ogl/ogl.c | 3 ++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3fd3e208a..ad2b6cabd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,14 +1,18 @@ -2004-08-28 Chris Taylor +2004-08-28 ~HJ + + * arch/ogl/ogl.c: enable -gl_mipmap switch + +2004-08-28 Chris Taylor * arch/carbon/descent.r: swap min and max size to correct places -2004-08-06 Chris Taylor +2004-08-06 Chris Taylor * main/gamesave.c: fix a bug introduced with the change of 2004-06-26 * cfile/cfile.c: add mkdir for carbon, and support files ending in 0x0d -2004-08-06 Chris Taylor +2004-08-06 Chris Taylor * include/strio.h, include/strutil.h, misc/args.c, misc/strio.c, misc/strutil.c: d2x can now handle any line ending when reading d2x.ini @@ -20,7 +24,7 @@ * include/error.h: on Mac OS 9 and X, define Int3 to be a Debugger -2004-08-04 Chris Taylor +2004-08-04 Chris Taylor * include/ogl_init.h: Include glu.h on OS X, it is sometimes necessary diff --git a/arch/ogl/ogl.c b/arch/ogl/ogl.c index f44e9ed24..34fef9064 100644 --- a/arch/ogl/ogl.c +++ b/arch/ogl/ogl.c @@ -1,4 +1,4 @@ -/* $Id: ogl.c,v 1.34 2004-08-01 13:01:39 schaffner Exp $ */ +/* $Id: ogl.c,v 1.35 2004-08-28 18:11:19 schaffner Exp $ */ /* * * Graphics support functions for OpenGL. @@ -190,6 +190,7 @@ void ogl_init_texture(ogl_texture* t, int w, int h, int flags) t->wrapstate[1] = -1; t->lw = t->w = w; t->h = h; + t->wantmip = flags & OGL_FLAG_MIPMAP; ogl_init_texture_stats(t); }