Drop createDrawable and destroyDrawable fron DRIinterfaceMethods.

All the DRI driver did was call the createDrawable callback immediately
upon entry to DRIscreen::createNewDrawable to get the drm_drawable_t.
We can just call that before calling into the DRI driver and pass the
returned drm_drawable_t as an argument to the DRI entry point.

Likewise for destroyDrawable.

Also, DRIdrawablePrivate::draw isn't used anywhere, and since the
driver no longer needs the XID of the drawable we can now drop that.

1 files changed, 3 insertions, 13 deletions

diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
index 8a6984de68a..0f90f49507a 100644
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
@@ -195,21 +195,10 @@ struct __DRIinterfaceMethodsRec {
     GLboolean (* destroyContext)( __DRIscreen *screen, __DRIid context );
 
     /**
-     * Create the server-side portion of the drawable.
-     */
-    GLboolean (*createDrawable)( __DRIscreen *screen,
-        __DRIid drawable, drm_drawable_t * hHWDrawable );
-
-    /**
-     * Destroy the server-side portion of the drawable.
-     */
-    GLboolean (*destroyDrawable)( __DRIscreen *screen, __DRIid drawable );
-
-    /**
      * This function is used to get information about the position, size, and
      * clip rects of a drawable.
      */
-    GLboolean (* getDrawableInfo) ( __DRIscreen *screen, __DRIid drawable,
+    GLboolean (* getDrawableInfo) ( __DRIdrawable *drawable,
 	unsigned int * index, unsigned int * stamp,
         int * x, int * y, int * width, int * height,
         int * numClipRects, drm_clip_rect_t ** pClipRects,
@@ -303,7 +292,8 @@ struct __DRIscreenRec {
      */
     void *(*createNewDrawable)(__DRIscreen *screen,
 			       const __GLcontextModes *modes,
-			       __DRIid draw, __DRIdrawable *pdraw,
+			       __DRIdrawable *pdraw,
+			       drm_drawable_t hwDrawable,
 			       int renderType, const int *attrs);
 
     /**