diff options
| author | Adam Jackson <ajax@redhat.com> | 2017-11-02 16:10:50 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2017-11-15 09:53:50 -0500 |
| commit | 66e8eaa456a0f200c0649c56a2e34914daa88065 (patch) | |
| tree | d79e402061ccb7bbc0fe94fdedcd73e5420b233b /glamor/glamor.c | |
| parent | dbda03d5d15bec8fdff64bc8545875c39da81777 (diff) | |
| download | xserver-66e8eaa456a0f200c0649c56a2e34914daa88065.tar.gz | |
glamor: Drop the non-VAO rendering path
GLES spells this extension as GL_OES_vertex_array_object, but it is
functionally equivalent to the GL_ARB version. Mesa has supported both
since 9.0, let's go ahead and require it.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'glamor/glamor.c')
| -rw-r--r-- | glamor/glamor.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/glamor/glamor.c b/glamor/glamor.c index 9fd110ed2..4a41fe783 100644 --- a/glamor/glamor.c +++ b/glamor/glamor.c @@ -579,6 +579,12 @@ glamor_init(ScreenPtr screen, unsigned int flags) } } + if (!epoxy_has_gl_extension("GL_ARB_vertex_array_object") && + !epoxy_has_gl_extension("GL_OES_vertex_array_object")) { + ErrorF("GL_{ARB,OES}_vertex_array_object required\n"); + goto fail; + } + glamor_priv->has_rw_pbo = FALSE; if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) glamor_priv->has_rw_pbo = TRUE; @@ -605,8 +611,6 @@ glamor_init(ScreenPtr screen, unsigned int flags) glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP || epoxy_gl_version() >= 30 || epoxy_has_gl_extension("GL_NV_pack_subimage"); - glamor_priv->has_vertex_array_object = - epoxy_has_gl_extension("GL_ARB_vertex_array_object"); glamor_priv->has_dual_blend = epoxy_has_gl_extension("GL_ARB_blend_func_extended"); |