Fixed warnings
This commit is contained in:
@@ -78,6 +78,13 @@ inline void* getGLExtensionFuncPtr(const char *funcName,const char *fallbackFunc
|
||||
return getGLExtensionFuncPtr(fallbackFuncName);
|
||||
}
|
||||
|
||||
template<typename T, typename R>
|
||||
T convertPointerType(R src)
|
||||
{
|
||||
T dest;
|
||||
memcpy(&dest, &src, sizeof(src));
|
||||
return dest;
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
bool setGLExtensionFuncPtr(T& t, const char* str1)
|
||||
|
||||
@@ -267,11 +267,17 @@ class OSG_EXPORT VertexProgram : public StateAttribute
|
||||
|
||||
bool _isVertexProgramSupported;
|
||||
|
||||
void* _glBindProgram;
|
||||
void* _glGenPrograms;
|
||||
void *_glDeletePrograms;
|
||||
void* _glProgramString;
|
||||
void* _glProgramLocalParameter4fv;
|
||||
typedef void (APIENTRY * BindProgramProc) (GLenum target, GLuint id);
|
||||
typedef void (APIENTRY * GenProgramsProc) (GLsizei n, GLuint *programs);
|
||||
typedef void (APIENTRY * DeleteProgramsProc) (GLsizei n, GLuint *programs);
|
||||
typedef void (APIENTRY * ProgramStringProc) (GLenum target, GLenum format, GLsizei len, const void *string);
|
||||
typedef void (APIENTRY * ProgramLocalParameter4fvProc) (GLenum target, GLuint index, const GLfloat *params);
|
||||
|
||||
BindProgramProc _glBindProgram;
|
||||
GenProgramsProc _glGenPrograms;
|
||||
DeleteProgramsProc _glDeletePrograms;
|
||||
ProgramStringProc _glProgramString;
|
||||
ProgramLocalParameter4fvProc _glProgramLocalParameter4fv;
|
||||
|
||||
};
|
||||
|
||||
|
||||
@@ -152,7 +152,7 @@ namespace osgAnimation
|
||||
enum State
|
||||
{
|
||||
Play,
|
||||
Stop,
|
||||
Stop
|
||||
};
|
||||
|
||||
State _state;
|
||||
@@ -168,7 +168,7 @@ namespace osgAnimation
|
||||
enum State
|
||||
{
|
||||
Play,
|
||||
Stop,
|
||||
Stop
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ struct GeometryHints
|
||||
{
|
||||
RESIZE_HEIGHT_TO_MAINTAINCE_ASPECT_RATIO,
|
||||
RESIZE_WIDTH_TO_MAINTAINCE_ASPECT_RATIO,
|
||||
IGNORE_DOCUMENT_ASPECT_RATIO,
|
||||
IGNORE_DOCUMENT_ASPECT_RATIO
|
||||
};
|
||||
|
||||
GeometryHints():
|
||||
|
||||
Reference in New Issue
Block a user