From 82c6bb3e10e5cb8f632f2034e97b11830de79f88 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Wed, 24 Nov 2010 18:25:41 +0100 Subject: [PATCH 2/2] Remove ARB buffer management Replace glBindBufferARB with glBindBuffer and such --- src/cairo-gl-composite.c | 10 +++++----- src/cairo-gl-device.c | 6 +++--- src/cairo-gl-gradient.c | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/cairo-gl-composite.c b/src/cairo-gl-composite.c index 97407bb..95c8a75 100644 --- a/src/cairo-gl-composite.c +++ b/src/cairo-gl-composite.c @@ -960,7 +960,7 @@ _cairo_gl_composite_begin (cairo_gl_composite_t *setup, _cairo_gl_context_set_destination (ctx, setup->dst); if (_cairo_gl_context_is_flushed (ctx)) { - glBindBufferARB (GL_ARRAY_BUFFER_ARB, ctx->vbo); + glBindBuffer (GL_ARRAY_BUFFER, ctx->vbo); glVertexPointer (2, GL_FLOAT, vertex_size, NULL); glEnableClientState (GL_VERTEX_ARRAY); @@ -1034,7 +1034,7 @@ _cairo_gl_composite_flush (cairo_gl_context_t *ctx) count = ctx->vb_offset / ctx->vertex_size; - glUnmapBufferARB (GL_ARRAY_BUFFER_ARB); + glUnmapBuffer (GL_ARRAY_BUFFER); ctx->vb = NULL; ctx->vb_offset = 0; @@ -1062,9 +1062,9 @@ _cairo_gl_composite_prepare_buffer (cairo_gl_context_t *ctx, _cairo_gl_composite_flush (ctx); if (ctx->vb == NULL) { - glBufferDataARB (GL_ARRAY_BUFFER_ARB, CAIRO_GL_VBO_SIZE, - NULL, GL_STREAM_DRAW_ARB); - ctx->vb = glMapBufferARB (GL_ARRAY_BUFFER_ARB, GL_WRITE_ONLY_ARB); + glBufferData (GL_ARRAY_BUFFER, CAIRO_GL_VBO_SIZE, + NULL, GL_STREAM_DRAW); + ctx->vb = glMapBuffer (GL_ARRAY_BUFFER, GL_WRITE_ONLY); } } diff --git a/src/cairo-gl-device.c b/src/cairo-gl-device.c index c39489c..f442201 100644 --- a/src/cairo-gl-device.c +++ b/src/cairo-gl-device.c @@ -85,7 +85,7 @@ _gl_flush (void *device) ctx->pre_shader = NULL; _cairo_gl_set_shader (ctx, NULL); - glBindBufferARB (GL_ARRAY_BUFFER_ARB, 0); + glBindBuffer (GL_ARRAY_BUFFER, 0); glDisableClientState (GL_VERTEX_ARRAY); @@ -218,8 +218,8 @@ _cairo_gl_context_init (cairo_gl_context_t *ctx) GL_RGBA, GL_UNSIGNED_BYTE, NULL); /* PBO for any sort of texture upload */ - glGenBuffersARB (1, &ctx->texture_load_pbo); - glGenBuffersARB (1, &ctx->vbo); + glGenBuffers (1, &ctx->texture_load_pbo); + glGenBuffers (1, &ctx->vbo); ctx->max_framebuffer_size = 0; glGetIntegerv (GL_MAX_RENDERBUFFER_SIZE, &ctx->max_framebuffer_size); diff --git a/src/cairo-gl-gradient.c b/src/cairo-gl-gradient.c index 94c220b..ac11367 100644 --- a/src/cairo-gl-gradient.c +++ b/src/cairo-gl-gradient.c @@ -221,16 +221,16 @@ _cairo_gl_gradient_create (cairo_gl_context_t *ctx, gradient->stops = gradient->stops_embedded; memcpy (gradient->stops_embedded, stops, n_stops * sizeof (cairo_gradient_stop_t)); - glBindBufferARB (GL_PIXEL_UNPACK_BUFFER_ARB, ctx->texture_load_pbo); - glBufferDataARB (GL_PIXEL_UNPACK_BUFFER_ARB, tex_width * sizeof (uint32_t), 0, GL_STREAM_DRAW); - data = glMapBufferARB (GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY); + glBindBuffer (GL_PIXEL_UNPACK_BUFFER, ctx->texture_load_pbo); + glBufferData (GL_PIXEL_UNPACK_BUFFER, tex_width * sizeof (uint32_t), 0, GL_STREAM_DRAW); + data = glMapBuffer (GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY); status = _cairo_gl_gradient_render (ctx, n_stops, stops, data, tex_width); - glUnmapBufferARB (GL_PIXEL_UNPACK_BUFFER_ARB); + glUnmapBuffer (GL_PIXEL_UNPACK_BUFFER); if (unlikely (status)) { - glBindBufferARB (GL_PIXEL_UNPACK_BUFFER_ARB, 0); + glBindBuffer (GL_PIXEL_UNPACK_BUFFER, 0); free (gradient); return status; } @@ -241,7 +241,7 @@ _cairo_gl_gradient_create (cairo_gl_context_t *ctx, glTexImage1D (GL_TEXTURE_1D, 0, GL_RGBA8, tex_width, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 0); - glBindBufferARB (GL_PIXEL_UNPACK_BUFFER_ARB, 0); + glBindBuffer (GL_PIXEL_UNPACK_BUFFER, 0); /* we ignore errors here and just return an uncached gradient */ if (likely (! _cairo_cache_insert (&ctx->gradients, &gradient->cache_entry))) -- 1.7.0.2