diff options
| author | Alan Hourihane <[email protected]> | 2008-09-11 17:32:18 +0100 |
|---|---|---|
| committer | Alan Hourihane <[email protected]> | 2008-09-11 17:32:18 +0100 |
| commit | 47ad296a183929c2007c35c60d722b4ac680417d (patch) | |
| tree | 62bcc7af01606d32d7f137ccf8f342c9b0a6774a /src/mesa/main/bufferobj.h | |
| parent | b6458225039ef4cf5c91080e7547ed73fb264c46 (diff) | |
| parent | 4d42c5bebf8740ebfc15571d24b6c92f79e09263 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into gallium-0.2
Conflicts:
src/mesa/drivers/dri/i915/intel_ioctl.c
src/mesa/main/texstore.c
src/mesa/tnl/t_vp_build.c
src/mesa/vbo/vbo_exec_draw.c
Diffstat (limited to 'src/mesa/main/bufferobj.h')
| -rw-r--r-- | src/mesa/main/bufferobj.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h index 537b2404740..3c08f0083cf 100644 --- a/src/mesa/main/bufferobj.h +++ b/src/mesa/main/bufferobj.h @@ -1,6 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 7.1 + * Version: 7.2 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * @@ -55,10 +55,9 @@ _mesa_initialize_buffer_object( struct gl_buffer_object *obj, GLuint name, GLenum target ); extern void -_mesa_save_buffer_object( GLcontext *ctx, struct gl_buffer_object *obj ); - -extern void -_mesa_remove_buffer_object( GLcontext *ctx, struct gl_buffer_object *bufObj ); +_mesa_reference_buffer_object(GLcontext *ctx, + struct gl_buffer_object **ptr, + struct gl_buffer_object *bufObj); extern void _mesa_buffer_data( GLcontext *ctx, GLenum target, GLsizeiptrARB size, @@ -117,8 +116,6 @@ _mesa_unmap_readpix_pbo(GLcontext *ctx, const struct gl_pixelstore_attrib *pack); -extern void -_mesa_unbind_buffer_object( GLcontext *ctx, struct gl_buffer_object *bufObj ); /* * API functions |