projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util/disk_cache: write cache item metadata to disk
[mesa.git]
/
src
/
gbm
/
main
/
gbm.h
diff --git
a/src/gbm/main/gbm.h
b/src/gbm/main/gbm.h
index a774b509510ce987f09432d5b46cb808fc68fd73..aed26a0162106b7794935717ae1df3efb740e4e9 100644
(file)
--- a/
src/gbm/main/gbm.h
+++ b/
src/gbm/main/gbm.h
@@
-77,6
+77,12
@@
enum gbm_bo_format {
GBM_BO_FORMAT_ARGB8888
};
GBM_BO_FORMAT_ARGB8888
};
+
+/**
+ * The FourCC format codes are taken from the drm_fourcc.h definition, and
+ * re-namespaced. New GBM formats must not be added, unless they are
+ * identical ports from drm_fourcc.
+ */
#define __gbm_fourcc_code(a,b,c,d) ((uint32_t)(a) | ((uint32_t)(b) << 8) | \
((uint32_t)(c) << 16) | ((uint32_t)(d) << 24))
#define __gbm_fourcc_code(a,b,c,d) ((uint32_t)(a) | ((uint32_t)(b) << 8) | \
((uint32_t)(c) << 16) | ((uint32_t)(d) << 24))
@@
-252,6
+258,7
@@
gbm_bo_create_with_modifiers(struct gbm_device *gbm,
#define GBM_BO_IMPORT_WL_BUFFER 0x5501
#define GBM_BO_IMPORT_EGL_IMAGE 0x5502
#define GBM_BO_IMPORT_FD 0x5503
#define GBM_BO_IMPORT_WL_BUFFER 0x5501
#define GBM_BO_IMPORT_EGL_IMAGE 0x5502
#define GBM_BO_IMPORT_FD 0x5503
+#define GBM_BO_IMPORT_FD_MODIFIER 0x5504
struct gbm_import_fd_data {
int fd;
struct gbm_import_fd_data {
int fd;
@@
-261,6
+268,17
@@
struct gbm_import_fd_data {
uint32_t format;
};
uint32_t format;
};
+struct gbm_import_fd_modifier_data {
+ uint32_t width;
+ uint32_t height;
+ uint32_t format;
+ uint32_t num_fds;
+ int fds[4];
+ int strides[4];
+ int offsets[4];
+ uint64_t modifier;
+};
+
struct gbm_bo *
gbm_bo_import(struct gbm_device *gbm, uint32_t type,
void *buffer, uint32_t usage);
struct gbm_bo *
gbm_bo_import(struct gbm_device *gbm, uint32_t type,
void *buffer, uint32_t usage);
@@
-315,7
+333,10
@@
gbm_bo_get_stride_for_plane(struct gbm_bo *bo, int plane);
uint32_t
gbm_bo_get_format(struct gbm_bo *bo);
uint32_t
gbm_bo_get_format(struct gbm_bo *bo);
-int64_t
+uint32_t
+gbm_bo_get_bpp(struct gbm_bo *bo);
+
+uint32_t
gbm_bo_get_offset(struct gbm_bo *bo, int plane);
struct gbm_device *
gbm_bo_get_offset(struct gbm_bo *bo, int plane);
struct gbm_device *