X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fglx%2Fdri_common.h;h=6c634d81608146484e4f37c8f7be76fa74cb3da8;hb=0dda2094066efd035bf852e6bdbc349c009c95d2;hp=f5c7d456ee1b22a88cc13fc4a2d858746e4e350f;hpb=92bef0bfa121e0e58112ffae352c8ad9e5da6307;p=mesa.git

diff --git a/src/glx/dri_common.h b/src/glx/dri_common.h
index f5c7d456ee1..6c634d81608 100644
--- a/src/glx/dri_common.h
+++ b/src/glx/dri_common.h
@@ -36,8 +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"
+#include "util/macros.h" /* for PRINTFLIKE */
 
 typedef struct __GLXDRIconfigPrivateRec __GLXDRIconfigPrivate;
 
@@ -61,17 +65,26 @@ driReleaseDrawables(struct glx_context *gc);
 
 extern const __DRIsystemTimeExtension systemTimeExtension;
 
-extern void InfoMessageF(const char *f, ...);
-
-extern void ErrorMessageF(const char *f, ...);
+extern void dri_message(int level, const char *f, ...) PRINTFLIKE(2, 3);
 
-extern void CriticalErrorMessageF(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 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 *flags, unsigned *api, unsigned *error);
+                         unsigned *major_ver, unsigned *minor_ver,
+                         uint32_t *render_type, uint32_t *flags, unsigned *api,
+                         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 */