diff --git a/meson.build b/meson.build index 03b3e5b..65d649e 100644 --- a/meson.build +++ b/meson.build @@ -72,7 +72,7 @@ spirv_shader = custom_target('shader_target', liftoff_dep = dependency( 'libliftoff', - version: ['>= 0.1.0', '< 0.2.0'], + version: ['>= 0.2.0', '< 0.3.0'], fallback: ['libliftoff', 'liftoff'], default_options: ['default_library=static'], ) diff --git a/src/drm.cpp b/src/drm.cpp index 24bfe10..1721b09 100644 --- a/src/drm.cpp +++ b/src/drm.cpp @@ -1097,15 +1097,10 @@ drm_prepare_liftoff( struct drm_t *drm, const struct Composite_t *pComposite, co int ret = liftoff_output_apply( drm->lo_output, drm->req, drm->flags ); - int scanoutLayerCount = 0; if ( ret == 0 ) { - for ( int i = 0; i < k_nMaxLayers; i++ ) - { - if ( liftoff_layer_get_plane( drm->lo_layers[ i ] ) != NULL ) - scanoutLayerCount++; - } - if ( scanoutLayerCount != pComposite->nLayerCount ) + // We don't support partial composition yet + if ( liftoff_output_needs_composition( drm->lo_output ) ) ret = -EINVAL; } diff --git a/subprojects/libliftoff b/subprojects/libliftoff index 516cf94..aa30b8f 160000 --- a/subprojects/libliftoff +++ b/subprojects/libliftoff @@ -1 +1 @@ -Subproject commit 516cf9404df801b069065d14315cf6322f64a209 +Subproject commit aa30b8fb97ff2c4bf37ffcdf187bd16528fcb85f