Merge branch '7.8'

diff --git a/src/glx/dri2.c b/src/glx/dri2.c
index 9ca9b3eb06559c2ab3f16d5a3c4376a5e08d1d7d..80c125e741852ac0aca5b943bf74c0488705ed52 100644 (file)
--- a/src/glx/dri2.c
+++ b/src/glx/dri2.c
@@ -111,7 +111,7 @@ DRI2WireToEvent(Display *dpy, XEvent *event, xEvent *wire)
         aevent->event_type = GLX_EXCHANGE_COMPLETE_INTEL;
         break;
       case DRI2_BLIT_COMPLETE:
-        aevent->event_type = GLX_BLIT_COMPLETE_INTEL;
+        aevent->event_type = GLX_COPY_COMPLETE_INTEL;
         break;
       case DRI2_FLIP_COMPLETE:
         aevent->event_type = GLX_FLIP_COMPLETE_INTEL;

diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index b5657baf2e849dfc17e71d739f8c434eff8a2ec6..5289354a521233673a20d12688770d5a9807b4cb 100644 (file)
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -206,7 +206,7 @@ __glXEventToWire(Display *dpy, XEvent *event, xEvent *wire)
       break;
    case GLX_EXCHANGE_COMPLETE_INTEL:
       break;
-   case GLX_BLIT_COMPLETE_INTEL:
+   case GLX_COPY_COMPLETE_INTEL:
       break;
    case GLX_FLIP_COMPLETE_INTEL:
       break;