summaryrefslogtreecommitdiffstats
path: root/src/glx
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2010-04-04 23:07:30 -0700
committerIan Romanick <ian.d.romanick@intel.com>2010-04-04 23:07:30 -0700
commitee30e24f5f9cc2ec6c5a3edbe498e5e0334f788b (patch)
tree5d340ccb1c1e2e587b43c5ba46375025cd6dcd6e /src/glx
parentbba6957da3a8832f8514f1bc4e26b36ed89a6172 (diff)
parent42ea25cb4ecae09b5cc011a95d42ba7f0645dde3 (diff)
downloadexternal_mesa3d-ee30e24f5f9cc2ec6c5a3edbe498e5e0334f788b.zip
external_mesa3d-ee30e24f5f9cc2ec6c5a3edbe498e5e0334f788b.tar.gz
external_mesa3d-ee30e24f5f9cc2ec6c5a3edbe498e5e0334f788b.tar.bz2
Merge branch '7.8'
Diffstat (limited to 'src/glx')
-rw-r--r--src/glx/dri2.c2
-rw-r--r--src/glx/glxext.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/glx/dri2.c b/src/glx/dri2.c
index 9ca9b3e..80c125e 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 b5657ba..5289354 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;