diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2015-09-22 15:35:40 +0100 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2015-09-22 11:11:49 -0400 |
| commit | 64e6124f27e9900809d0009b95c7c0b5b8788e6b (patch) | |
| tree | 179486adbc9f70362f8a063bbb940aac7f7dfae1 /glamor | |
| parent | aa5606be1c0ea72b38de48ca333c7da5436368ef (diff) | |
glamor: move GL_OES_EGL_image check next to EGL_EXT_image_dma_buf_import
We're using the former only as the latter is present. Thus in some cases
we might incorrectly error out if it's missing.
Namely - glamor_glx, glamor_egl without gbm, EGL_KHR_gl_texture_2D_image
or EGL_EXT_image_dma_buf_import.
Fixes 58d54ee82df(glamor: explicitly check for GL_OES_EGL_image)
Cc: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Suggested-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Diffstat (limited to 'glamor')
| -rw-r--r-- | glamor/glamor.c | 5 | ||||
| -rw-r--r-- | glamor/glamor_egl.c | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/glamor/glamor.c b/glamor/glamor.c index 8178785d4..d4a023629 100644 --- a/glamor/glamor.c +++ b/glamor/glamor.c @@ -545,11 +545,6 @@ glamor_init(ScreenPtr screen, unsigned int flags) } } - if (!epoxy_has_gl_extension("GL_OES_EGL_image")) { - ErrorF("GL_OES_EGL_image not available\n"); - goto fail; - } - glamor_priv->has_rw_pbo = FALSE; if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) glamor_priv->has_rw_pbo = TRUE; diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index 8ff1d03e9..dcff443a9 100644 --- a/glamor/glamor_egl.c +++ b/glamor/glamor_egl.c @@ -870,7 +870,8 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd) if (epoxy_has_egl_extension(glamor_egl->display, "EGL_KHR_gl_texture_2D_image") && epoxy_has_egl_extension(glamor_egl->display, - "EGL_EXT_image_dma_buf_import")) + "EGL_EXT_image_dma_buf_import") && + epoxy_has_gl_extension("GL_OES_EGL_image")) glamor_egl->dri3_capable = TRUE; #endif |