diff options
| author | michal <michal@michal-laptop.(none)> | 2007-07-27 10:05:40 +0200 |
|---|---|---|
| committer | michal <michal@michal-laptop.(none)> | 2007-07-27 10:05:40 +0200 |
| commit | e0a26b046764ae80748b347395ab1b27de83651e (patch) | |
| tree | ea702756a3e9cedc3b3c41241cbff0956ddc82bc /src/mesa/main/shaders.c | |
| parent | 0360b49afbcd839f99ba0745d01cf9dc5be4d122 (diff) | |
| parent | e3cef5887540016a6d198598cb50bebe09e3f4cf (diff) | |
Merge branch 'master' of git+ssh://[email protected]/git/mesa/mesa into softpipe_0_1_branch
Diffstat (limited to 'src/mesa/main/shaders.c')
| -rw-r--r-- | src/mesa/main/shaders.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/shaders.c b/src/mesa/main/shaders.c index 58be1f46e57..7bf88087670 100644 --- a/src/mesa/main/shaders.c +++ b/src/mesa/main/shaders.c @@ -83,7 +83,7 @@ _mesa_CreateShader(GLenum type) } -GLhandleARB APIENTRY +GLhandleARB GLAPIENTRY _mesa_CreateShaderObjectARB(GLenum type) { GET_CURRENT_CONTEXT(ctx); @@ -99,7 +99,7 @@ _mesa_CreateProgram(void) } -GLhandleARB APIENTRY +GLhandleARB GLAPIENTRY _mesa_CreateProgramObjectARB(void) { GET_CURRENT_CONTEXT(ctx); @@ -319,7 +319,7 @@ _mesa_GetUniformivARB(GLhandleARB program, GLint location, GLint * params) #if 0 -GLint APIENTRY +GLint GLAPIENTRY _mesa_GetUniformLocation(GLuint program, const GLcharARB *name) { GET_CURRENT_CONTEXT(ctx); @@ -336,7 +336,7 @@ _mesa_GetHandleARB(GLenum pname) } -GLint APIENTRY +GLint GLAPIENTRY _mesa_GetUniformLocationARB(GLhandleARB programObj, const GLcharARB *name) { GET_CURRENT_CONTEXT(ctx); |