starred/libmali-rockchip-tsukumijima
1
0
Fork 0
mirror of https://github.com/tsukumijima/libmali-rockchip.git synced 2026-01-24 00:10:50 +01:00
Code Issues Projects Packages Wiki Activity Actions

gbm: Bump to meson-23.1.3

Browse source 
Major changes:
1/ Add gbm_bo_create_with_modifiers2 and gbm_surface_create_with_modifiers2.
2/ Add headers for different versions of GBM.
3/ Detect platforms from library content.

Change-Id: Iaca158a926f5fe8c14698eb7e2ad5a427eb1632c
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
This commit is contained in:
Jeffy Chen 2023-07-24 15:04:48 +08:00
parent 81333f14a8
commit 2f52a7c5f5
11 changed files with 1289 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

64
hook/hook.c
View file

@ -149,8 +149,8 @@ can_ignore_modifiers(const uint64_t *modifiers,
const unsigned int count)
{
for (int i = 0; i < count; i++) {
/* linear or invalid */
if (!modifiers[i] || modifiers[i] == DRM_FORMAT_MOD_INVALID) {
if (modifiers[i] == DRM_FORMAT_MOD_LINEAR ||
modifiers[i] == DRM_FORMAT_MOD_INVALID) {
return true;
}
}
@ -220,6 +220,28 @@ gbm_device_get_format_modifier_plane_count(struct gbm_device *gbm,
}
#endif
#ifndef HAS_gbm_bo_create_with_modifiers2
struct gbm_bo *
gbm_bo_create_with_modifiers2(struct gbm_device *gbm,
uint32_t width, uint32_t height,
uint32_t format,
const uint64_t *modifiers,
const unsigned int count,
uint32_t flags)
{
#ifdef HAS_gbm_bo_create_with_modifiers
/* flags ignored */
return gbm_bo_create_with_modifiers(gbm, width, height, format,
modifiers, count);
#else
if (!can_ignore_modifiers(modifiers, count))
return NULL;
return gbm_bo_create(gbm, width, height, format, flags);
#endif
}
#endif
#ifndef HAS_gbm_bo_create_with_modifiers
struct gbm_bo *
gbm_bo_create_with_modifiers(struct gbm_device *gbm,
@ -228,10 +250,30 @@ gbm_bo_create_with_modifiers(struct gbm_device *gbm,
const uint64_t *modifiers,
const unsigned int count)
{
return gbm_bo_create_with_modifiers2(gbm, width, height, format,
modifiers, count, GBM_BO_USE_SCANOUT);
}
#endif
#ifndef HAS_gbm_surface_create_with_modifiers2
struct gbm_surface *
gbm_surface_create_with_modifiers2(struct gbm_device *gbm,
uint32_t width, uint32_t height,
uint32_t format,
const uint64_t *modifiers,
const unsigned int count,
uint32_t flags)
{
#ifdef HAS_gbm_surface_create_with_modifiers
/* flags ignored */
return gbm_surface_create_with_modifiers(gbm, width, height, format,
modifiers, count);
#else
if (!can_ignore_modifiers(modifiers, count))
return NULL;
return gbm_bo_create(gbm, width, height, format, GBM_BO_USE_LINEAR);
return gbm_surface_create(gbm, width, height, format, 0);
#endif
}
#endif
@ -243,10 +285,9 @@ gbm_surface_create_with_modifiers(struct gbm_device *gbm,
const uint64_t *modifiers,
const unsigned int count)
{
if (!can_ignore_modifiers(modifiers, count))
return NULL;
return gbm_surface_create(gbm, width, height, format, 0);
return gbm_surface_create_with_modifiers2(gbm, width, height, format,
modifiers, count,
GBM_BO_USE_SCANOUT);
}
#endif
@ -304,7 +345,7 @@ gbm_bo_unmap(struct gbm_bo *bo, void *map_data)
}
#endif
/* From mesa3d 20.1.5 : src/gbm/main/gbm.c */
/* From mesa3d mesa-23.1.3-1 : src/gbm/main/gbm.c */
#ifndef HAS_gbm_bo_get_bpp
uint32_t
gbm_bo_get_bpp(struct gbm_bo *bo)
@ -317,6 +358,7 @@ gbm_bo_get_bpp(struct gbm_bo *bo)
case GBM_FORMAT_RGB332:
case GBM_FORMAT_BGR233:
return 8;
case GBM_FORMAT_R16:
case GBM_FORMAT_GR88:
case GBM_FORMAT_XRGB4444:
case GBM_FORMAT_XBGR4444:
@ -340,6 +382,8 @@ gbm_bo_get_bpp(struct gbm_bo *bo)
case GBM_FORMAT_RGB888:
case GBM_FORMAT_BGR888:
return 24;
case GBM_FORMAT_RG1616:
case GBM_FORMAT_GR1616:
case GBM_FORMAT_XRGB8888:
case GBM_FORMAT_XBGR8888:
case GBM_FORMAT_RGBX8888:
@ -357,6 +401,8 @@ gbm_bo_get_bpp(struct gbm_bo *bo)
case GBM_FORMAT_RGBA1010102:
case GBM_FORMAT_BGRA1010102:
return 32;
case GBM_FORMAT_XBGR16161616:
case GBM_FORMAT_ABGR16161616:
case GBM_FORMAT_XBGR16161616F:
case GBM_FORMAT_ABGR16161616F:
return 64;
@ -364,7 +410,7 @@ gbm_bo_get_bpp(struct gbm_bo *bo)
}
#endif
/* From mesa3d 20.1.5 : src/gbm/main/gbm.c */
/* From mesa3d mesa-23.1.3-1 : src/gbm/main/gbm.c */
#ifndef HAS_gbm_format_get_name
static uint32_t
gbm_format_canonicalize(uint32_t gbm_format)

13
hook/meson.build
View file

@ -10,7 +10,9 @@ gbm_check_funcs = [
'gbm_bo_get_fd_for_plane',
'gbm_bo_get_modifier',
'gbm_bo_create_with_modifiers',
'gbm_bo_create_with_modifiers2',
'gbm_surface_create_with_modifiers',
'gbm_surface_create_with_modifiers2',
'gbm_bo_get_bpp',
'gbm_format_get_name',
]
@ -26,10 +28,9 @@ libhook_dep += dependency('libdrm', version : '>= 2.4.0')
libhook_inc = []
gbm_symbol = map['gbm'][0]
if cc.has_function(gbm_symbol, dependencies : mali)
if cc.has_function('gbm_create_device', dependencies : mali)
# Add hooks to support new GBM APIs
libhook_inc += include_directories('../include/GBM')
libhook_inc += include_directories('..' / gbm_headers.keys()[0])
libhook_cflags += '-DHAS_GBM'
foreach symbol : gbm_check_funcs
if cc.has_function(symbol, dependencies : mali)
@ -38,14 +39,12 @@ if cc.has_function(gbm_symbol, dependencies : mali)
endforeach
endif
egl_symbol = map['egl'][0]
if cc.has_function(egl_symbol, dependencies : mali)
if cc.has_function('eglCreateContext', dependencies : mali)
# Add hooks to support default winsys
libhook_inc += include_directories('../include')
libhook_cflags += '-DHAS_EGL'
wayland_symbol = map['wayland-egl'][0]
if cc.has_function(wayland_symbol, dependencies : mali)
if cc.has_function('wl_egl_window_create', dependencies : mali)
libhook_cflags += '-DHAS_WAYLAND'
endif