[Mesa-dev] [PATCH 14/18] gbm/dri: Expose visuals table through gbm_dri_device
Daniel Stone
daniels at collabora.com
Thu Feb 8 13:55:38 UTC 2018
Signed-off-by: Daniel Stone <daniels at collabora.com>
---
src/gbm/backends/dri/gbm_dri.c | 21 ++++++++++-----------
src/gbm/backends/dri/gbm_driint.h | 9 +++++++++
2 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c
index 65f612e68b4..ed64ad61bf0 100644
--- a/src/gbm/backends/dri/gbm_dri.c
+++ b/src/gbm/backends/dri/gbm_dri.c
@@ -543,11 +543,7 @@ dri_screen_create_sw(struct gbm_dri_device *dri)
return dri_screen_create_swrast(dri);
}
-static const struct {
- uint32_t gbm_format;
- int dri_image_format;
- uint32_t rgba_masks[4];
-} gbm_to_dri_image_formats[] = {
+static const struct gbm_dri_visual gbm_dri_visuals_table[] = {
{
GBM_FORMAT_R8, __DRI_IMAGE_FORMAT_R8,
{ 0x000000ff, 0x00000000, 0x00000000, 0x00000000 },
@@ -608,9 +604,9 @@ gbm_format_to_dri_format(uint32_t gbm_format)
int i;
gbm_format = gbm_format_canonicalize(gbm_format);
- for (i = 0; i < ARRAY_SIZE(gbm_to_dri_image_formats); i++) {
- if (gbm_to_dri_image_formats[i].gbm_format == gbm_format)
- return gbm_to_dri_image_formats[i].dri_image_format;
+ for (i = 0; i < ARRAY_SIZE(gbm_dri_visuals_table); i++) {
+ if (gbm_dri_visuals_table[i].gbm_format == gbm_format)
+ return gbm_dri_visuals_table[i].dri_image_format;
}
return 0;
@@ -621,9 +617,9 @@ gbm_dri_to_gbm_format(int dri_format)
{
int i;
- for (i = 0; i < ARRAY_SIZE(gbm_to_dri_image_formats); i++) {
- if (gbm_to_dri_image_formats[i].dri_image_format == dri_format)
- return gbm_to_dri_image_formats[i].gbm_format;
+ for (i = 0; i < ARRAY_SIZE(gbm_dri_visuals_table); i++) {
+ if (gbm_dri_visuals_table[i].dri_image_format == dri_format)
+ return gbm_dri_visuals_table[i].gbm_format;
}
return 0;
@@ -1419,6 +1415,9 @@ dri_device_create(int fd)
dri->base.name = "drm";
+ dri->visual_table = gbm_dri_visuals_table;
+ dri->num_visuals = ARRAY_SIZE(gbm_dri_visuals_table);
+
mtx_init(&dri->mutex, mtx_plain);
force_sw = env_var_as_boolean("GBM_ALWAYS_SOFTWARE", false);
diff --git a/src/gbm/backends/dri/gbm_driint.h b/src/gbm/backends/dri/gbm_driint.h
index db9038a623a..84a98533c79 100644
--- a/src/gbm/backends/dri/gbm_driint.h
+++ b/src/gbm/backends/dri/gbm_driint.h
@@ -40,6 +40,12 @@
struct gbm_dri_surface;
struct gbm_dri_bo;
+struct gbm_dri_visual {
+ uint32_t gbm_format;
+ int dri_image_format;
+ uint32_t rgba_masks[4];
+};
+
struct gbm_dri_device {
struct gbm_device base;
@@ -97,6 +103,9 @@ struct gbm_dri_device {
void *loaderPrivate);
struct wl_drm *wl_drm;
+
+ const struct gbm_dri_visual *visual_table;
+ int num_visuals;
};
struct gbm_dri_bo {
--
2.14.3
More information about the mesa-dev
mailing list