From 14852efb05cb5eae542e4796e2abf2cdb23e886a Mon Sep 17 00:00:00 2001 From: columbarius Date: Thu, 5 May 2022 11:11:09 +0200 Subject: [PATCH] screencast: Remove MESA hack from the old gbm api fallback Calling gbm_bo_create_with_modifiers2(...) and setting the modifiers pointer to NULL for the same result as gmb_bo_create(...) is a MESA hack, which I missed to remove from 84282e9b5f086014bd5f0ce36668e1265cc58af0. --- src/screencast/pipewire_screencast.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/screencast/pipewire_screencast.c b/src/screencast/pipewire_screencast.c index 8c2c868..de79042 100644 --- a/src/screencast/pipewire_screencast.c +++ b/src/screencast/pipewire_screencast.c @@ -238,16 +238,15 @@ static void pwr_handle_stream_param_changed(void *data, uint32_t id, for (uint32_t i = 0; i < n_modifiers; i++) { switch (modifiers[i]) { case DRM_FORMAT_MOD_INVALID: - modifiers = NULL; - n_modifiers = 0; - flags = GBM_BO_USE_RENDERING; + flags = cast->ctx->state->config->screencast_conf.force_mod_linear ? + GBM_BO_USE_RENDERING | GBM_BO_USE_LINEAR : GBM_BO_USE_RENDERING; break; default: continue; } - bo = gbm_bo_create_with_modifiers2(cast->ctx->gbm, + bo = gbm_bo_create(cast->ctx->gbm, cast->screencopy_frame_info[cast->buffer_type].width, cast->screencopy_frame_info[cast->buffer_type].height, - cast->screencopy_frame_info[cast->buffer_type].format, modifiers, n_modifiers, flags); + cast->screencopy_frame_info[cast->buffer_type].format, flags); if (bo) { modifier = gbm_bo_get_modifier(bo); gbm_bo_destroy(bo);