Mesa (master): glx/dri: explicitly assign struct components for glx_*_vtable

Emil Velikov evelikov at kemper.freedesktop.org
Mon Apr 28 18:12:56 UTC 2014


Module: Mesa
Branch: master
Commit: 76ae25d7e8de02cf05d2aa848028864fd2737058
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=76ae25d7e8de02cf05d2aa848028864fd2737058

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Tue Feb 18 19:05:57 2014 +0000

glx/dri: explicitly assign struct components for glx_*_vtable

... to improve readability of code.

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kristian Høgsberg <krh at bitplanet.net>

---

 src/glx/dri_glx.c |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/glx/dri_glx.c b/src/glx/dri_glx.c
index 3b7502d..04a0847 100644
--- a/src/glx/dri_glx.c
+++ b/src/glx/dri_glx.c
@@ -90,8 +90,6 @@ struct dri_drawable
    __DRIdrawable *driDrawable;
 };
 
-static const struct glx_context_vtable dri_context_vtable;
-
 /*
  * Given a display pointer and screen number, determine the name of
  * the DRI driver for the screen (i.e., "i965", "radeon", "nouveau", etc).
@@ -569,15 +567,15 @@ dri_unbind_context(struct glx_context *context, struct glx_context *new)
 }
 
 static const struct glx_context_vtable dri_context_vtable = {
-   dri_destroy_context,
-   dri_bind_context,
-   dri_unbind_context,
-   NULL,
-   NULL,
-   DRI_glXUseXFont,
-   NULL,
-   NULL,
-   NULL, /* get_proc_address */
+   .destroy             = dri_destroy_context,
+   .bind                = dri_bind_context,
+   .unbind              = dri_unbind_context,
+   .wait_gl             = NULL,
+   .wait_x              = NULL,
+   .use_x_font          = DRI_glXUseXFont,
+   .bind_tex_image      = NULL,
+   .release_tex_image   = NULL,
+   .get_proc_address    = NULL,
 };
 
 static struct glx_context *
@@ -808,8 +806,10 @@ driBindExtensions(struct dri_screen *psc, const __DRIextension **extensions)
 }
 
 static const struct glx_screen_vtable dri_screen_vtable = {
-   dri_create_context,
-   NULL
+   .create_context         = dri_create_context,
+   .create_context_attribs = NULL,
+   .query_renderer_integer = NULL,
+   .query_renderer_string  = NULL,
 };
 
 static struct glx_screen *




More information about the mesa-commit mailing list