diff --git a/src/osg/Texture1D.cpp b/src/osg/Texture1D.cpp index 56435817e..608bee020 100644 --- a/src/osg/Texture1D.cpp +++ b/src/osg/Texture1D.cpp @@ -88,7 +88,7 @@ void Texture1D::apply(State& state) const // get the contextID (user defined ID of 0 upwards) for the // current OpenGL context. - const uint contextID = state.getContextID(); + const unsigned int contextID = state.getContextID(); // get the globj for the current contextID. GLuint& handle = getTextureObject(contextID); @@ -162,7 +162,7 @@ void Texture1D::applyTexImage1D(GLenum target, Image* image, State& state, GLsiz // get the contextID (user defined ID of 0 upwards) for the // current OpenGL context. - const uint contextID = state.getContextID(); + const unsigned int contextID = state.getContextID(); const Extensions* extensions = getExtensions(contextID,true); // update the modified tag to show that it is upto date. @@ -263,7 +263,7 @@ void Texture1D::applyTexImage1D(GLenum target, Image* image, State& state, GLsiz void Texture1D::copyTexImage1D(State& state, int x, int y, int width) { - const uint contextID = state.getContextID(); + const unsigned int contextID = state.getContextID(); // get the globj for the current contextID. GLuint& handle = getTextureObject(contextID); @@ -312,7 +312,7 @@ void Texture1D::copyTexImage1D(State& state, int x, int y, int width) void Texture1D::copyTexSubImage1D(State& state, int xoffset, int x, int y, int width) { - const uint contextID = state.getContextID(); + const unsigned int contextID = state.getContextID(); // get the globj for the current contextID. GLuint& handle = getTextureObject(contextID); diff --git a/src/osg/Texture2D.cpp b/src/osg/Texture2D.cpp index 7162c2b65..536738d35 100644 --- a/src/osg/Texture2D.cpp +++ b/src/osg/Texture2D.cpp @@ -91,7 +91,7 @@ void Texture2D::apply(State& state) const // get the contextID (user defined ID of 0 upwards) for the // current OpenGL context. - const uint contextID = state.getContextID(); + const unsigned int contextID = state.getContextID(); // get the globj for the current contextID. GLuint& handle = getTextureObject(contextID); @@ -162,7 +162,7 @@ void Texture2D::computeInternalFormat() const void Texture2D::copyTexImage2D(State& state, int x, int y, int width, int height ) { - const uint contextID = state.getContextID(); + const unsigned int contextID = state.getContextID(); // get the globj for the current contextID. GLuint& handle = getTextureObject(contextID); @@ -212,7 +212,7 @@ void Texture2D::copyTexImage2D(State& state, int x, int y, int width, int height void Texture2D::copyTexSubImage2D(State& state, int xoffset, int yoffset, int x, int y, int width, int height ) { - const uint contextID = state.getContextID(); + const unsigned int contextID = state.getContextID(); // get the globj for the current contextID. GLuint& handle = getTextureObject(contextID); diff --git a/src/osg/TextureCubeMap.cpp b/src/osg/TextureCubeMap.cpp index 27c155145..ee0da89d4 100644 --- a/src/osg/TextureCubeMap.cpp +++ b/src/osg/TextureCubeMap.cpp @@ -191,7 +191,7 @@ void TextureCubeMap::apply(State& state) const { // get the contextID (user defined ID of 0 upwards) for the // current OpenGL context. - const uint contextID = state.getContextID(); + const unsigned int contextID = state.getContextID(); const Extensions* extensions = getExtensions(contextID,true); if (!extensions->isCubeMapSupported()) @@ -258,13 +258,13 @@ void TextureCubeMap::apply(State& state) const typedef buffered_value< ref_ptr > BufferedExtensions; static BufferedExtensions s_extensions; -const TextureCubeMap::Extensions* TextureCubeMap::getExtensions(uint contextID,bool createIfNotInitalized) +const TextureCubeMap::Extensions* TextureCubeMap::getExtensions(unsigned int contextID,bool createIfNotInitalized) { if (!s_extensions[contextID] && createIfNotInitalized) s_extensions[contextID] = new Extensions; return s_extensions[contextID].get(); } -void TextureCubeMap::setExtensions(uint contextID,Extensions* extensions) +void TextureCubeMap::setExtensions(unsigned int contextID,Extensions* extensions) { s_extensions[contextID] = extensions; }