summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorPlamena Manolova <plamena.manolova@intel.com>2017-06-14 19:33:12 +0300
committerRafael Antognolli <rafael.antognolli@intel.com>2017-06-20 13:57:20 -0700
commitb3b61211157ab934f1898d3519e7288c1fd89d80 (patch)
tree867b3bf0e634eb1f814097c25f0e4fdeabacc6bc /src/mesa
parent12f52942f863ca1ec37e3569a7305ec351eae6b1 (diff)
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 <plamena.manolova@intel.com> Reviewed-by: Rafael Antognolli <rafael.antognolli@intel.com>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/blit.c12
1 files 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 |