diff options
| author | Markus Wick <markus@selfnet.de> | 2014-03-18 09:42:52 +0100 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-03-26 12:58:40 -0700 |
| commit | 82168b1e6ede48898be8a64b1c93b7d82ef65702 (patch) | |
| tree | b5b19dc65d2104e8d45f0f6c9b5e7a58dd82ffb5 /glamor | |
| parent | 53df6e8c3bd7025883b9614a549fbf268c110b74 (diff) | |
glamor: Select VBO path by ARB_mbr extension.
The mbr path was hard coded enabled for desktop gl and disabled for
gles. But there are both desktop without mbr and GLES with mbr.
v2: Don't forget to update the fini path, too (change by anholt)
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'glamor')
| -rw-r--r-- | glamor/glamor.c | 2 | ||||
| -rw-r--r-- | glamor/glamor_priv.h | 1 | ||||
| -rw-r--r-- | glamor/glamor_vbo.c | 6 |
3 files changed, 6 insertions, 3 deletions
diff --git a/glamor/glamor.c b/glamor/glamor.c index eb1343036..0d0f52c18 100644 --- a/glamor/glamor.c +++ b/glamor/glamor.c @@ -378,6 +378,8 @@ glamor_init(ScreenPtr screen, unsigned int flags) epoxy_has_gl_extension("GL_MESA_pack_invert"); glamor_priv->has_fbo_blit = epoxy_has_gl_extension("GL_EXT_framebuffer_blit"); + glamor_priv->has_map_buffer_range = + epoxy_has_gl_extension("GL_ARB_map_buffer_range"); glamor_priv->has_buffer_storage = epoxy_has_gl_extension("GL_ARB_buffer_storage"); glGetIntegerv(GL_MAX_RENDERBUFFER_SIZE, &glamor_priv->max_fbo_size); diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h index 0f0b0f3a4..d4d2e7502 100644 --- a/glamor/glamor_priv.h +++ b/glamor/glamor_priv.h @@ -213,6 +213,7 @@ typedef struct glamor_screen_private { enum glamor_gl_flavor gl_flavor; int has_pack_invert; int has_fbo_blit; + int has_map_buffer_range; int has_buffer_storage; int has_khr_debug; int max_fbo_size; diff --git a/glamor/glamor_vbo.c b/glamor/glamor_vbo.c index 5e98bfe47..2731692d6 100644 --- a/glamor/glamor_vbo.c +++ b/glamor/glamor_vbo.c @@ -96,7 +96,7 @@ glamor_get_vbo_space(ScreenPtr screen, unsigned size, char **vbo_offset) *vbo_offset = (void *)(uintptr_t)glamor_priv->vbo_offset; data = glamor_priv->vb + glamor_priv->vbo_offset; glamor_priv->vbo_offset += size; - } else if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) { + } else if (glamor_priv->has_map_buffer_range) { if (glamor_priv->vbo_size < glamor_priv->vbo_offset + size) { glamor_priv->vbo_size = MAX(GLAMOR_VBO_SIZE, size); glamor_priv->vbo_offset = 0; @@ -147,7 +147,7 @@ glamor_put_vbo_space(ScreenPtr screen) * persistent mapping, so we can leave it around until we * reach the end of the buffer. */ - } else if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) { + } else if (glamor_priv->has_map_buffer_range) { glUnmapBuffer(GL_ARRAY_BUFFER); } else { glBufferData(GL_ARRAY_BUFFER, glamor_priv->vbo_offset, @@ -179,7 +179,7 @@ glamor_fini_vbo(ScreenPtr screen) glamor_get_context(glamor_priv); glDeleteBuffers(1, &glamor_priv->vbo); - if (glamor_priv->gl_flavor != GLAMOR_GL_DESKTOP) + if (!glamor_priv->has_map_buffer_range) free(glamor_priv->vb); glamor_put_context(glamor_priv); |