aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/drivers/dri/common
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-14 08:33:57 +0100
committermarha <marha@users.sourceforge.net>2013-11-14 08:33:57 +0100
commitcb9ef04f0bb4cc87787a113f61fcfa7c4818b29b (patch)
tree91ed73daada51bddd5652fd847f30b3593ecff04 /mesalib/src/mesa/drivers/dri/common
parent6d8fefe38077f4d532c256e79cfcaf2a46c5269d (diff)
parent8fbb807d1029b012d2f45cb0f3ea0c6a6ebded6d (diff)
downloadvcxsrv-cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b.tar.gz
vcxsrv-cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b.tar.bz2
vcxsrv-cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b.zip
Merge remote-tracking branch 'origin/released'
* origin/released: mesa xserver pixman git update 9 nov 2013 Conflicts: mesalib/src/mesa/drivers/dri/common/dri_util.c xorg-server/Xext/shm.c
Diffstat (limited to 'mesalib/src/mesa/drivers/dri/common')
-rw-r--r--mesalib/src/mesa/drivers/dri/common/dri_util.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/mesalib/src/mesa/drivers/dri/common/dri_util.c b/mesalib/src/mesa/drivers/dri/common/dri_util.c
index 75dc645ff..6ca75f41d 100644
--- a/mesalib/src/mesa/drivers/dri/common/dri_util.c
+++ b/mesalib/src/mesa/drivers/dri/common/dri_util.c
@@ -872,7 +872,6 @@ const __DRIimageDriverExtension driImageDriverExtension = {
/*.createNewScreen2 =*/ driCreateNewScreen2,
/*.createNewDrawable =*/ driCreateNewDrawable,
- /*.createNewContext =*/ driCreateNewContext,
/*.createContextAttribs =*/ driCreateContextAttribs,
/*.getAPIMask =*/ driGetAPIMask,
};