intel/compiler: match brw_compile_* declarations with their definitions

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

diff --git a/src/glx/dri_common.h b/src/glx/dri_common.h
index 32d98ed3c1b8172a9564fe7c2bf9db775f64af97..6c634d81608146484e4f37c8f7be76fa74cb3da8 100644 (file)
--- a/src/glx/dri_common.h
+++ b/src/glx/dri_common.h
@@ -36,7 +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;
 
@@ -52,12 +57,34 @@ extern struct glx_config *driConvertConfigs(const __DRIcoreExtension * core,
 
 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);
+
+#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 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, int *release, unsigned *error);
+
+extern bool
+dri2_check_no_error(uint32_t flags, struct glx_context *share_context,
+                    int major, unsigned *error);
 
-extern void ErrorMessageF(const char *f, ...);
 
-extern void *driOpenDriver(const char *driverName);
+#endif /* GLX_DIRECT_RENDERING */
 
 #endif /* _DRI_COMMON_H */