@ -2083,7 +2083,7 @@ import_dmabuf(struct gl_renderer *gr,
return image ;
return image ;
}
}
static bool
static void
gl_renderer_query_dmabuf_formats ( struct weston_compositor * wc ,
gl_renderer_query_dmabuf_formats ( struct weston_compositor * wc ,
int * * formats , int * num_formats )
int * * formats , int * num_formats )
{
{
@ -2095,25 +2095,24 @@ gl_renderer_query_dmabuf_formats(struct weston_compositor *wc,
if ( ! gr - > has_dmabuf_import_modifiers | |
if ( ! gr - > has_dmabuf_import_modifiers | |
! gr - > query_dmabuf_formats ( gr - > egl_display , 0 , NULL , & num ) ) {
! gr - > query_dmabuf_formats ( gr - > egl_display , 0 , NULL , & num ) ) {
* num_formats = 0 ;
* num_formats = 0 ;
return false ;
return ;
}
}
* formats = calloc ( num , sizeof ( int ) ) ;
* formats = calloc ( num , sizeof ( int ) ) ;
if ( * formats = = NULL ) {
if ( * formats = = NULL ) {
* num_formats = 0 ;
* num_formats = 0 ;
return false ;
return ;
}
}
if ( ! gr - > query_dmabuf_formats ( gr - > egl_display , num , * formats , & num ) ) {
if ( ! gr - > query_dmabuf_formats ( gr - > egl_display , num , * formats , & num ) ) {
* num_formats = 0 ;
* num_formats = 0 ;
free ( * formats ) ;
free ( * formats ) ;
return false ;
return ;
}
}
* num_formats = num ;
* num_formats = num ;
return true ;
}
}
static bool
static void
gl_renderer_query_dmabuf_modifiers ( struct weston_compositor * wc , int format ,
gl_renderer_query_dmabuf_modifiers ( struct weston_compositor * wc , int format ,
uint64_t * * modifiers ,
uint64_t * * modifiers ,
int * num_modifiers )
int * num_modifiers )
@ -2127,23 +2126,22 @@ gl_renderer_query_dmabuf_modifiers(struct weston_compositor *wc, int format,
! gr - > query_dmabuf_modifiers ( gr - > egl_display , format , 0 , NULL ,
! gr - > query_dmabuf_modifiers ( gr - > egl_display , format , 0 , NULL ,
NULL , & num ) ) {
NULL , & num ) ) {
* num_modifiers = 0 ;
* num_modifiers = 0 ;
return false ;
return ;
}
}
* modifiers = calloc ( num , sizeof ( uint64_t ) ) ;
* modifiers = calloc ( num , sizeof ( uint64_t ) ) ;
if ( * modifiers = = NULL ) {
if ( * modifiers = = NULL ) {
* num_modifiers = 0 ;
* num_modifiers = 0 ;
return false ;
return ;
}
}
if ( ! gr - > query_dmabuf_modifiers ( gr - > egl_display , format ,
if ( ! gr - > query_dmabuf_modifiers ( gr - > egl_display , format ,
num , * modifiers , NULL , & num ) ) {
num , * modifiers , NULL , & num ) ) {
* num_modifiers = 0 ;
* num_modifiers = 0 ;
free ( * modifiers ) ;
free ( * modifiers ) ;
return false ;
return ;
}
}
* num_modifiers = num ;
* num_modifiers = num ;
return true ;
}
}
static bool
static bool