projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965/drm: s/drm_intel/drm_bacon/g
[mesa.git]
/
src
/
glx
/
dri_common.h
diff --git
a/src/glx/dri_common.h
b/src/glx/dri_common.h
index 3bcdebcc5296d89399f743cc0d969763146f9f1d..947d331772fa25f42ef4226c33a0e92bce1cba43 100644
(file)
--- a/
src/glx/dri_common.h
+++ b/
src/glx/dri_common.h
@@
-38,6
+38,8
@@
#include <GL/internal/dri_interface.h>
#include <stdbool.h>
#include <GL/internal/dri_interface.h>
#include <stdbool.h>
+#include "loader.h"
+#include "util/macros.h" /* for PRINTFLIKE */
typedef struct __GLXDRIconfigPrivateRec __GLXDRIconfigPrivate;
typedef struct __GLXDRIconfigPrivateRec __GLXDRIconfigPrivate;
@@
-61,15
+63,21
@@
driReleaseDrawables(struct glx_context *gc);
extern const __DRIsystemTimeExtension systemTimeExtension;
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 *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,
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, unsigned *error);
#endif /* _DRI_COMMON_H */
#endif /* _DRI_COMMON_H */