From: Varad Gautam <varadgautam@gmail.com>
Date: Wed, 7 Oct 2015 04:18:15 +0000 (+0530)
Subject: egl: move memcpy to bring conf->base operations together
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=deb1765ec626b6177f1bf7b2a24f10ed79cf6243;p=mesa.git

egl: move memcpy to bring conf->base operations together

Signed-off-by: Varad Gautam <varadgautam@gmail.com>
Suggested-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
---

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index aff21814be5..f600d1b606d 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -301,7 +301,6 @@ dri2_add_config(_EGLDisplay *disp, const __DRIconfig *dri_config, int id,
       if (conf == NULL)
          return NULL;
 
-      memcpy(&conf->base, &base, sizeof base);
       if (double_buffer) {
          if (srgb)
             conf->dri_srgb_double_config = dri_config;
@@ -314,6 +313,7 @@ dri2_add_config(_EGLDisplay *disp, const __DRIconfig *dri_config, int id,
             conf->dri_single_config = dri_config;
       }
 
+      memcpy(&conf->base, &base, sizeof base);
       conf->base.SurfaceType = 0;
       conf->base.ConfigID = config_id;