diff options
| author | marha <marha@users.sourceforge.net> | 2013-03-06 08:39:27 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-03-06 08:39:27 +0100 |
| commit | b5acb643ab1a86b31409900a7c03281fcc48c8e3 (patch) | |
| tree | 85db12bb6d437f616b2f91d547426d0e2d3173e6 /mesalib/src/glsl/standalone_scaffolding.cpp | |
| parent | 6ddd685990187ec5f5996a16951a3d780c820272 (diff) | |
| parent | 84798668341b15890d625e3bffbbc2d19f434568 (diff) | |
| download | vcxsrv-b5acb643ab1a86b31409900a7c03281fcc48c8e3.tar.gz vcxsrv-b5acb643ab1a86b31409900a7c03281fcc48c8e3.tar.bz2 vcxsrv-b5acb643ab1a86b31409900a7c03281fcc48c8e3.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libfontenc mesa xserver git update 6 Mar 2013
Diffstat (limited to 'mesalib/src/glsl/standalone_scaffolding.cpp')
| -rw-r--r-- | mesalib/src/glsl/standalone_scaffolding.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/glsl/standalone_scaffolding.cpp b/mesalib/src/glsl/standalone_scaffolding.cpp index 8c0091e84..b5ef768bd 100644 --- a/mesalib/src/glsl/standalone_scaffolding.cpp +++ b/mesalib/src/glsl/standalone_scaffolding.cpp @@ -60,7 +60,7 @@ _mesa_reference_shader(struct gl_context *ctx, struct gl_shader **ptr, } void -_mesa_shader_debug(struct gl_context *, GLenum, GLuint, +_mesa_shader_debug(struct gl_context *, GLenum, GLuint *id, const char *, int) { } |