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

Warning fixes

Browse Source
This commit is contained in:
Robert Osfield 2008-12-17 13:14:17 +00:00
parent 8a6e04b84d
commit 26c57f125d
2 changed files with 575 additions and 478 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

355
include/osg/GL2Extensions
View File

@ -395,131 +395,250 @@ class OSG_EXPORT GL2Extensions : public osg::Referenced
bool _isGeometryShader4Supported; bool _isGeometryShader4Supported;
bool _isGpuShader4Supported; bool _isGpuShader4Supported;
void* _glBlendEquationSeparate; typedef void (APIENTRY * BlendEquationSeparateProc)(GLenum modeRGB, GLenum modeAlpha);
void* _glDrawBuffers; typedef void (APIENTRY * DrawBuffersProc)(GLsizei n, const GLenum *bufs);
void* _glStencilOpSeparate; typedef void (APIENTRY * StencilOpSeparateProc)(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
void* _glStencilFuncSeparate; typedef void (APIENTRY * StencilFuncSeparateProc)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
void* _glStencilMaskSeparate; typedef void (APIENTRY * StencilMaskSeparateProc)(GLenum face, GLuint mask);
void* _glAttachShader; typedef void (APIENTRY * AttachShaderProc)(GLuint program, GLuint shader);
void* _glBindAttribLocation; typedef void (APIENTRY * BindAttribLocationProc)(GLuint program, GLuint index, const GLchar *name);
void* _glCompileShader; typedef void (APIENTRY * CompileShaderProc)(GLuint shader);
void* _glCreateProgram; typedef GLuint (APIENTRY * CreateProgramProc)(void);
void* _glCreateShader; typedef GLuint (APIENTRY * CreateShaderProc)(GLenum type);
void* _glDeleteProgram; typedef void (APIENTRY * DeleteProgramProc)(GLuint program);
void* _glDeleteShader; typedef void (APIENTRY * DeleteObjectARBProc)(GLuint program);
void* _glDetachShader; typedef void (APIENTRY * DeleteShaderProc)(GLuint shader);
void* _glDisableVertexAttribArray; typedef void (APIENTRY * DetachShaderProc)(GLuint program, GLuint shader);
void* _glEnableVertexAttribArray; typedef void (APIENTRY * DisableVertexAttribArrayProc)(GLuint index);
void* _glGetActiveAttrib; typedef void (APIENTRY * EnableVertexAttribArrayProc)(GLuint index);
void* _glGetActiveUniform; typedef void (APIENTRY * GetActiveAttribProc)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
void* _glGetAttachedShaders; typedef void (APIENTRY * GetActiveUniformProc)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
void* _glGetAttribLocation; typedef void (APIENTRY * GetAttachedShadersProc)(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
void* _glGetProgramiv; typedef GLint (APIENTRY * GetAttribLocationProc)(GLuint program, const GLchar *name);
void* _glGetProgramInfoLog; typedef void (APIENTRY * GetProgramivProc)(GLuint program, GLenum pname, GLint *params);
void* _glGetShaderiv; typedef void (APIENTRY * GetObjectParameterivARBProc)(GLuint program, GLenum pname, GLint *params);
void* _glGetShaderInfoLog; typedef void (APIENTRY * GetProgramInfoLogProc)(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
void* _glGetShaderSource; typedef void (APIENTRY * GetInfoLogARBProc)(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
void* _glGetUniformLocation; typedef void (APIENTRY * GetShaderivProc)(GLuint shader, GLenum pname, GLint *params);
void* _glGetUniformfv; typedef void (APIENTRY * GetShaderInfoLogProc)(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
void* _glGetUniformiv; typedef void (APIENTRY * GetShaderSourceProc)(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
void* _glGetVertexAttribdv; typedef GLint (APIENTRY * GetUniformLocationProc)(GLuint program, const GLchar *name);
void* _glGetVertexAttribfv; typedef void (APIENTRY * GetUniformfvProc)(GLuint program, GLint location, GLfloat *params);
void* _glGetVertexAttribiv; typedef void (APIENTRY * GetUniformivProc)(GLuint program, GLint location, GLint *params);
void* _glGetVertexAttribPointerv; typedef void (APIENTRY * GetVertexAttribdvProc)(GLuint index, GLenum pname, GLdouble *params);
void* _glIsProgram; typedef void (APIENTRY * GetVertexAttribfvProc)(GLuint index, GLenum pname, GLfloat *params);
void* _glIsShader; typedef void (APIENTRY * GetVertexAttribivProc)(GLuint index, GLenum pname, GLint *params);
void* _glLinkProgram; typedef void (APIENTRY * GetVertexAttribPointervProc)(GLuint index, GLenum pname, GLvoid* *pointer);
void* _glShaderSource; typedef GLboolean (APIENTRY * IsProgramProc)(GLuint program);
void* _glUseProgram; typedef GLboolean (APIENTRY * IsShaderProc)(GLuint shader);
void* _glUniform1f; typedef void (APIENTRY * LinkProgramProc)(GLuint program);
void* _glUniform2f; typedef void (APIENTRY * ShaderSourceProc)(GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
void* _glUniform3f; typedef void (APIENTRY * UseProgramProc)(GLuint program);
void* _glUniform4f; typedef void (APIENTRY * Uniform1fProc)(GLint location, GLfloat v0);
void* _glUniform1i; typedef void (APIENTRY * Uniform2fProc)(GLint location, GLfloat v0, GLfloat v1);
void* _glUniform2i; typedef void (APIENTRY * Uniform3fProc)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
void* _glUniform3i; typedef void (APIENTRY * Uniform4fProc)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
void* _glUniform4i; typedef void (APIENTRY * Uniform1iProc)(GLint location, GLint v0);
void* _glUniform1fv; typedef void (APIENTRY * Uniform2iProc)(GLint location, GLint v0, GLint v1);
void* _glUniform2fv; typedef void (APIENTRY * Uniform3iProc)(GLint location, GLint v0, GLint v1, GLint v2);
void* _glUniform3fv; typedef void (APIENTRY * Uniform4iProc)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
void* _glUniform4fv; typedef void (APIENTRY * Uniform1fvProc)(GLint location, GLsizei count, const GLfloat *value);
void* _glUniform1iv; typedef void (APIENTRY * Uniform2fvProc)(GLint location, GLsizei count, const GLfloat *value);
void* _glUniform2iv; typedef void (APIENTRY * Uniform3fvProc)(GLint location, GLsizei count, const GLfloat *value);
void* _glUniform3iv; typedef void (APIENTRY * Uniform4fvProc)(GLint location, GLsizei count, const GLfloat *value);
void* _glUniform4iv; typedef void (APIENTRY * Uniform1ivProc)(GLint location, GLsizei count, const GLint *value);
void* _glUniformMatrix2fv; typedef void (APIENTRY * Uniform2ivProc)(GLint location, GLsizei count, const GLint *value);
void* _glUniformMatrix3fv; typedef void (APIENTRY * Uniform3ivProc)(GLint location, GLsizei count, const GLint *value);
void* _glUniformMatrix4fv; typedef void (APIENTRY * Uniform4ivProc)(GLint location, GLsizei count, const GLint *value);
void* _glValidateProgram; typedef void (APIENTRY * UniformMatrix2fvProc)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
void* _glVertexAttrib1d; typedef void (APIENTRY * UniformMatrix3fvProc)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
void* _glVertexAttrib1dv; typedef void (APIENTRY * UniformMatrix4fvProc)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
void* _glVertexAttrib1f; typedef void (APIENTRY * ValidateProgramProc)(GLuint program);
void* _glVertexAttrib1fv; typedef void (APIENTRY * VertexAttrib1dProc)(GLuint index, GLdouble x);
void* _glVertexAttrib1s; typedef void (APIENTRY * VertexAttrib1dvProc)(GLuint index, const GLdouble *v);
void* _glVertexAttrib1sv; typedef void (APIENTRY * VertexAttrib1fProc)(GLuint index, GLfloat x);
void* _glVertexAttrib2d; typedef void (APIENTRY * VertexAttrib1fvProc)(GLuint index, const GLfloat *v);
void* _glVertexAttrib2dv; typedef void (APIENTRY * VertexAttrib1sProc)(GLuint index, GLshort x);
void* _glVertexAttrib2f; typedef void (APIENTRY * VertexAttrib1svProc)(GLuint index, const GLshort *v);
void* _glVertexAttrib2fv; typedef void (APIENTRY * VertexAttrib2dProc)(GLuint index, GLdouble x, GLdouble y);
void* _glVertexAttrib2s; typedef void (APIENTRY * VertexAttrib2dvProc)(GLuint index, const GLdouble *v);
void* _glVertexAttrib2sv; typedef void (APIENTRY * VertexAttrib2fProc)(GLuint index, GLfloat x, GLfloat y);
void* _glVertexAttrib3d; typedef void (APIENTRY * VertexAttrib2fvProc)(GLuint index, const GLfloat *v);
void* _glVertexAttrib3dv; typedef void (APIENTRY * VertexAttrib2sProc)(GLuint index, GLshort x, GLshort y);
void* _glVertexAttrib3f; typedef void (APIENTRY * VertexAttrib2svProc)(GLuint index, const GLshort *v);
void* _glVertexAttrib3fv; typedef void (APIENTRY * VertexAttrib3dProc)(GLuint index, GLdouble x, GLdouble y, GLdouble z);
void* _glVertexAttrib3s; typedef void (APIENTRY * VertexAttrib3dvProc)(GLuint index, const GLdouble *v);
void* _glVertexAttrib3sv; typedef void (APIENTRY * VertexAttrib3fProc)(GLuint index, GLfloat x, GLfloat y, GLfloat z);
void* _glVertexAttrib4Nbv; typedef void (APIENTRY * VertexAttrib3fvProc)(GLuint index, const GLfloat *v);
void* _glVertexAttrib4Niv; typedef void (APIENTRY * VertexAttrib3sProc)(GLuint index, GLshort x, GLshort y, GLshort z);
void* _glVertexAttrib4Nsv; typedef void (APIENTRY * VertexAttrib3svProc)(GLuint index, const GLshort *v);
void* _glVertexAttrib4Nub; typedef void (APIENTRY * VertexAttrib4NbvProc)(GLuint index, const GLbyte *v);
void* _glVertexAttrib4Nubv; typedef void (APIENTRY * VertexAttrib4NivProc)(GLuint index, const GLint *v);
void* _glVertexAttrib4Nuiv; typedef void (APIENTRY * VertexAttrib4NsvProc)(GLuint index, const GLshort *v);
void* _glVertexAttrib4Nusv; typedef void (APIENTRY * VertexAttrib4NubProc)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
void* _glVertexAttrib4bv; typedef void (APIENTRY * VertexAttrib4NubvProc)(GLuint index, const GLubyte *v);
void* _glVertexAttrib4d; typedef void (APIENTRY * VertexAttrib4NuivProc)(GLuint index, const GLuint *v);
void* _glVertexAttrib4dv; typedef void (APIENTRY * VertexAttrib4NusvProc)(GLuint index, const GLushort *v);
void* _glVertexAttrib4f; typedef void (APIENTRY * VertexAttrib4bvProc)(GLuint index, const GLbyte *v);
void* _glVertexAttrib4fv; typedef void (APIENTRY * VertexAttrib4dProc)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
void* _glVertexAttrib4iv; typedef void (APIENTRY * VertexAttrib4dvProc)(GLuint index, const GLdouble *v);
void* _glVertexAttrib4s; typedef void (APIENTRY * VertexAttrib4fProc)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
void* _glVertexAttrib4sv; typedef void (APIENTRY * VertexAttrib4fvProc)(GLuint index, const GLfloat *v);
void* _glVertexAttrib4ubv; typedef void (APIENTRY * VertexAttrib4ivProc)(GLuint index, const GLint *v);
void* _glVertexAttrib4uiv; typedef void (APIENTRY * VertexAttrib4sProc)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
void* _glVertexAttrib4usv; typedef void (APIENTRY * VertexAttrib4svProc)(GLuint index, const GLshort *v);
void* _glVertexAttribPointer; typedef void (APIENTRY * VertexAttrib4ubvProc)(GLuint index, const GLubyte *v);
typedef void (APIENTRY * VertexAttrib4uivProc)(GLuint index, const GLuint *v);
typedef void (APIENTRY * VertexAttrib4usvProc)(GLuint index, const GLushort *v);
typedef void (APIENTRY * VertexAttribPointerProc)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
typedef void (APIENTRY * UniformMatrix2x3fvProc)( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value );
typedef void (APIENTRY * UniformMatrix3x2fvProc)( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value );
typedef void (APIENTRY * UniformMatrix2x4fvProc)( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value );
typedef void (APIENTRY * UniformMatrix4x2fvProc)( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value );
typedef void (APIENTRY * UniformMatrix3x4fvProc)( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value );
typedef void (APIENTRY * UniformMatrix4x3fvProc)( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value );
typedef void (APIENTRY * ProgramParameteriProc)( GLuint program, GLenum pname, GLint value );
typedef void (APIENTRY * FramebufferTextureProc)( GLenum target, GLenum attachment, GLuint texture, GLint level );
typedef void (APIENTRY * FramebufferTextureLayerProc)( GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer );
typedef void (APIENTRY * FramebufferTextureFaceProc)( GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face );
typedef void (APIENTRY * GetUniformuivProc)( GLuint program, GLint location, GLuint* params );
typedef void (APIENTRY * BindFragDataLocationProc)( GLuint program, GLuint color, const GLchar* name );
typedef GLint (APIENTRY * GetFragDataLocationProc)( GLuint program, const GLchar* name );
typedef void (APIENTRY * Uniform1uiProc)( GLint location, GLuint v0 );
typedef void (APIENTRY * Uniform2uiProc)( GLint location, GLuint v0, GLuint v1 );
typedef void (APIENTRY * Uniform3uiProc)( GLint location, GLuint v0, GLuint v1, GLuint v2 );
typedef void (APIENTRY * Uniform4uiProc)( GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3 );
typedef void (APIENTRY * Uniform1uivProc)( GLint location, GLsizei count, const GLuint *value );
typedef void (APIENTRY * Uniform2uivProc)( GLint location, GLsizei count, const GLuint *value );
typedef void (APIENTRY * Uniform3uivProc)( GLint location, GLsizei count, const GLuint *value );
typedef void (APIENTRY * Uniform4uivProc)( GLint location, GLsizei count, const GLuint *value );
typedef GLuint (APIENTRY * GetHandleProc) (GLenum pname);
void* _glGetInfoLogARB; BlendEquationSeparateProc _glBlendEquationSeparate;
void* _glGetObjectParameterivARB; DrawBuffersProc _glDrawBuffers;
void* _glDeleteObjectARB; StencilOpSeparateProc _glStencilOpSeparate;
void* _glGetHandleARB; StencilFuncSeparateProc _glStencilFuncSeparate;
StencilMaskSeparateProc _glStencilMaskSeparate;
AttachShaderProc _glAttachShader;
BindAttribLocationProc _glBindAttribLocation;
CompileShaderProc _glCompileShader;
CreateProgramProc _glCreateProgram;
CreateShaderProc _glCreateShader;
DeleteProgramProc _glDeleteProgram;
DeleteShaderProc _glDeleteShader;
DetachShaderProc _glDetachShader;
DisableVertexAttribArrayProc _glDisableVertexAttribArray;
EnableVertexAttribArrayProc _glEnableVertexAttribArray;
GetActiveAttribProc _glGetActiveAttrib;
GetActiveUniformProc _glGetActiveUniform;
GetAttachedShadersProc _glGetAttachedShaders;
GetAttribLocationProc _glGetAttribLocation;
GetProgramivProc _glGetProgramiv;
GetProgramInfoLogProc _glGetProgramInfoLog;
GetShaderivProc _glGetShaderiv;
GetShaderInfoLogProc _glGetShaderInfoLog;
GetShaderSourceProc _glGetShaderSource;
GetUniformLocationProc _glGetUniformLocation;
GetUniformfvProc _glGetUniformfv;
GetUniformivProc _glGetUniformiv;
GetVertexAttribdvProc _glGetVertexAttribdv;
GetVertexAttribfvProc _glGetVertexAttribfv;
GetVertexAttribivProc _glGetVertexAttribiv;
GetVertexAttribPointervProc _glGetVertexAttribPointerv;
IsProgramProc _glIsProgram;
IsShaderProc _glIsShader;
LinkProgramProc _glLinkProgram;
ShaderSourceProc _glShaderSource;
UseProgramProc _glUseProgram;
Uniform1fProc _glUniform1f;
Uniform2fProc _glUniform2f;
Uniform3fProc _glUniform3f;
Uniform4fProc _glUniform4f;
Uniform1iProc _glUniform1i;
Uniform2iProc _glUniform2i;
Uniform3iProc _glUniform3i;
Uniform4iProc _glUniform4i;
Uniform1fvProc _glUniform1fv;
Uniform2fvProc _glUniform2fv;
Uniform3fvProc _glUniform3fv;
Uniform4fvProc _glUniform4fv;
Uniform1ivProc _glUniform1iv;
Uniform2ivProc _glUniform2iv;
Uniform3ivProc _glUniform3iv;
Uniform4ivProc _glUniform4iv;
UniformMatrix2fvProc _glUniformMatrix2fv;
UniformMatrix3fvProc _glUniformMatrix3fv;
UniformMatrix4fvProc _glUniformMatrix4fv;
ValidateProgramProc _glValidateProgram;
VertexAttrib1dProc _glVertexAttrib1d;
VertexAttrib1dvProc _glVertexAttrib1dv;
VertexAttrib1fProc _glVertexAttrib1f;
VertexAttrib1fvProc _glVertexAttrib1fv;
VertexAttrib1sProc _glVertexAttrib1s;
VertexAttrib1svProc _glVertexAttrib1sv;
VertexAttrib2dProc _glVertexAttrib2d;
VertexAttrib2dvProc _glVertexAttrib2dv;
VertexAttrib2fProc _glVertexAttrib2f;
VertexAttrib2fvProc _glVertexAttrib2fv;
VertexAttrib2sProc _glVertexAttrib2s;
VertexAttrib2svProc _glVertexAttrib2sv;
VertexAttrib3dProc _glVertexAttrib3d;
VertexAttrib3dvProc _glVertexAttrib3dv;
VertexAttrib3fProc _glVertexAttrib3f;
VertexAttrib3fvProc _glVertexAttrib3fv;
VertexAttrib3sProc _glVertexAttrib3s;
VertexAttrib3svProc _glVertexAttrib3sv;
VertexAttrib4NbvProc _glVertexAttrib4Nbv;
VertexAttrib4NivProc _glVertexAttrib4Niv;
VertexAttrib4NsvProc _glVertexAttrib4Nsv;
VertexAttrib4NubProc _glVertexAttrib4Nub;
VertexAttrib4NubvProc _glVertexAttrib4Nubv;
VertexAttrib4NuivProc _glVertexAttrib4Nuiv;
VertexAttrib4NusvProc _glVertexAttrib4Nusv;
VertexAttrib4bvProc _glVertexAttrib4bv;
VertexAttrib4dProc _glVertexAttrib4d;
VertexAttrib4dvProc _glVertexAttrib4dv;
VertexAttrib4fProc _glVertexAttrib4f;
VertexAttrib4fvProc _glVertexAttrib4fv;
VertexAttrib4ivProc _glVertexAttrib4iv;
VertexAttrib4sProc _glVertexAttrib4s;
VertexAttrib4svProc _glVertexAttrib4sv;
VertexAttrib4ubvProc _glVertexAttrib4ubv;
VertexAttrib4uivProc _glVertexAttrib4uiv;
VertexAttrib4usvProc _glVertexAttrib4usv;
VertexAttribPointerProc _glVertexAttribPointer;
GetInfoLogARBProc _glGetInfoLogARB;
GetObjectParameterivARBProc _glGetObjectParameterivARB;
DeleteObjectARBProc _glDeleteObjectARB;
GetHandleProc _glGetHandleARB;
// GL 2.1 // GL 2.1
void* _glUniformMatrix2x3fv; UniformMatrix2x3fvProc _glUniformMatrix2x3fv;
void* _glUniformMatrix3x2fv; UniformMatrix3x2fvProc _glUniformMatrix3x2fv;
void* _glUniformMatrix2x4fv; UniformMatrix2x4fvProc _glUniformMatrix2x4fv;
void* _glUniformMatrix4x2fv; UniformMatrix4x2fvProc _glUniformMatrix4x2fv;
void* _glUniformMatrix3x4fv; UniformMatrix3x4fvProc _glUniformMatrix3x4fv;
void* _glUniformMatrix4x3fv; UniformMatrix4x3fvProc _glUniformMatrix4x3fv;
// EXT_geometry_shader4 // EXT_geometry_shader4
void* _glProgramParameteri; ProgramParameteriProc _glProgramParameteri;
void* _glFramebufferTexture; FramebufferTextureProc _glFramebufferTexture;
void* _glFramebufferTextureLayer; FramebufferTextureLayerProc _glFramebufferTextureLayer;
void* _glFramebufferTextureFace; FramebufferTextureFaceProc _glFramebufferTextureFace;
// EXT_gpu_shader4 // EXT_gpu_shader4
void* _glGetUniformuiv; GetUniformuivProc _glGetUniformuiv;
void* _glBindFragDataLocation; BindFragDataLocationProc _glBindFragDataLocation;
void* _glGetFragDataLocation; GetFragDataLocationProc _glGetFragDataLocation;
void* _glUniform1ui; Uniform1uiProc _glUniform1ui;
void* _glUniform2ui; Uniform2uiProc _glUniform2ui;
void* _glUniform3ui; Uniform3uiProc _glUniform3ui;
void* _glUniform4ui; Uniform4uiProc _glUniform4ui;
void* _glUniform1uiv; Uniform1uivProc _glUniform1uiv;
void* _glUniform2uiv; Uniform2uivProc _glUniform2uiv;
void* _glUniform3uiv; Uniform3uivProc _glUniform3uiv;
void* _glUniform4uiv; Uniform4uivProc _glUniform4uiv;
}; };
} }

698
src/osg/GL2Extensions.cpp
View File

File diff suppressed because it is too large Load Diff