diff options
author | Michel Dänzer <michel.daenzer@amd.com> | 2018-05-23 11:38:13 +0200 |
---|---|---|
committer | Adam Jackson <ajax@redhat.com> | 2018-06-19 09:52:17 -0400 |
commit | 544caffae1b0dc786383b117c036284feb579a66 (patch) | |
tree | 13db9461734f4b6b2cd8d10ae9aa3773f874e2af | |
parent | a9a17581ce73a49f0a8d3b9dbb2db083fa44cb69 (diff) |
glamor: Always return 0 from glamor_fds_from_pixmap on error
This matches what glamor_egl_fds_from_pixmap and dri3_fds_from_pixmap do
and what proc_dri3_buffers_from_pixmap expects.
Fixes: c8c276c9569b "glamor: Implement PixmapFromBuffers and
BuffersFromPixmap"
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
(cherry picked from commit 3da999a0390407d512bf784e4faf01482bfff9ea)
-rw-r--r-- | glamor/glamor.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/glamor/glamor.c b/glamor/glamor.c index d984d20f3..e2c74d17a 100644 --- a/glamor/glamor.c +++ b/glamor/glamor.c @@ -836,20 +836,20 @@ glamor_fds_from_pixmap(ScreenPtr screen, PixmapPtr pixmap, int *fds, glamor_get_screen_private(pixmap->drawable.pScreen); if (!glamor_priv->dri3_enabled) - return -1; + return 0; switch (pixmap_priv->type) { case GLAMOR_TEXTURE_DRM: case GLAMOR_TEXTURE_ONLY: if (!glamor_pixmap_ensure_fbo(pixmap, pixmap->drawable.depth == 30 ? GL_RGB10_A2 : GL_RGBA, 0)) - return -1; + return 0; return glamor_egl_fds_from_pixmap(screen, pixmap, fds, strides, offsets, modifier); default: break; } - return -1; + return 0; } _X_EXPORT int |