diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-04-27 18:04:50 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-04-27 18:04:50 +1000 |
| commit | 0cca90cea1dbe1a76dbf9ac1985c3676ec460b0a (patch) | |
| tree | 6e496a5d77d13a9f1679006c3c5334e0b8d889f4 /src/mesa/main/bufferobj.c | |
| parent | 7342688286cc3b7c938af2dfeac22df4fa8c8464 (diff) | |
| parent | a8e39b6f5a1fedf2f8719e1adb8802ebbfc09688 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/mesa/main/bufferobj.c')
| -rw-r--r-- | src/mesa/main/bufferobj.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c index e762eb3b63..dc0307feb5 100644 --- a/src/mesa/main/bufferobj.c +++ b/src/mesa/main/bufferobj.c @@ -551,8 +551,8 @@ _mesa_map_drawpix_pbo(GLcontext *ctx, * \sa _mesa_unmap_bitmap_pbo */ void -_mesa_unmap_drapix_pbo(GLcontext *ctx, - const struct gl_pixelstore_attrib *unpack) +_mesa_unmap_drawpix_pbo(GLcontext *ctx, + const struct gl_pixelstore_attrib *unpack) { if (unpack->BufferObj->Name) { ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT, |