diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2010-04-04 23:07:30 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-04-04 23:07:30 -0700 |
| commit | ee30e24f5f9cc2ec6c5a3edbe498e5e0334f788b (patch) | |
| tree | 5d340ccb1c1e2e587b43c5ba46375025cd6dcd6e | |
| parent | bba6957da3a8832f8514f1bc4e26b36ed89a6172 (diff) | |
| parent | 42ea25cb4ecae09b5cc011a95d42ba7f0645dde3 (diff) | |
Merge branch '7.8'
| -rw-r--r-- | src/glx/dri2.c | 2 | ||||
| -rw-r--r-- | src/glx/glxext.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/glx/dri2.c b/src/glx/dri2.c index 9ca9b3eb06..80c125e741 100644 --- 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 b5657baf2e..5289354a52 100644 --- 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; |