DRI2: Drop DriverAPI.UpdateBuffer.

__dri2ParseEvents() would determine the kind of event, but then call
UpdateBuffer() in either case, and UpdateBuffer() would then have to
figure that out again to dispatch to HandleBufferAttach() or
HandleDrawableConfig().  Pretty pointless.

2 files changed, 12 insertions, 6 deletions

diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index aa6c31ddb84..1f5d65265cf 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -363,7 +363,7 @@ __driParseEvents(__DRIcontextPrivate *pcp, __DRIdrawablePrivate *pdp)
        memcpy(pdp->pClipRects, last_dc->rects, rect_size);
 
        if (changed)
-	  (*psp->DriverAPI.UpdateBuffer)(pdp, (unsigned int *) last_dc);
+	  (*psp->DriverAPI.HandleDrawableConfig)(pdp, pcp, last_dc);
     }
 
     /* Front buffer attachments are special, they typically mean that
@@ -380,12 +380,12 @@ __driParseEvents(__DRIcontextPrivate *pcp, __DRIdrawablePrivate *pdp)
      * We only care about the last such event in the buffer; in fact,
      * older events will refer to invalid buffer objects.*/
     if (last_ba)
-       (*psp->DriverAPI.UpdateBuffer)(pdp, (unsigned int *) last_ba);
+       (*psp->DriverAPI.HandleBufferAttach)(pdp, pcp, last_ba);
 
     /* Like for buffer attachments, we only care about the most recent
      * drawable config. */
     if (last_dc)
-       (*psp->DriverAPI.UpdateBuffer)(pdp, (unsigned int *) last_dc);
+       (*psp->DriverAPI.HandleDrawableConfig)(pdp, pcp, last_dc);
 
     /* If there was a drawable config event in the buffer and it
      * changed the size of the window, all buffer auxillary buffer
@@ -411,7 +411,7 @@ __driParseEvents(__DRIcontextPrivate *pcp, __DRIdrawablePrivate *pdp)
        if (last_ba == ba)
 	  continue;
 
-       (*psp->DriverAPI.UpdateBuffer)(pdp, (unsigned int *) ba);
+       (*psp->DriverAPI.HandleBufferAttach)(pdp, pcp, ba);
     }
 
     pdp->dri2.tail = tail;
diff --git a/src/mesa/drivers/dri/common/dri_util.h b/src/mesa/drivers/dri/common/dri_util.h
index aaaf2427888..59c64e4adfe 100644
--- a/src/mesa/drivers/dri/common/dri_util.h
+++ b/src/mesa/drivers/dri/common/dri_util.h
@@ -209,8 +209,14 @@ struct __DriverAPIRec {
 			    int64_t *count);
 
     /* DRI2 Entry points */
-    void (*UpdateBuffer)(__DRIdrawablePrivate *dPriv,
-			 unsigned int *event);
+    void (*HandleDrawableConfig)(__DRIdrawablePrivate *dPriv,
+				__DRIcontextPrivate *pcp,
+				__DRIDrawableConfigEvent *event);
+
+    void (*HandleBufferAttach)(__DRIdrawablePrivate *dPriv,
+			       __DRIcontextPrivate *pcp,
+			       __DRIBufferAttachEvent *ba);
+
 };