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

gl: Unmap the vertex buffer prior to using in DaawArrays()

Browse source 
"It is an INVALID_OPERTION error to source data from a buffer object
that is currently mapped."

mesa is currently lax in this regard, but the Nvidia libGL conforms to
the spec and thus was causing failures.
This commit is contained in:
Chris Wilson 2010-05-27 20:51:55 +01:00
parent b3e15bd5c3
commit cc080a1e27
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/cairo-gl-composite.c
View file

@ -1100,11 +1100,9 @@ _cairo_gl_composite_begin (cairo_gl_context_t *ctx,
static inline void
_cairo_gl_composite_draw (cairo_gl_context_t *ctx,
cairo_gl_composite_t *setup)
cairo_gl_composite_t *setup,
unsigned int count)
{
unsigned int count = ctx->vb_offset / ctx->vertex_size;
_cairo_gl_check_error();
if (! setup->pre_shader) {
glDrawArrays (GL_TRIANGLES, 0, count);
} else {
@ -1122,16 +1120,23 @@ _cairo_gl_composite_draw (cairo_gl_context_t *ctx,
_cairo_gl_set_component_alpha_mask_operand (ctx, setup);
glDrawArrays (GL_TRIANGLES, 0, count);
}
_cairo_gl_check_error();
}
void
_cairo_gl_composite_flush (cairo_gl_context_t *ctx,
cairo_gl_composite_t *setup)
{
unsigned int count;
if (ctx->vb_offset == 0)
return;
count = ctx->vb_offset / ctx->vertex_size;
glUnmapBufferARB (GL_ARRAY_BUFFER_ARB);
ctx->vb = NULL;
ctx->vb_offset = 0;
if (setup->clip_region) {
int i, num_rectangles = cairo_region_num_rectangles (setup->clip_region);
@ -1141,15 +1146,11 @@ _cairo_gl_composite_flush (cairo_gl_context_t *ctx,
cairo_region_get_rectangle (setup->clip_region, i, &rect);
glScissor (rect.x, rect.y, rect.width, rect.height);
_cairo_gl_composite_draw (ctx, setup);
_cairo_gl_composite_draw (ctx, setup, count);
}
} else {
_cairo_gl_composite_draw (ctx, setup);
_cairo_gl_composite_draw (ctx, setup, count);
}
glUnmapBufferARB (GL_ARRAY_BUFFER_ARB);
ctx->vb = NULL;
ctx->vb_offset = 0;
}
static void