diff options
| author | Brian <brian.paul@tungstengraphics.com> | 2008-03-21 14:20:07 -0600 |
|---|---|---|
| committer | Brian <brian.paul@tungstengraphics.com> | 2008-03-21 14:20:07 -0600 |
| commit | a39091bc5b68e4d4f5302f1d3f1a138798f54b77 (patch) | |
| tree | 8b83b941634753a0b41d27716ae27bd961ad4343 /src/mesa/swrast/s_bitmap.c | |
| parent | f1626f0bfd2b14ad8ca2afaad2ea8afb539e6491 (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/swrast/s_bitmap.c')
| -rw-r--r-- | src/mesa/swrast/s_bitmap.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mesa/swrast/s_bitmap.c b/src/mesa/swrast/s_bitmap.c index 17f639fd55..f3dda12e25 100644 --- a/src/mesa/swrast/s_bitmap.c +++ b/src/mesa/swrast/s_bitmap.c @@ -57,11 +57,9 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py, ASSERT(ctx->RenderMode == GL_RENDER); - bitmap = _mesa_validate_and_map_bitmap_pbo(ctx, width, height, - unpack, bitmap); - if (!bitmap) { - return NULL; - } + bitmap = _mesa_map_bitmap_pbo(ctx, unpack, bitmap); + if (!bitmap) + return; RENDER_START(swrast,ctx); |