From ae3f71040b1b0e8c0b3271a78c1a91e9e685adec Mon Sep 17 00:00:00 2001 From: Chris Thrasher Date: Wed, 26 Oct 2022 13:03:28 -0600 Subject: [PATCH] Use function declarations from gbm.h --- src/SFML/Window/DRM/DRMContext.cpp | 42 ++++++++++++------------------ 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/src/SFML/Window/DRM/DRMContext.cpp b/src/SFML/Window/DRM/DRMContext.cpp index 8d97c2d61d..aa5c243287 100644 --- a/src/SFML/Window/DRM/DRMContext.cpp +++ b/src/SFML/Window/DRM/DRMContext.cpp @@ -46,13 +46,6 @@ #include #endif -#define WEAK __attribute__((weak)) - -WEAK uint64_t gbm_bo_get_modifier(gbm_bo* bo); -WEAK int gbm_bo_get_plane_count(gbm_bo* bo); -WEAK uint32_t gbm_bo_get_stride_for_plane(gbm_bo* bo, int plane); -WEAK uint32_t gbm_bo_get_offset(gbm_bo* bo, int plane); - namespace { bool initialized = false; @@ -165,29 +158,26 @@ namespace height = gbm_bo_get_height(&bo); format = gbm_bo_get_format(&bo); - if (gbm_bo_get_modifier && gbm_bo_get_plane_count && gbm_bo_get_stride_for_plane && gbm_bo_get_offset) + uint64_t modifiers[4] = {0}; + modifiers[0] = gbm_bo_get_modifier(&bo); + const int num_planes = gbm_bo_get_plane_count(&bo); + for (int i = 0; i < num_planes; i++) { - uint64_t modifiers[4] = {0}; - modifiers[0] = gbm_bo_get_modifier(&bo); - const int num_planes = gbm_bo_get_plane_count(&bo); - for (int i = 0; i < num_planes; i++) - { - strides[i] = gbm_bo_get_stride_for_plane(&bo, i); - handles[i] = gbm_bo_get_handle(&bo).u32; - offsets[i] = gbm_bo_get_offset(&bo, i); - modifiers[i] = modifiers[0]; - } - - if (modifiers[0]) - { - flags = DRM_MODE_FB_MODIFIERS; - } + strides[i] = gbm_bo_get_stride_for_plane(&bo, i); + handles[i] = gbm_bo_get_handle(&bo).u32; + offsets[i] = gbm_bo_get_offset(&bo, i); + modifiers[i] = modifiers[0]; + } - ret = drmModeAddFB2WithModifiers(drmFd, width, height, - format, handles, strides, offsets, - modifiers, &fb->fbId, flags); + if (modifiers[0]) + { + flags = DRM_MODE_FB_MODIFIERS; } + ret = drmModeAddFB2WithModifiers(drmFd, width, height, + format, handles, strides, offsets, + modifiers, &fb->fbId, flags); + if (ret) { std::memset(handles, 0, 16);