6a67be2e32
forcing users to use osgDB::readRef*File() methods. The later is preferable as it closes a potential threading bug when using paging databases in conjunction
with the osgDB::Registry Object Cache. This threading bug occurs when one thread gets an object from the Cache via an osgDB::read*File() call where only
a pointer to the object is passed back, so taking a reference to the object is delayed till it gets reassigned to a ref_ptr<>, but at the same time another
thread calls a flush of the Object Cache deleting this object as it's referenceCount is now zero. Using osgDB::readREf*File() makes sure the a ref_ptr<> is
passed back and the referenceCount never goes to zero.
To ensure the OSG builds when OSG_PROVIDE_READFILE is to OFF the many cases of osgDB::read*File() usage had to be replaced with a ref_ptr<> osgDB::readRef*File()
usage. The avoid this change causing lots of other client code to be rewritten to handle the use of ref_ptr<> in place of C pointer I introduced a serious of
templte methods in various class to adapt ref_ptr<> to the underly C pointer to be passed to old OSG API's, example of this is found in include/osg/Group:
bool addChild(Node* child); // old method which can only be used with a Node*
tempalte<class T> bool addChild(const osg::ref_ptr<T>& child) { return addChild(child.get()); } // adapter template method
These changes together cover 149 modified files, so it's a large submission. This extent of changes are warrent to make use of the Object Cache
and multi-threaded loaded more robust.
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/branches/OpenSceneGraph-3.4@15165 16af8721-9629-0410-8352-f15c8da7e697
101 lines
3.7 KiB
C++
101 lines
3.7 KiB
C++
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2010 Robert Osfield
|
|
*
|
|
* This library is open source and may be redistributed and/or modified under
|
|
* the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
|
|
* (at your option) any later version. The full license is in LICENSE file
|
|
* included with this distribution, and on the openscenegraph.org website.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* OpenSceneGraph Public License for more details.
|
|
*
|
|
* Texture2DMultisample codes Copyright (C) 2010 Marcin Hajder
|
|
* Thanks to to my company http://www.ai.com.pl for allowing me free this work.
|
|
*/
|
|
|
|
#ifndef OSG_TEXTURE2DMS
|
|
#define OSG_TEXTURE2DMS 1
|
|
|
|
#include <osg/Texture>
|
|
|
|
namespace osg {
|
|
|
|
/** Texture2DMultisample state class which encapsulates OpenGL 2D multisampled texture functionality.
|
|
* Multisampled texture were introduced with OpenGL 3.1 and extension GL_ARB_texture_multisample.
|
|
* See http://www.opengl.org/registry/specs/ARB/texture_multisample.txt for more info.
|
|
*/
|
|
|
|
class OSG_EXPORT Texture2DMultisample : public Texture
|
|
{
|
|
public :
|
|
|
|
Texture2DMultisample();
|
|
|
|
Texture2DMultisample(GLsizei numSamples, GLboolean fixedsamplelocations);
|
|
|
|
/** Copy constructor using CopyOp to manage deep vs shallow copy. */
|
|
Texture2DMultisample(const Texture2DMultisample& text,const CopyOp& copyop=CopyOp::SHALLOW_COPY);
|
|
|
|
META_StateAttribute(osg, Texture2DMultisample,TEXTURE);
|
|
|
|
/** Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */
|
|
virtual int compare(const StateAttribute& rhs) const;
|
|
|
|
virtual GLenum getTextureTarget() const
|
|
{
|
|
return GL_TEXTURE_2D_MULTISAMPLE;
|
|
}
|
|
|
|
/** Texture2DMultisample is related to non fixed pipeline usage only so isn't appropriate to enable/disable.*/
|
|
virtual bool getModeUsage(StateAttribute::ModeUsage&) const { return false; }
|
|
|
|
/** Sets the texture width and height. If width or height are zero,
|
|
* calculate the respective value from the source image size. */
|
|
inline void setTextureSize(int width, int height) const
|
|
{
|
|
_textureWidth = width;
|
|
_textureHeight = height;
|
|
}
|
|
|
|
inline void setNumSamples( int samples ) { _numSamples = samples; }
|
|
GLsizei getNumSamples() const { return _numSamples; }
|
|
|
|
// unnecessary for Texture2DMultisample
|
|
virtual void setImage(unsigned int /*face*/, Image* /*image*/) {}
|
|
|
|
virtual Image* getImage(unsigned int /*face*/) { return NULL; }
|
|
virtual const Image* getImage(unsigned int /*face*/) const { return NULL; }
|
|
virtual unsigned int getNumImages() const {return 0; }
|
|
virtual void allocateMipmap(State& /*state*/) const {}
|
|
|
|
void setTextureWidth(int width) { _textureWidth=width; }
|
|
void setTextureHeight(int height) { _textureHeight=height; }
|
|
|
|
virtual int getTextureWidth() const { return _textureWidth; }
|
|
virtual int getTextureHeight() const { return _textureHeight; }
|
|
virtual int getTextureDepth() const { return 1; }
|
|
|
|
/** Bind the texture object. If the texture object hasn't already been
|
|
* compiled, create the texture mipmap levels. */
|
|
virtual void apply(State& state) const;
|
|
|
|
protected :
|
|
|
|
virtual ~Texture2DMultisample();
|
|
|
|
virtual void computeInternalFormat() const;
|
|
|
|
/** Subloaded images can have different texture and image sizes. */
|
|
mutable GLsizei _textureWidth, _textureHeight;
|
|
|
|
mutable GLsizei _numSamples;
|
|
|
|
mutable GLboolean _fixedsamplelocations;
|
|
|
|
};
|
|
|
|
}
|
|
|
|
#endif
|