From 84dd24ce3f74e5a62d9c1a192288540f3f73ec01 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 24 Apr 2002 20:36:47 +0000 Subject: [PATCH] Fix for MacOSX build, making sure that the compresed tex image is defined on all builds by removing the #ifdef's but then changing the name used in the typedef so it doesn't collide with local implementations. --- src/osg/Texture.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/osg/Texture.cpp b/src/osg/Texture.cpp index e9e871e15..267d05269 100644 --- a/src/osg/Texture.cpp +++ b/src/osg/Texture.cpp @@ -11,9 +11,7 @@ #include -#ifndef GL_ARB_texture_compression - typedef void (APIENTRY * PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); -#endif +typedef void (APIENTRY * MyCompressedTexImage2DArbProc) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); using namespace osg; @@ -433,7 +431,7 @@ void Texture::applyTexImage(GLenum target, Image* image, State& state) const // an experiment to look at the changes in performance // when use 16 bit textures rather than 24/32bit textures. // internalFormat = GL_RGBA4; - static PFNGLCOMPRESSEDTEXIMAGE2DARBPROC glCompressedTexImage2D_ptr = + static MyCompressedTexImage2DArbProc glCompressedTexImage2D_ptr = (PFNGLCOMPRESSEDTEXIMAGE2DARBPROC)getGLExtensionFuncPtr("glCompressedTexImage2DARB"); if (_subloadMode == OFF) {