FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for MacOSX build, making sure that the compresed tex image is defined

Browse Source 
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.
This commit is contained in:
Robert Osfield
2002-04-24 20:36:47 +00:00
parent 08f063ec2d
commit 84dd24ce3f
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osg/Texture.cpp
View File

@@ -11,9 +11,7 @@
#include <osg/GLU>
#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) {