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

Changed types from unsigned int to int's to address warnings, and changed the extension requirements so the GLES2 builds with FBO's where supported

Browse Source
This commit is contained in:
Robert Osfield
2010-06-01 18:20:38 +00:00
parent 32e8f6adc3
commit 7f7f1f7d0e
2 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/osg/FrameBufferObject
View File

@@ -360,12 +360,12 @@ namespace osg
FrameBufferAttachment(const FrameBufferAttachment& copy);
explicit FrameBufferAttachment(RenderBuffer* target);
explicit FrameBufferAttachment(Texture1D* target, int level = 0);
explicit FrameBufferAttachment(Texture2D* target, int level = 0);
explicit FrameBufferAttachment(Texture2DMultisample* target, int level = 0);
explicit FrameBufferAttachment(Texture3D* target, int zoffset, int level = 0);
explicit FrameBufferAttachment(Texture2DArray* target, int layer, int level = 0);
explicit FrameBufferAttachment(TextureCubeMap* target, int face, int level = 0);
explicit FrameBufferAttachment(Texture1D* target, unsigned int level = 0);
explicit FrameBufferAttachment(Texture2D* target, unsigned int level = 0);
explicit FrameBufferAttachment(Texture2DMultisample* target, unsigned int level = 0);
explicit FrameBufferAttachment(Texture3D* target, unsigned int zoffset, unsigned int level = 0);
explicit FrameBufferAttachment(Texture2DArray* target, unsigned int layer, unsigned int level = 0);
explicit FrameBufferAttachment(TextureCubeMap* target, unsigned int face, unsigned int level = 0);
explicit FrameBufferAttachment(TextureRectangle* target);
explicit FrameBufferAttachment(Camera::Attachment& attachment);
@@ -384,10 +384,10 @@ namespace osg
Texture* getTexture();
const Texture* getTexture() const;
int getCubeMapFace() const;
int getTextureLevel() const;
int getTexture3DZOffset() const;
int getTextureArrayLayer() const;
unsigned int getCubeMapFace() const;
unsigned int getTextureLevel() const;
unsigned int getTexture3DZOffset() const;
unsigned int getTextureArrayLayer() const;
private:
// use the Pimpl idiom to avoid dependency from