From c624241ef47c3a6ea2d1177969328bd4547e45a2 Mon Sep 17 00:00:00 2001 From: Nanley Chery Date: Fri, 5 Feb 2016 16:25:28 -0800 Subject: [PATCH] mesa/readpix: Dedent former _mesa_readpixels() if block Formatting patch split out for easy reviewing. Signed-off-by: Nanley Chery Reviewed-by: Ian Romanick Reviewed-by: Brian Paul --- src/mesa/main/readpix.c | 58 ++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c index 56e9d60bb11..470182ab23d 100644 --- a/src/mesa/main/readpix.c +++ b/src/mesa/main/readpix.c @@ -861,38 +861,38 @@ _mesa_readpixels(struct gl_context *ctx, if (ctx->NewState) _mesa_update_state(ctx); - pixels = _mesa_map_pbo_dest(ctx, packing, pixels); - - if (pixels) { - /* Try memcpy first. */ - if (readpixels_memcpy(ctx, x, y, width, height, format, type, - pixels, packing)) { - _mesa_unmap_pbo_dest(ctx, packing); - return; - } - - /* Otherwise take the slow path. */ - switch (format) { - case GL_STENCIL_INDEX: - read_stencil_pixels(ctx, x, y, width, height, type, pixels, - packing); - break; - case GL_DEPTH_COMPONENT: - read_depth_pixels(ctx, x, y, width, height, type, pixels, - packing); - break; - case GL_DEPTH_STENCIL_EXT: - read_depth_stencil_pixels(ctx, x, y, width, height, type, pixels, - packing); - break; - default: - /* all other formats should be color formats */ - read_rgba_pixels(ctx, x, y, width, height, format, type, pixels, - packing); - } + pixels = _mesa_map_pbo_dest(ctx, packing, pixels); + if (pixels) { + /* Try memcpy first. */ + if (readpixels_memcpy(ctx, x, y, width, height, format, type, + pixels, packing)) { _mesa_unmap_pbo_dest(ctx, packing); + return; + } + + /* Otherwise take the slow path. */ + switch (format) { + case GL_STENCIL_INDEX: + read_stencil_pixels(ctx, x, y, width, height, type, pixels, + packing); + break; + case GL_DEPTH_COMPONENT: + read_depth_pixels(ctx, x, y, width, height, type, pixels, + packing); + break; + case GL_DEPTH_STENCIL_EXT: + read_depth_stencil_pixels(ctx, x, y, width, height, type, pixels, + packing); + break; + default: + /* all other formats should be color formats */ + read_rgba_pixels(ctx, x, y, width, height, format, type, pixels, + packing); } + + _mesa_unmap_pbo_dest(ctx, packing); + } } -- 2.30.2