Upgrade libliftoff
This commit is contained in:
parent
21b263768f
commit
a5a31d46e3
3 changed files with 4 additions and 9 deletions
|
@ -72,7 +72,7 @@ spirv_shader = custom_target('shader_target',
|
||||||
|
|
||||||
liftoff_dep = dependency(
|
liftoff_dep = dependency(
|
||||||
'libliftoff',
|
'libliftoff',
|
||||||
version: ['>= 0.1.0', '< 0.2.0'],
|
version: ['>= 0.2.0', '< 0.3.0'],
|
||||||
fallback: ['libliftoff', 'liftoff'],
|
fallback: ['libliftoff', 'liftoff'],
|
||||||
default_options: ['default_library=static'],
|
default_options: ['default_library=static'],
|
||||||
)
|
)
|
||||||
|
|
|
@ -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 ret = liftoff_output_apply( drm->lo_output, drm->req, drm->flags );
|
||||||
|
|
||||||
int scanoutLayerCount = 0;
|
|
||||||
if ( ret == 0 )
|
if ( ret == 0 )
|
||||||
{
|
{
|
||||||
for ( int i = 0; i < k_nMaxLayers; i++ )
|
// We don't support partial composition yet
|
||||||
{
|
if ( liftoff_output_needs_composition( drm->lo_output ) )
|
||||||
if ( liftoff_layer_get_plane( drm->lo_layers[ i ] ) != NULL )
|
|
||||||
scanoutLayerCount++;
|
|
||||||
}
|
|
||||||
if ( scanoutLayerCount != pComposite->nLayerCount )
|
|
||||||
ret = -EINVAL;
|
ret = -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 516cf9404df801b069065d14315cf6322f64a209
|
Subproject commit aa30b8fb97ff2c4bf37ffcdf187bd16528fcb85f
|
Loading…
Reference in a new issue