X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fglx%2Fdri_common.h;h=6234fd812bf28f970b48bc64e932934ec38de26f;hb=ff90a8784cf22ada7bba75f90460b063818abda7;hp=7cd9ac2dac0faf490f2559eafce1bed21581900b;hpb=f972115d33e391499e049b83a1559959f2ca9f72;p=mesa.git

diff --git a/src/glx/dri_common.h b/src/glx/dri_common.h
index 7cd9ac2dac0..6234fd812bf 100644
--- a/src/glx/dri_common.h
+++ b/src/glx/dri_common.h
@@ -36,31 +36,53 @@
 #ifndef _DRI_COMMON_H
 #define _DRI_COMMON_H
 
+#include <GL/internal/dri_interface.h>
+#include <stdbool.h>
+#include "loader.h"
+
+#if (__GNUC__ >= 3)
+#define PRINTFLIKE(f, a) __attribute__ ((format(__printf__, f, a)))
+#else
+#define PRINTFLIKE(f, a)
+#endif
+
 typedef struct __GLXDRIconfigPrivateRec __GLXDRIconfigPrivate;
 
 struct __GLXDRIconfigPrivateRec
 {
-   __GLcontextModes modes;
+   struct glx_config base;
    const __DRIconfig *driConfig;
 };
 
-extern __GLcontextModes *driConvertConfigs(const __DRIcoreExtension * core,
-                                           __GLcontextModes * modes,
+extern struct glx_config *driConvertConfigs(const __DRIcoreExtension * core,
+                                           struct glx_config * modes,
                                            const __DRIconfig ** configs);
 
+extern void driDestroyConfigs(const __DRIconfig **configs);
+
+extern __GLXDRIdrawable *
+driFetchDrawable(struct glx_context *gc, GLXDrawable glxDrawable);
+
+extern void
+driReleaseDrawables(struct glx_context *gc);
+
 extern const __DRIsystemTimeExtension systemTimeExtension;
 
-extern void InfoMessageF(const char *f, ...);
+extern void dri_message(int level, const char *f, ...) PRINTFLIKE(2, 3);
 
-extern void ErrorMessageF(const char *f, ...);
+#define InfoMessageF(...) dri_message(_LOADER_INFO, __VA_ARGS__)
+#define ErrorMessageF(...) dri_message(_LOADER_WARNING, __VA_ARGS__)
+#define CriticalErrorMessageF(...) dri_message(_LOADER_FATAL, __VA_ARGS__)
 
 extern void *driOpenDriver(const char *driverName);
 
-extern void driBindExtensions(__GLXscreenConfigs * psc,
-			      const __DRIextension **extensions);
-extern void dri2BindExtensions(__GLXscreenConfigs * psc,
-			       const __DRIextension **extensions);
-extern void driBindCommonExtensions(__GLXscreenConfigs * psc,
-				    const __DRIextension **extensions);
+extern const __DRIextension **
+driGetDriverExtensions(void *handle, const char *driver_name);
+
+extern bool
+dri2_convert_glx_attribs(unsigned num_attribs, const uint32_t *attribs,
+                         unsigned *major_ver, unsigned *minor_ver,
+                         uint32_t *render_type, uint32_t *flags, unsigned *api,
+                         int *reset, unsigned *error);
 
 #endif /* _DRI_COMMON_H */