diff options
| author | Brian <brian.paul@tungstengraphics.com> | 2008-03-21 14:19:28 -0600 |
|---|---|---|
| committer | Brian <brian.paul@tungstengraphics.com> | 2008-03-21 14:19:28 -0600 |
| commit | d933be6baf98624c609d422a9b083a08f67e8bdb (patch) | |
| tree | d262e8c7962f6105f44bb6f6b5cb4e05f412bd9e /src/mesa/main/bufferobj.h | |
| parent | 3c9862d337244e305dc39bdd0a48e254c9766ec8 (diff) | |
Refactor PBO validate/map code.
We always need to do PBO validation, so do that in core Mesa before calling driver routine.
Diffstat (limited to 'src/mesa/main/bufferobj.h')
| -rw-r--r-- | src/mesa/main/bufferobj.h | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h index 1b63e68433..8baa59d617 100644 --- a/src/mesa/main/bufferobj.h +++ b/src/mesa/main/bufferobj.h @@ -90,21 +90,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, @@ -112,12 +109,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, |