From: Emil Velikov <emil.velikov@collabora.com>
Date: Tue, 16 Aug 2016 12:24:48 +0000 (+0100)
Subject: egl/dri2: drop NULL checks prior to dri2_destroy_surface
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=07690a289a60f9b12cde59affefeed9e05864dd7;p=mesa.git

egl/dri2: drop NULL checks prior to dri2_destroy_surface

The function already have the respective check within.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
---

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index cc10e604bbd..7fd05f99e3e 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -1291,10 +1291,8 @@ dri2_make_current(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *dsurf,
    unbind = (cctx == NULL && ddraw == NULL && rdraw == NULL);
 
    if (unbind || dri2_dpy->core->bindContext(cctx, ddraw, rdraw)) {
-      if (old_dsurf)
-         dri2_destroy_surface(drv, disp, old_dsurf);
-      if (old_rsurf)
-         dri2_destroy_surface(drv, disp, old_rsurf);
+      dri2_destroy_surface(drv, disp, old_dsurf);
+      dri2_destroy_surface(drv, disp, old_rsurf);
 
       if (!unbind)
          dri2_dpy->ref_count++;