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

More work on uint -> unsigned int.

Browse Source
This commit is contained in:
Robert Osfield 2003-02-14 20:27:23 +00:00
parent 44f88715ae
commit b4293fe93a
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/osg/Texture1D.cpp
View File

@ -88,7 +88,7 @@ void Texture1D::apply(State& state) const
// get the contextID (user defined ID of 0 upwards) for the // get the contextID (user defined ID of 0 upwards) for the
// current OpenGL context. // current OpenGL context.
const uint contextID = state.getContextID(); const unsigned int contextID = state.getContextID();
// get the globj for the current contextID. // get the globj for the current contextID.
GLuint& handle = getTextureObject(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 // get the contextID (user defined ID of 0 upwards) for the
// current OpenGL context. // current OpenGL context.
const uint contextID = state.getContextID(); const unsigned int contextID = state.getContextID();
const Extensions* extensions = getExtensions(contextID,true); const Extensions* extensions = getExtensions(contextID,true);
// update the modified tag to show that it is upto date. // 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) 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. // get the globj for the current contextID.
GLuint& handle = getTextureObject(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) 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. // get the globj for the current contextID.
GLuint& handle = getTextureObject(contextID); GLuint& handle = getTextureObject(contextID);

6
src/osg/Texture2D.cpp
View File

@ -91,7 +91,7 @@ void Texture2D::apply(State& state) const
// get the contextID (user defined ID of 0 upwards) for the // get the contextID (user defined ID of 0 upwards) for the
// current OpenGL context. // current OpenGL context.
const uint contextID = state.getContextID(); const unsigned int contextID = state.getContextID();
// get the globj for the current contextID. // get the globj for the current contextID.
GLuint& handle = getTextureObject(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 ) 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. // get the globj for the current contextID.
GLuint& handle = getTextureObject(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 ) 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. // get the globj for the current contextID.
GLuint& handle = getTextureObject(contextID); GLuint& handle = getTextureObject(contextID);

6
src/osg/TextureCubeMap.cpp
View File

@ -191,7 +191,7 @@ void TextureCubeMap::apply(State& state) const
{ {
// get the contextID (user defined ID of 0 upwards) for the // get the contextID (user defined ID of 0 upwards) for the
// current OpenGL context. // current OpenGL context.
const uint contextID = state.getContextID(); const unsigned int contextID = state.getContextID();
const Extensions* extensions = getExtensions(contextID,true); const Extensions* extensions = getExtensions(contextID,true);
if (!extensions->isCubeMapSupported()) if (!extensions->isCubeMapSupported())
@ -258,13 +258,13 @@ void TextureCubeMap::apply(State& state) const
typedef buffered_value< ref_ptr<TextureCubeMap::Extensions> > BufferedExtensions; typedef buffered_value< ref_ptr<TextureCubeMap::Extensions> > BufferedExtensions;
static BufferedExtensions s_extensions; 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; if (!s_extensions[contextID] && createIfNotInitalized) s_extensions[contextID] = new Extensions;
return s_extensions[contextID].get(); return s_extensions[contextID].get();
} }
void TextureCubeMap::setExtensions(uint contextID,Extensions* extensions) void TextureCubeMap::setExtensions(unsigned int contextID,Extensions* extensions)
{ {
s_extensions[contextID] = extensions; s_extensions[contextID] = extensions;
} }