From 6112a373c12162f7333c3f3634df51b4e1263fcd Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 11 Mar 2004 14:34:59 +0000 Subject: [PATCH] Replaced eronous GL_TEXTURE_2D instances with GL_TEXTURE_3D and GL_TEXTURE_RECTANGLE_NV respectively. --- src/osg/Texture3D.cpp | 4 ++-- src/osg/TextureRectangle.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/osg/Texture3D.cpp b/src/osg/Texture3D.cpp index 9ce6164a5..9af1990c9 100644 --- a/src/osg/Texture3D.cpp +++ b/src/osg/Texture3D.cpp @@ -135,7 +135,7 @@ void Texture3D::apply(State& state) const else if (_subloadCallback.valid()) { - _textureObjectBuffer[contextID] = textureObject = getTextureObjectManager()->generateTextureObject(contextID,GL_TEXTURE_2D); + _textureObjectBuffer[contextID] = textureObject = getTextureObjectManager()->generateTextureObject(contextID,GL_TEXTURE_3D); textureObject->bind(); @@ -155,7 +155,7 @@ void Texture3D::apply(State& state) const else if (_image.valid() && _image->data()) { - _textureObjectBuffer[contextID] = textureObject = getTextureObjectManager()->generateTextureObject(contextID,GL_TEXTURE_2D); + _textureObjectBuffer[contextID] = textureObject = getTextureObjectManager()->generateTextureObject(contextID,GL_TEXTURE_3D); textureObject->bind(); diff --git a/src/osg/TextureRectangle.cpp b/src/osg/TextureRectangle.cpp index 3bd9acd89..dc6cc53f9 100644 --- a/src/osg/TextureRectangle.cpp +++ b/src/osg/TextureRectangle.cpp @@ -232,10 +232,10 @@ void TextureRectangle::applyTexImage_load(GLenum target, Image* image, State& st if (useClientStorage) { glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE,GL_TRUE); - glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_PRIORITY,0.0f); + glTexParameterf(target,GL_TEXTURE_PRIORITY,0.0f); #ifdef GL_TEXTURE_STORAGE_HINT_APPLE - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_STORAGE_HINT_APPLE , GL_STORAGE_CACHED_APPLE); + glTexParameteri(target, GL_TEXTURE_STORAGE_HINT_APPLE , GL_STORAGE_CACHED_APPLE); #endif }