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

Various warning fixes

Browse Source
This commit is contained in:
Robert Osfield
2008-10-27 13:09:43 +00:00
parent e062524cb4
commit b28612bce2
21 changed files with 77 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/osg/FrameBufferObject
View File

@@ -169,7 +169,6 @@ namespace osg
protected:
FBOExtensions(unsigned int contextID);
private:
bool _supported;
};

2
include/osg/Texture2DArray
View File

@@ -206,7 +206,7 @@ class OSG_EXPORT Texture2DArray : public Texture
virtual void computeInternalFormat() const;
void allocateMipmap(State& state) const;
void applyTexImage2DArray_subload(State& state, Image* image, GLsizei inwidth, GLsizei inheight, GLsizei indepth, GLenum inInternalFormat, GLsizei& numMipmapLevels) const;
void applyTexImage2DArray_subload(State& state, Image* image, GLsizei inwidth, GLsizei inheight, GLsizei indepth, GLint inInternalFormat, GLsizei& numMipmapLevels) const;
/**
* Use std::vector to encapsulate referenced pointers to images of different layers.

8
include/osgShadow/ParallelSplitShadowMap
View File

@@ -184,11 +184,11 @@ class OSGSHADOW_EXPORT ParallelSplitShadowMap : public ShadowTechnique
osg::ref_ptr<osg::Light> _userLight;
osg::ref_ptr<FragmentShaderGenerator> _FragmentShaderGenerator;
bool _GLSL_shadow_filtered;
SplitCalcMode _SplitCalcMode;
bool _GLSL_shadow_filtered;
SplitCalcMode _SplitCalcMode;
osg::Uniform* _ambientBiasUniform;
osg::Vec2d _ambientBias;
osg::Uniform* _ambientBiasUniform;
osg::Vec2d _ambientBias;
};
}

9
include/osgShadow/ViewDependentShadowTechnique
View File

@@ -179,6 +179,11 @@ class OSGSHADOW_EXPORT ViewDependentShadowTechnique
*/
OpenThreads::Mutex _mutex;
/**
Dirty flag tells this instance to update its resources
*/
bool _dirty;
/**
View's CullVisitor associated with this ViewData instance
*/
@@ -189,10 +194,6 @@ class OSGSHADOW_EXPORT ViewDependentShadowTechnique
*/
osg::observer_ptr< ViewDependentShadowTechnique > _st;
/**
Dirty flag tells this instance to update its resources
*/
bool _dirty;
};
/**