X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=src%2Fglx%2Fdri_common.h;h=6c634d81608146484e4f37c8f7be76fa74cb3da8;hp=6234fd812bf28f970b48bc64e932934ec38de26f;hb=HEAD;hpb=867d7c0e108a4e6511305f82b18ea6f606a18427

diff --git a/src/glx/dri_common.h b/src/glx/dri_common.h
index 6234fd812bf..6c634d81608 100644
--- a/src/glx/dri_common.h
+++ b/src/glx/dri_common.h
@@ -36,15 +36,12 @@
 #ifndef _DRI_COMMON_H
 #define _DRI_COMMON_H
 
+#ifdef GLX_DIRECT_RENDERING
+
 #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
+#include "util/macros.h" /* for PRINTFLIKE */
 
 typedef struct __GLXDRIconfigPrivateRec __GLXDRIconfigPrivate;
 
@@ -74,15 +71,20 @@ 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,
                          unsigned *major_ver, unsigned *minor_ver,
                          uint32_t *render_type, uint32_t *flags, unsigned *api,
-                         int *reset, unsigned *error);
+                         int *reset, int *release, unsigned *error);
+
+extern bool
+dri2_check_no_error(uint32_t flags, struct glx_context *share_context,
+                    int major, unsigned *error);
+
+
+#endif /* GLX_DIRECT_RENDERING */
 
 #endif /* _DRI_COMMON_H */