From e0489531455623aa21aa565b2c890362d8437f23 Mon Sep 17 00:00:00 2001 From: Kristian Høgsberg Date: Mon, 11 Nov 2013 16:35:35 -0800 Subject: dri: Remove redundant createNewContext function from __DRIimageDriverExtension MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit createContextAttribs is a superset of what createNewContext provides. Also remove the function typedef, since createNewContext is deprecated and no longer used in multiple interfaces. Signed-off-by: Kristian Høgsberg Reviewed-by: Eric Anholt Cc: "10.0" --- include/GL/internal/dri_interface.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'include/GL') diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h index ed432576400..b012570ae13 100644 --- a/include/GL/internal/dri_interface.h +++ b/include/GL/internal/dri_interface.h @@ -782,12 +782,6 @@ typedef __DRIdrawable * const __DRIconfig *config, void *loaderPrivate); -typedef __DRIcontext * -(*__DRIcreateNewContextFunc)(__DRIscreen *screen, - const __DRIconfig *config, - __DRIcontext *shared, - void *loaderPrivate); - typedef __DRIcontext * (*__DRIcreateContextAttribsFunc)(__DRIscreen *screen, int api, @@ -949,7 +943,10 @@ struct __DRIdri2ExtensionRec { void *loaderPrivate); __DRIcreateNewDrawableFunc createNewDrawable; - __DRIcreateNewContextFunc createNewContext; + __DRIcontext *(*createNewContext)(__DRIscreen *screen, + const __DRIconfig *config, + __DRIcontext *shared, + void *loaderPrivate); /* Since version 2 */ __DRIgetAPIMaskFunc getAPIMask; @@ -1405,7 +1402,6 @@ struct __DRIimageDriverExtensionRec { /* Common DRI functions, shared with DRI2 */ __DRIcreateNewScreen2Func createNewScreen2; __DRIcreateNewDrawableFunc createNewDrawable; - __DRIcreateNewContextFunc createNewContext; __DRIcreateContextAttribsFunc createContextAttribs; __DRIgetAPIMaskFunc getAPIMask; }; -- cgit v1.2.3