i965/fs: Fix lower_load_payload() not to use an incorrect half for immediates and...

[mesa.git] / src / glx / dri_common.h

diff --git a/src/glx/dri_common.h b/src/glx/dri_common.h
index 13b5ae471d13b84da9110cfde2e222c25e1666be..5cd150ab4d2f26a4e33556e9d7f7303d3d4efa37 100644 (file)
--- a/src/glx/dri_common.h
+++ b/src/glx/dri_common.h
@@ -37,6 +37,14 @@
 #define _DRI_COMMON_H
 
 #include <GL/internal/dri_interface.h>
+#include <stdbool.h>
+#include "loader.h"
+
+#if (__GNUC__)
+#define PRINTFLIKE(f, a) __attribute__ ((format(__printf__, f, a)))
+#else
+#define PRINTFLIKE(f, a)
+#endif
 
 typedef struct __GLXDRIconfigPrivateRec __GLXDRIconfigPrivate;
 
@@ -60,10 +68,21 @@ 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 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 */