summaryrefslogtreecommitdiff
path: root/src/mesa/main/bufferobj.h
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2008-03-21 14:20:07 -0600
committerBrian <brian.paul@tungstengraphics.com>2008-03-21 14:20:07 -0600
commita39091bc5b68e4d4f5302f1d3f1a138798f54b77 (patch)
tree8b83b941634753a0b41d27716ae27bd961ad4343 /src/mesa/main/bufferobj.h
parentf1626f0bfd2b14ad8ca2afaad2ea8afb539e6491 (diff)
Refactor PBO validate/map code.
We always need to do PBO validation, so do that in core Mesa before calling driv er routine. cherry-picked from Mesa/master.
Diffstat (limited to 'src/mesa/main/bufferobj.h')
-rw-r--r--src/mesa/main/bufferobj.h24
1 files changed, 9 insertions, 15 deletions
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index efb3b4711e..46525f08ae 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -87,21 +87,18 @@ _mesa_validate_pbo_access(GLuint dimensions,
GLenum format, GLenum type, const GLvoid *ptr);
extern const GLubyte *
-_mesa_validate_and_map_bitmap_pbo(GLcontext *ctx,
- GLsizei width, GLsizei height,
- const struct gl_pixelstore_attrib *unpack,
- const GLubyte *bitmap);
+_mesa_map_bitmap_pbo(GLcontext *ctx,
+ const struct gl_pixelstore_attrib *unpack,
+ const GLubyte *bitmap);
extern void
_mesa_unmap_bitmap_pbo(GLcontext *ctx,
const struct gl_pixelstore_attrib *unpack);
extern const GLvoid *
-_mesa_validate_and_map_drawpix_pbo(GLcontext *ctx,
- GLsizei width, GLsizei height,
- GLenum format, GLenum type,
- const struct gl_pixelstore_attrib *unpack,
- const GLvoid *pixels);
+_mesa_map_drawpix_pbo(GLcontext *ctx,
+ const struct gl_pixelstore_attrib *unpack,
+ const GLvoid *pixels);
extern void
_mesa_unmap_drapix_pbo(GLcontext *ctx,
@@ -109,12 +106,9 @@ _mesa_unmap_drapix_pbo(GLcontext *ctx,
extern void *
-_mesa_validate_and_map_readpix_pbo(GLcontext *ctx,
- GLint x, GLint y,
- GLsizei width, GLsizei height,
- GLenum format, GLenum type,
- const struct gl_pixelstore_attrib *pack,
- GLvoid *dest);
+_mesa_map_readpix_pbo(GLcontext *ctx,
+ const struct gl_pixelstore_attrib *pack,
+ GLvoid *dest);
extern void
_mesa_unmap_readpix_pbo(GLcontext *ctx,