manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Corrected a bunch of harmless gcc warning. Only one significant change in the createFramebuffer, added const to all the params to allow the passing of temporary values.

This commit is contained in:
Paolo Cignoni 2012-05-06 15:07:13 +00:00
parent 37759ffcb0
commit 4778217ec5
11 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wrap/glw/bookkeeping.h
View File

@ -176,7 +176,7 @@ class SharedObjectBinding
const ObjectType * object(void) const const ObjectType * object(void) const
{ {
GLW_ASSERT(!this->isNull()) GLW_ASSERT(!this->isNull());
const ObjectType * obj = this->m_shared->object(); const ObjectType * obj = this->m_shared->object();
obj->setBinding(this->m_target, this->m_unit); obj->setBinding(this->m_target, this->m_unit);
return obj; return obj;

4
wrap/glw/buffer.h
View File

@ -144,8 +144,8 @@ class Buffer : public Object, public SafeBuffer
Buffer(Context * ctx) Buffer(Context * ctx)
: SafeObject (ctx) : SafeObject (ctx)
, SafeType (ctx)
, BaseType (ctx) , BaseType (ctx)
, SafeType (ctx)
, m_mapAccess (GL_NONE) , m_mapAccess (GL_NONE)
, m_mapPtr (0) , m_mapPtr (0)
{ {
@ -205,6 +205,6 @@ class Buffer : public Object, public SafeBuffer
typedef detail::SafeHandle <Buffer> BufferHandle; typedef detail::SafeHandle <Buffer> BufferHandle;
typedef detail::UnsafeHandle <Buffer> BoundBuffer; typedef detail::UnsafeHandle <Buffer> BoundBuffer;
}; } // end namespace glw
#endif // GLW_BUFFER_H #endif // GLW_BUFFER_H

4
wrap/glw/fragmentshader.h
View File

@ -62,8 +62,8 @@ class FragmentShader : public Shader, public SafeFragmentShader
FragmentShader(Context * ctx) FragmentShader(Context * ctx)
: SafeObject (ctx) : SafeObject (ctx)
, SafeShader (ctx) , SafeShader (ctx)
, SafeType (ctx)
, BaseType (ctx) , BaseType (ctx)
, SafeType (ctx)
{ {
; ;
} }
@ -82,6 +82,6 @@ class FragmentShader : public Shader, public SafeFragmentShader
typedef detail::SafeHandle <FragmentShader> FragmentShaderHandle; typedef detail::SafeHandle <FragmentShader> FragmentShaderHandle;
typedef detail::UnsafeHandle <FragmentShader> BoundFragmentShader; typedef detail::UnsafeHandle <FragmentShader> BoundFragmentShader;
}; } // end namespace glw
#endif // GLW_FRAGMENTSHADER_H #endif // GLW_FRAGMENTSHADER_H

4
wrap/glw/framebuffer.h
View File

@ -189,8 +189,8 @@ class Framebuffer : public Object, public SafeFramebuffer
Framebuffer(Context * ctx) Framebuffer(Context * ctx)
: SafeObject (ctx) : SafeObject (ctx)
, SafeType (ctx)
, BaseType (ctx) , BaseType (ctx)
, SafeType (ctx)
{ {
; ;
} }
@ -311,6 +311,6 @@ class Framebuffer : public Object, public SafeFramebuffer
typedef detail::SafeHandle <Framebuffer> FramebufferHandle; typedef detail::SafeHandle <Framebuffer> FramebufferHandle;
typedef detail::UnsafeHandle <Framebuffer> BoundFramebuffer; typedef detail::UnsafeHandle <Framebuffer> BoundFramebuffer;
}; } // end namespace glw
#endif // GLW_FRAMEBUFFER_H #endif // GLW_FRAMEBUFFER_H

4
wrap/glw/geometryshader.h
View File

@ -62,8 +62,8 @@ class GeometryShader : public Shader, public SafeGeometryShader
GeometryShader(Context * ctx) GeometryShader(Context * ctx)
: SafeObject (ctx) : SafeObject (ctx)
, SafeShader (ctx) , SafeShader (ctx)
, SafeType (ctx)
, BaseType (ctx) , BaseType (ctx)
, SafeType (ctx)
{ {
; ;
} }
@ -82,6 +82,6 @@ class GeometryShader : public Shader, public SafeGeometryShader
typedef detail::SafeHandle <GeometryShader> GeometryShaderHandle; typedef detail::SafeHandle <GeometryShader> GeometryShaderHandle;
typedef detail::UnsafeHandle <GeometryShader> BoundGeometryShader; typedef detail::UnsafeHandle <GeometryShader> BoundGeometryShader;
}; } // end namespace glw
#endif // GLW_GEOMETRYSHADER_H #endif // GLW_GEOMETRYSHADER_H

4
wrap/glw/program.h
View File

@ -297,8 +297,8 @@ class Program : public Object, public SafeProgram
Program(Context * ctx) Program(Context * ctx)
: SafeObject (ctx) : SafeObject (ctx)
, SafeType (ctx)
, BaseType (ctx) , BaseType (ctx)
, SafeType (ctx)
{ {
; ;
} }
@ -499,6 +499,6 @@ class Program : public Object, public SafeProgram
typedef detail::SafeHandle <Program> ProgramHandle; typedef detail::SafeHandle <Program> ProgramHandle;
typedef detail::UnsafeHandle <Program> BoundProgram; typedef detail::UnsafeHandle <Program> BoundProgram;
}; } // end namespace glw
#endif // GLW_PROGRAM_H #endif // GLW_PROGRAM_H

4
wrap/glw/renderbuffer.h
View File

@ -92,8 +92,8 @@ class Renderbuffer : public Renderable, public SafeRenderbuffer
Renderbuffer(Context * ctx) Renderbuffer(Context * ctx)
: SafeObject (ctx) : SafeObject (ctx)
, SafeRenderable (ctx) , SafeRenderable (ctx)
, SafeType (ctx)
, BaseType (ctx) , BaseType (ctx)
, SafeType (ctx)
{ {
; ;
} }
@ -153,6 +153,6 @@ class Renderbuffer : public Renderable, public SafeRenderbuffer
typedef detail::SafeHandle <Renderbuffer> RenderbufferHandle; typedef detail::SafeHandle <Renderbuffer> RenderbufferHandle;
typedef detail::UnsafeHandle <Renderbuffer> BoundRenderbuffer; typedef detail::UnsafeHandle <Renderbuffer> BoundRenderbuffer;
}; } // end namespace glw
#endif // GLW_RENDERBUFFER_H #endif // GLW_RENDERBUFFER_H

4
wrap/glw/shader.h
View File

@ -77,8 +77,8 @@ class Shader : public Object, public virtual SafeShader
Shader(Context * ctx) Shader(Context * ctx)
: SafeObject (ctx) : SafeObject (ctx)
, BaseType (ctx)
, SafeType (ctx) , SafeType (ctx)
, BaseType (ctx)
{ {
; ;
} }
@ -169,6 +169,6 @@ class Shader : public Object, public virtual SafeShader
typedef detail::SafeHandle <Shader> ShaderHandle; typedef detail::SafeHandle <Shader> ShaderHandle;
typedef detail::UnsafeHandle <Shader> BoundShader; typedef detail::UnsafeHandle <Shader> BoundShader;
}; } // end namespace glw
#endif // GLW_SHADER_H #endif // GLW_SHADER_H

4
wrap/glw/texture2d.h
View File

@ -129,8 +129,8 @@ class Texture2D : public Texture, public SafeTexture2D
: SafeObject (ctx) : SafeObject (ctx)
, SafeRenderable (ctx) , SafeRenderable (ctx)
, SafeTexture (ctx) , SafeTexture (ctx)
, SafeType (ctx)
, BaseType (ctx) , BaseType (ctx)
, SafeType (ctx)
{ {
; ;
} }
@ -170,6 +170,6 @@ class Texture2D : public Texture, public SafeTexture2D
typedef detail::SafeHandle <Texture2D> Texture2DHandle; typedef detail::SafeHandle <Texture2D> Texture2DHandle;
typedef detail::UnsafeHandle <Texture2D> BoundTexture2D; typedef detail::UnsafeHandle <Texture2D> BoundTexture2D;
}; } // end namespace glw
#endif // GLW_TEXTURE2D_H #endif // GLW_TEXTURE2D_H

20
wrap/glw/utility.h
View File

@ -213,15 +213,15 @@ inline Texture2DHandle createTexture2D(Context & ctx, GLenum format, GLsizei wid
inline FramebufferHandle createFramebuffer inline FramebufferHandle createFramebuffer
( (
Context & ctx, Context & ctx,
RenderTarget & depthTarget , const RenderTarget & depthTarget ,
RenderTarget & colorTarget0 = RenderTarget(), const RenderTarget & colorTarget0 = RenderTarget(),
RenderTarget & colorTarget1 = RenderTarget(), const RenderTarget & colorTarget1 = RenderTarget(),
RenderTarget & colorTarget2 = RenderTarget(), const RenderTarget & colorTarget2 = RenderTarget(),
RenderTarget & colorTarget3 = RenderTarget(), const RenderTarget & colorTarget3 = RenderTarget(),
RenderTarget & colorTarget4 = RenderTarget(), const RenderTarget & colorTarget4 = RenderTarget(),
RenderTarget & colorTarget5 = RenderTarget(), const RenderTarget & colorTarget5 = RenderTarget(),
RenderTarget & colorTarget6 = RenderTarget(), const RenderTarget & colorTarget6 = RenderTarget(),
RenderTarget & colorTarget7 = RenderTarget() const RenderTarget & colorTarget7 = RenderTarget()
) )
{ {
FramebufferArguments args; FramebufferArguments args;
@ -283,6 +283,6 @@ inline ProgramHandle loadProgram(Context & ctx, const std::string & srcPrefix, c
return loadProgram(ctx, srcPrefix, vertexFile, "", fragmentFile.c_str(), args); return loadProgram(ctx, srcPrefix, vertexFile, "", fragmentFile.c_str(), args);
} }
}; } // end namespace glw
#endif // GLW_UTILITY_H #endif // GLW_UTILITY_H

4
wrap/glw/vertexshader.h
View File

@ -62,8 +62,8 @@ class VertexShader : public Shader, public SafeVertexShader
VertexShader(Context * ctx) VertexShader(Context * ctx)
: SafeObject (ctx) : SafeObject (ctx)
, SafeShader (ctx) , SafeShader (ctx)
, SafeType (ctx)
, BaseType (ctx) , BaseType (ctx)
, SafeType (ctx)
{ {
; ;
} }
@ -82,6 +82,6 @@ class VertexShader : public Shader, public SafeVertexShader
typedef detail::SafeHandle <VertexShader> VertexShaderHandle; typedef detail::SafeHandle <VertexShader> VertexShaderHandle;
typedef detail::UnsafeHandle <VertexShader> BoundVertexShader; typedef detail::UnsafeHandle <VertexShader> BoundVertexShader;
}; } // end namespace glw
#endif // GLW_VERTEXSHADER_H #endif // GLW_VERTEXSHADER_H