TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 01:07:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

merge from panda3d_1_8_branch: work around conflicting declarations of glShaderSource

Browse Source
This commit is contained in:
rdb 2013-08-13 20:35:07 +00:00
parent 6cf523c4de
commit 6113979792
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/glstuff/glGraphicsStateGuardian_src.cxx
View File

@ -1042,7 +1042,7 @@ reset() {
get_extension_func(GLPREFIX_QUOTED, "GetUniformLocation");
_glLinkProgram = (PFNGLLINKPROGRAMPROC)
get_extension_func(GLPREFIX_QUOTED, "LinkProgram");
_glShaderSource = (PFNGLSHADERSOURCEPROC)
_glShaderSource = (PFNGLSHADERSOURCEPROC_P)
get_extension_func(GLPREFIX_QUOTED, "ShaderSource");
_glUseProgram = (PFNGLUSEPROGRAMPROC)
get_extension_func(GLPREFIX_QUOTED, "UseProgram");

4
panda/src/glstuff/glGraphicsStateGuardian_src.h
View File

@ -153,7 +153,7 @@ typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLin
typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar **string, const GLint *length);
typedef void (APIENTRYP PFNGLSHADERSOURCEPROC_P) (GLuint shader, GLsizei count, const GLchar* const *string, const GLint *length);
typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
@ -664,7 +664,7 @@ public:
PFNGLGETSHADERINFOLOGPROC _glGetShaderInfoLog;
PFNGLGETUNIFORMLOCATIONPROC _glGetUniformLocation;
PFNGLLINKPROGRAMPROC _glLinkProgram;
PFNGLSHADERSOURCEPROC _glShaderSource;
PFNGLSHADERSOURCEPROC_P _glShaderSource;
PFNGLUSEPROGRAMPROC _glUseProgram;
PFNGLUNIFORM4FPROC _glUniform4f;
PFNGLUNIFORM1IPROC _glUniform1i;