From b3b61211157ab934f1898d3519e7288c1fd89d80 Mon Sep 17 00:00:00 2001 From: Plamena Manolova Date: Wed, 14 Jun 2017 19:33:12 +0300 Subject: [PATCH] mesa/main: Move NULL pointer check. In blit_framebuffer we're already doing a NULL pointer check for readFb and drawFb so it makes sense to do it before we actually use the pointers. CID: 1412569 Signed-off-by: Plamena Manolova Reviewed-by: Rafael Antognolli --- src/mesa/main/blit.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mesa/main/blit.c b/src/mesa/main/blit.c index bb866b1e090..8bb3ba328a3 100644 --- a/src/mesa/main/blit.c +++ b/src/mesa/main/blit.c @@ -349,12 +349,6 @@ blit_framebuffer(struct gl_context *ctx, { FLUSH_VERTICES(ctx, 0); - /* Update completeness status of readFb and drawFb. */ - _mesa_update_framebuffer(ctx, readFb, drawFb); - - /* Make sure drawFb has an initialized bounding box. */ - _mesa_update_draw_buffer_bounds(ctx, drawFb); - if (!readFb || !drawFb) { /* This will normally never happen but someday we may want to * support MakeCurrent() with no drawables. @@ -362,6 +356,12 @@ blit_framebuffer(struct gl_context *ctx, return; } + /* Update completeness status of readFb and drawFb. */ + _mesa_update_framebuffer(ctx, readFb, drawFb); + + /* Make sure drawFb has an initialized bounding box. */ + _mesa_update_draw_buffer_bounds(ctx, drawFb); + if (!no_error) { const GLbitfield legalMaskBits = (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | -- 2.30.2