From c2b515379bfc669660133bb2d25e50bb04ac0d66 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 15 Nov 2018 14:22:16 -0800 Subject: glx: Move DRI extensions pointer loading to driOpenDriver(). The only thing you do with a dri driver handle is get the extensions pointer, so just fold it in to simplify the callers. v2: Add the declaration of driGetDriverExtensions() that got lost in a rebase. Reviewed-by: Eric Engestrom (v1) Reviewed-by: Emil Velikov (v1) --- src/glx/dri_common.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/glx/dri_common.h') diff --git a/src/glx/dri_common.h b/src/glx/dri_common.h index 4d97ff82b4d..363f15bf9bb 100644 --- a/src/glx/dri_common.h +++ b/src/glx/dri_common.h @@ -69,10 +69,8 @@ extern void dri_message(int level, const char *f, ...) PRINTFLIKE(2, 3); #define ErrorMessageF(...) dri_message(_LOADER_WARNING, __VA_ARGS__) #define CriticalErrorMessageF(...) dri_message(_LOADER_FATAL, __VA_ARGS__) -extern void *driOpenDriver(const char *driverName); - -extern const __DRIextension ** -driGetDriverExtensions(void *handle, const char *driver_name); +extern const __DRIextension **driOpenDriver(const char *driverName, + void **out_driver_handle); extern bool dri2_convert_glx_attribs(unsigned num_attribs, const uint32_t *attribs, -- cgit v1.2.3