glx: move driver_configs to base glx_screen

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619>

src/glx/dri2_glx.c

@@ -426,7 +426,6 @@ dri2DestroyScreen(struct glx_screen *base)
 
    /* Free the direct rendering per screen data */
    driDestroyScreen(psc->base.frontend_screen);
-   driDestroyConfigs(psc->driver_configs);
    close(psc->fd);
    free(psc);
 }
@@ -727,7 +726,7 @@ dri2CreateScreen(int screen, struct glx_display * priv, bool driver_name_is_infe
    glx_config_destroy_list(psc->base.visuals);
    psc->base.visuals = visuals;
 
-   psc->driver_configs = driver_configs;
+   psc->base.driver_configs = driver_configs;
 
    psc->base.vtable = &dri_screen_vtable;
    psc->base.context_vtable = &dri2_context_vtable;

src/glx/dri3_glx.c

@@ -431,7 +431,6 @@ dri3_destroy_screen(struct glx_screen *base)
       close(psc->fd_display_gpu);
    loader_dri3_close_screen(psc->driScreenRenderGPU);
    driDestroyScreen(psc->driScreenRenderGPU);
-   driDestroyConfigs(psc->driver_configs);
    close(psc->fd_render_gpu);
    free(psc);
 }
@@ -589,7 +588,7 @@ dri3_create_screen(int screen, struct glx_display * priv, bool driver_name_is_in
    glx_config_destroy_list(psc->base.visuals);
    psc->base.visuals = visuals;
 
-   psc->driver_configs = driver_configs;
+   psc->base.driver_configs = driver_configs;
 
    psc->base.vtable = &dri_screen_vtable;
    psc->base.context_vtable = &dri3_context_vtable;

src/glx/dri3_priv.h

@@ -79,8 +79,6 @@ struct dri3_screen {
    __DRIscreen *driScreenDisplayGPU;
    __DRIscreen *driScreenRenderGPU;
 
-   const __DRIconfig **driver_configs;
-
    /* fd of the GPU used for rendering. */
    int fd_render_gpu;
    /* fd of the GPU used for display. If the same GPU is used for display

src/glx/drisw_glx.c

@@ -570,7 +570,6 @@ driswDestroyScreen(struct glx_screen *base)
 
    /* Free the direct rendering per screen data */
    driDestroyScreen(psc->base.frontend_screen);
-   driDestroyConfigs(psc->driver_configs);
    free(psc);
 }
 
@@ -686,7 +685,7 @@ driswCreateScreen(int screen, struct glx_display *priv, enum glx_driver glx_driv
    glx_config_destroy_list(psc->base.visuals);
    psc->base.visuals = visuals;
 
-   psc->driver_configs = driver_configs;
+   psc->base.driver_configs = driver_configs;
 
    psc->base.vtable = &dri_screen_vtable;
    psc->base.context_vtable = &drisw_context_vtable;

src/glx/drisw_priv.h

@@ -39,8 +39,6 @@ struct drisw_screen
 
    __GLXDRIscreen vtable;
 
-   const __DRIconfig **driver_configs;
-
    bool kopper;
 };
 

src/glx/glxclient.h

@@ -525,6 +525,7 @@ struct glx_screen
      */
    __GLXDRIscreen *driScreen;
    __DRIscreen *frontend_screen;
+   const __DRIconfig **driver_configs;
 #endif
 
     /**

src/glx/glxext.c

@@ -743,6 +743,9 @@ glx_screen_cleanup(struct glx_screen *psc)
       glx_config_destroy_list(psc->visuals);
       psc->visuals = NULL;   /* NOTE: just for paranoia */
    }
+#if defined(GLX_DIRECT_RENDERING) && (!defined(GLX_USE_APPLEGL) || defined(GLX_USE_APPLE))
+   driDestroyConfigs(psc->driver_configs);
+#endif
    free((char *) psc->serverGLXexts);
    free((char *) psc->serverGLXvendor);
    free((char *) psc->serverGLXversion);