glamor: zero num_formats from the start
The caller may ignore the return value (will be addressed with later
commit) so simply zero the count from the get-go. We're pretty much do
so, in all cases but one :-\
Fixes: cef12efc15
("glamor: Implement GetSupportedModifiers")
Cc: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Cc: Daniel Stone <daniels@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
parent
ac48724639
commit
71a069fd7f
|
@ -596,30 +596,26 @@ glamor_get_formats(ScreenPtr screen,
|
||||||
struct glamor_egl_screen_private *glamor_egl;
|
struct glamor_egl_screen_private *glamor_egl;
|
||||||
EGLint num;
|
EGLint num;
|
||||||
|
|
||||||
|
/* Explicitly zero the count as the caller may ignore the return value */
|
||||||
|
*num_formats = 0;
|
||||||
|
|
||||||
glamor_egl = glamor_egl_get_screen_private(xf86ScreenToScrn(screen));
|
glamor_egl = glamor_egl_get_screen_private(xf86ScreenToScrn(screen));
|
||||||
|
|
||||||
if (!glamor_egl->dmabuf_capable)
|
if (!glamor_egl->dmabuf_capable)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
if (!eglQueryDmaBufFormatsEXT(glamor_egl->display, 0, NULL, &num)) {
|
if (!eglQueryDmaBufFormatsEXT(glamor_egl->display, 0, NULL, &num))
|
||||||
*num_formats = 0;
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
|
||||||
|
|
||||||
if (num == 0) {
|
if (num == 0)
|
||||||
*num_formats = 0;
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
|
||||||
|
|
||||||
*formats = calloc(num, sizeof(CARD32));
|
*formats = calloc(num, sizeof(CARD32));
|
||||||
if (*formats == NULL) {
|
if (*formats == NULL)
|
||||||
*num_formats = 0;
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
|
||||||
|
|
||||||
if (!eglQueryDmaBufFormatsEXT(glamor_egl->display, num,
|
if (!eglQueryDmaBufFormatsEXT(glamor_egl->display, num,
|
||||||
(EGLint *) *formats, &num)) {
|
(EGLint *) *formats, &num)) {
|
||||||
*num_formats = 0;
|
|
||||||
free(*formats);
|
free(*formats);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user