From 9a77414377df064b46e6ea32946ab70a5b946185 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Fri, 7 Nov 2003 18:09:48 +0000 Subject: [PATCH] disable texture format verification for OS X - Textures work fine --- arch/ogl/ogl.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/ogl/ogl.c b/arch/ogl/ogl.c index 5fd4dc6c..d680002f 100644 --- a/arch/ogl/ogl.c +++ b/arch/ogl/ogl.c @@ -1,4 +1,4 @@ -/* $Id: ogl.c,v 1.9 2003-04-11 23:51:48 btb Exp $ */ +/* $Id: ogl.c,v 1.10 2003-11-07 18:09:48 btb Exp $ */ /* * * Graphics support functions for OpenGL. @@ -1387,9 +1387,12 @@ void ogl_loadtexture(unsigned char * data, int dxo,int dyo, ogl_texture *tex) if(gr_badtexture>0) return; +#if !(defined(__APPLE__) && defined(__MACH__)) + // always fails on OS X, but textures work fine! if (tex_format_verify(tex)) return; - +#endif + //calculate u/v values that would make the resulting texture correctly sized tex->u=(float)tex->w/(float)tex->tw; tex->v=(float)tex->h/(float)tex->th; -- 2.39.2