summaryrefslogtreecommitdiffstats
path: root/src/egl/drivers
diff options
context:
space:
mode:
authorEmil Velikov <emil.velikov@collabora.com>2016-08-16 13:24:48 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2016-10-14 12:17:18 +0100
commit07690a289a60f9b12cde59affefeed9e05864dd7 (patch)
treebbc907458d17aefcc61f67adc9741fff01f454f3 /src/egl/drivers
parent8cf83f9c08a929547062a8ba105a3a75531d72a4 (diff)
downloadexternal_mesa3d-07690a289a60f9b12cde59affefeed9e05864dd7.zip
external_mesa3d-07690a289a60f9b12cde59affefeed9e05864dd7.tar.gz
external_mesa3d-07690a289a60f9b12cde59affefeed9e05864dd7.tar.bz2
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>
Diffstat (limited to 'src/egl/drivers')
-rw-r--r--src/egl/drivers/dri2/egl_dri2.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index cc10e60..7fd05f9 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++;