aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/dd.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-10-19 11:18:56 +0200
committermarha <marha@users.sourceforge.net>2014-10-19 11:18:56 +0200
commit9fc852414dd4e841c4e2229f55a3e41abca64ac5 (patch)
treea524a96442c2a28243826f91f43680f4bcf012d3 /mesalib/src/mesa/main/dd.h
parent8d44af7cf8bdc4f42223dfef737ebf4e8c7fe55e (diff)
parentfa5a6df66cfe9b19014ea9d2fca35b762f457041 (diff)
downloadvcxsrv-9fc852414dd4e841c4e2229f55a3e41abca64ac5.tar.gz
vcxsrv-9fc852414dd4e841c4e2229f55a3e41abca64ac5.tar.bz2
vcxsrv-9fc852414dd4e841c4e2229f55a3e41abca64ac5.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/src/mesa/main/bufferobj.c
Diffstat (limited to 'mesalib/src/mesa/main/dd.h')
-rw-r--r--mesalib/src/mesa/main/dd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/dd.h b/mesalib/src/mesa/main/dd.h
index c130b14a5..c07e83ad9 100644
--- a/mesalib/src/mesa/main/dd.h
+++ b/mesalib/src/mesa/main/dd.h
@@ -602,7 +602,7 @@ struct dd_function_table {
*/
/*@{*/
struct gl_buffer_object * (*NewBufferObject)(struct gl_context *ctx,
- GLuint buffer, GLenum target);
+ GLuint buffer);
void (*DeleteBuffer)( struct gl_context *ctx, struct gl_buffer_object *obj );