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

From Mike Weiblen,

Browse Source 
" - adjustments to improve namespacing on VS
  - clarify compilation status message"
This commit is contained in:
Robert Osfield
2005-06-20 10:36:06 +00:00
parent 9c950f0f3c
commit 7453711267
2 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/osg/Shader
View File

@@ -11,8 +11,8 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
/* file: include/osg/Shader
* author: Mike Weiblen 2005-05-12
/* file: include/osg/Shader
* author: Mike Weiblen 2005-06-15
*/
#ifndef OSG_SHADER
@@ -27,6 +27,8 @@
namespace osg {
class Program;
///////////////////////////////////////////////////////////////////////////
/** osg::Shader is an application-level abstraction of an OpenGL glShader.
* It is a container to load the shader source code text and manage its
@@ -37,8 +39,6 @@ namespace osg {
* configuration.
*/
class Program;
class OSG_EXPORT Shader : public osg::Object
{
public:
@@ -153,15 +153,15 @@ class OSG_EXPORT Shader : public osg::Object
PerContextShader* getPCS(unsigned int contextID) const;
friend class Program;
bool addProgramRef( Program* program );
bool removeProgramRef( Program* program );
friend class osg::Program;
bool addProgramRef( osg::Program* program );
bool removeProgramRef( osg::Program* program );
protected: /*data*/
Type _type;
std::string _shaderSource;
/** osg::Programs that this osg::Shader is attached to */
typedef std::set< Program* > ProgramSet;
typedef std::set< osg::Program* > ProgramSet;
ProgramSet _programSet;
mutable osg::buffered_value< osg::ref_ptr<PerContextShader> > _pcsList;