X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=dri.h;h=6218e827e6eb9a5a177b9ea023197bcbfa27adde;hb=f2f8b352dbb2a218c7a4a6b1582736ac990343a8;hp=f79de99c4a0395fd9903c76713629a8ae86b26de;hpb=faeb009164fc35c5ec93a0ab81be7615a22dca02;p=android-x86%2Fexternal-minigbm.git

diff --git a/dri.h b/dri.h
index f79de99..6218e82 100644
--- a/dri.h
+++ b/dri.h
@@ -6,11 +6,11 @@
 
 #ifdef DRV_AMDGPU
 
-typedef int GLint;
-typedef unsigned int GLuint;
-typedef unsigned char GLboolean;
-
+// Avoid transitively including a bunch of unnecessary headers.
+#define GL_GLEXT_LEGACY
 #include "GL/internal/dri_interface.h"
+#undef GL_GLEXT_LEGACY
+
 #include "drv.h"
 
 struct dri_driver {
@@ -30,9 +30,12 @@ int dri_init(struct driver *drv, const char *dri_so_path, const char *driver_suf
 void dri_close(struct driver *drv);
 int dri_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
 		  uint64_t use_flags);
+int dri_bo_create_with_modifiers(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
+				 const uint64_t *modifiers, uint32_t modifier_count);
 int dri_bo_import(struct bo *bo, struct drv_import_fd_data *data);
 int dri_bo_destroy(struct bo *bo);
 void *dri_bo_map(struct bo *bo, struct vma *vma, size_t plane, uint32_t map_flags);
 int dri_bo_unmap(struct bo *bo, struct vma *vma);
+size_t dri_num_planes_from_modifier(struct driver *drv, uint32_t format, uint64_t modifier);
 
 #endif