From: Emil Velikov <emil.velikov@collabora.com>
Date: Fri, 30 Sep 2016 12:45:55 +0000 (+0100)
Subject: egl: remove explicit config_id management from dri2_add_config()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3652d1d5942a857f225700d67ce2c900396982f2;p=mesa.git

egl: remove explicit config_id management from dri2_add_config()

Currently we only saved the id to memcpy the whole _EGLConfig to write
back the exact same id value.

Remove the unneeded and confusing/misleading code.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
---

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index d9e2ad701b7..403f3d3b729 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -166,7 +166,6 @@ dri2_add_config(_EGLDisplay *disp, const __DRIconfig *dri_config, int id,
    unsigned int dri_masks[4] = { 0, 0, 0, 0 };
    _EGLConfig *matching_config;
    EGLint num_configs = 0;
-   EGLint config_id;
    int i;
 
    _eglInitConfig(&base, disp, id);
@@ -286,7 +285,6 @@ dri2_add_config(_EGLDisplay *disp, const __DRIconfig *dri_config, int id,
       return NULL;
    }
 
-   config_id = base.ConfigID;
    base.ConfigID    = EGL_DONT_CARE;
    base.SurfaceType = EGL_DONT_CARE;
    num_configs = _eglFilterArray(disp->Configs, (void **) &matching_config, 1,
@@ -315,7 +313,6 @@ dri2_add_config(_EGLDisplay *disp, const __DRIconfig *dri_config, int id,
 
       memcpy(&conf->base, &base, sizeof base);
       conf->base.SurfaceType = 0;
-      conf->base.ConfigID = config_id;
 
       _eglLinkConfig(&conf->base);
    }