fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-07 07:28:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

gl: Use conventional texture upload for GLES2

Browse source 
GLES2 doesn't support Pixel Buffer Objects. Use conventional texture upload
for GLES2 (using client-side memory).

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Alexandros Frantzis 2011-03-02 18:16:56 +02:00 • committed by Chris Wilson
parent d20f66608c
commit 0e41145a75
2 changed files with 29 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/cairo-gl-device.c
View file

@ -176,7 +176,8 @@ _cairo_gl_context_init (cairo_gl_context_t *ctx)
else
return _cairo_error (CAIRO_STATUS_DEVICE_ERROR);
if (gl_version < CAIRO_GL_VERSION_ENCODE (2, 1) &&
if (gl_flavor == CAIRO_GL_FLAVOR_DESKTOP &&
gl_version < CAIRO_GL_VERSION_ENCODE (2, 1) &&
! _cairo_gl_has_extension ("GL_ARB_pixel_buffer_object"))
return _cairo_error (CAIRO_STATUS_DEVICE_ERROR);

45
src/cairo-gl-gradient.c
View file

@ -234,33 +234,42 @@ _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));
dispatch->BindBuffer (GL_PIXEL_UNPACK_BUFFER, ctx->texture_load_pbo);
dispatch->BufferData (GL_PIXEL_UNPACK_BUFFER,
tex_width * sizeof (uint32_t), 0, GL_STREAM_DRAW);
data = dispatch->MapBuffer (GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY);
status = _cairo_gl_gradient_render (ctx, n_stops, stops, data, tex_width);
dispatch->UnmapBuffer (GL_PIXEL_UNPACK_BUFFER);
if (unlikely (status)) {
dispatch->BindBuffer (GL_PIXEL_UNPACK_BUFFER, 0);
free (gradient);
return status;
}
glGenTextures (1, &gradient->tex);
_cairo_gl_context_activate (ctx, CAIRO_GL_TEX_TEMP);
glBindTexture (ctx->tex_target, gradient->tex);
if (ctx->gl_flavor == CAIRO_GL_FLAVOR_DESKTOP)
/* GL_PIXEL_UNPACK_BUFFER is only available in Desktop GL */
if (ctx->gl_flavor == CAIRO_GL_FLAVOR_DESKTOP) {
dispatch->BindBuffer (GL_PIXEL_UNPACK_BUFFER, ctx->texture_load_pbo);
dispatch->BufferData (GL_PIXEL_UNPACK_BUFFER,
tex_width * sizeof (uint32_t), 0, GL_STREAM_DRAW);
data = dispatch->MapBuffer (GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY);
status = _cairo_gl_gradient_render (ctx, n_stops, stops, data, tex_width);
dispatch->UnmapBuffer (GL_PIXEL_UNPACK_BUFFER);
if (unlikely (status)) {
dispatch->BindBuffer (GL_PIXEL_UNPACK_BUFFER, 0);
free (gradient);
return status;
}
glTexImage2D (ctx->tex_target, 0, GL_RGBA8, tex_width, 1, 0,
GL_BGRA, GL_UNSIGNED_BYTE, 0);
else
dispatch->BindBuffer (GL_PIXEL_UNPACK_BUFFER, 0);
}
else {
data = _cairo_malloc_ab (tex_width, sizeof (uint32_t));
status = _cairo_gl_gradient_render (ctx, n_stops, stops, data, tex_width);
glTexImage2D (ctx->tex_target, 0, GL_BGRA, tex_width, 1, 0,
GL_BGRA, GL_UNSIGNED_BYTE, data);
dispatch->BindBuffer (GL_PIXEL_UNPACK_BUFFER, 0);
free (data);
}
/* we ignore errors here and just return an uncached gradient */
if (likely (! _cairo_cache_insert (&ctx->gradients, &gradient->cache_entry)))