[Mesa-dev] [PATCH 19/38] glx/drisw: use the implemented version of __DRIswrastLoaderExtension

Emil Velikov emil.l.velikov at gmail.com
Wed Feb 12 17:17:45 PST 2014


... over the one provided by the headers.
Explicitly set extension members to improve clarity.

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 include/GL/internal/dri_interface.h |  3 +++
 src/glx/drisw_glx.c                 | 11 ++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
index 5b333a1..25765ba 100644
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
@@ -470,6 +470,9 @@ struct __DRIswrastLoaderExtensionRec {
 
     /**
      * Put image to drawable
+     *
+     * \since 2
+     *
      */
     void (*putImage2)(__DRIdrawable *drawable, int op,
                       int x, int y, int width, int height, int stride,
diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
index 13a4b96..33d347a 100644
--- a/src/glx/drisw_glx.c
+++ b/src/glx/drisw_glx.c
@@ -240,11 +240,12 @@ swrastGetImage(__DRIdrawable * read,
 }
 
 static const __DRIswrastLoaderExtension swrastLoaderExtension = {
-   {__DRI_SWRAST_LOADER, __DRI_SWRAST_LOADER_VERSION},
-   swrastGetDrawableInfo,
-   swrastPutImage,
-   swrastGetImage,
-   swrastPutImage2,
+   .base = {__DRI_SWRAST_LOADER, 2 },
+
+   .getDrawableInfo     = swrastGetDrawableInfo,
+   .putImage            = swrastPutImage,
+   .getImage            = swrastGetImage,
+   .putImage2           = swrastPutImage2,
 };
 
 static const __DRIextension *loader_extensions[] = {
-- 
1.8.5.4



More information about the mesa-dev mailing list