commit 2f76dff65f83a28b335497ab216a8bb71e6c97a2
author Emil Velikov <emil.velikov@collabora.com> Sun Aug 27 11:20:26 2017 +0100
committer Emil Velikov <emil.l.velikov@gmail.com> Tue Aug 29 13:40:46 2017 +0100
tree cc981aa978a1b2d4eea2c9ca4fb50b1674acb04c
parent 0ac78dc92582a59d4319ebce019b4caa41fb432d

egl: simplify refcounting after screen creation

If the specific initialize was successfull, dri2_egl_display() will
return a non NULL pointer. Thus we can drop the check and flatten the
codeflow.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Acked-by: Daniel Stone <daniels@collabora.com>

src/egl/drivers/dri2/egl_dri2.c

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 83545ba..02c187e 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -905,17 +905,13 @@
       return EGL_FALSE;
    }
 
-   if (ret) {
-      dri2_dpy = dri2_egl_display(disp);
+   if (!ret)
+      return EGL_FALSE;
 
-      if (!dri2_dpy) {
-         return EGL_FALSE;
-      }
+   dri2_dpy = dri2_egl_display(disp);
+   dri2_dpy->ref_count++;
 
-      dri2_dpy->ref_count++;
-   }
-
-   return ret;
+   return EGL_TRUE;
 }
 
 /**