summaryrefslogtreecommitdiff
path: root/src/mesa/swrast/s_readpix.c
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2008-03-21 14:19:28 -0600
committerBrian <brian.paul@tungstengraphics.com>2008-03-21 14:19:28 -0600
commitd933be6baf98624c609d422a9b083a08f67e8bdb (patch)
treed262e8c7962f6105f44bb6f6b5cb4e05f412bd9e /src/mesa/swrast/s_readpix.c
parent3c9862d337244e305dc39bdd0a48e254c9766ec8 (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/swrast/s_readpix.c')
-rw-r--r--src/mesa/swrast/s_readpix.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c
index 050506b0d0..9140d12ea0 100644
--- a/src/mesa/swrast/s_readpix.c
+++ b/src/mesa/swrast/s_readpix.c
@@ -574,11 +574,9 @@ _swrast_ReadPixels( GLcontext *ctx,
return;
}
- pixels = _mesa_validate_and_map_readpix_pbo(ctx, x, y, width, height,
- format, type,
- &clippedPacking, pixels);
- if (!pixels)
- return;
+ pixels = _mesa_map_readpix_pbo(ctx, &clippedPacking, pixels);
+ if (!pixels)
+ return;
switch (format) {
case GL_COLOR_INDEX: