diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-31 09:31:38 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-31 09:31:38 +0100 |
| commit | 5b22d4d5511efbd4fb0658c370edadd39829e39b (patch) | |
| tree | 96a36b429ff2a0819653279a5e63a1bed79d4434 /mesalib/src/mesa/state_tracker/st_cb_bitmap.c | |
| parent | 7bc456b7052b9591a58bfb6b509abb09d5464990 (diff) | |
| parent | 67c290de36ddc1caae94c0892157ac16b90e4f99 (diff) | |
| download | vcxsrv-5b22d4d5511efbd4fb0658c370edadd39829e39b.tar.gz vcxsrv-5b22d4d5511efbd4fb0658c370edadd39829e39b.tar.bz2 vcxsrv-5b22d4d5511efbd4fb0658c370edadd39829e39b.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa git update 31 oct 2012
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_cb_bitmap.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_bitmap.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_bitmap.c b/mesalib/src/mesa/state_tracker/st_cb_bitmap.c index b024ef0db..843dc5be3 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_bitmap.c +++ b/mesalib/src/mesa/state_tracker/st_cb_bitmap.c @@ -457,7 +457,7 @@ draw_bitmap_quad(struct gl_context *ctx, GLint x, GLint y, GLfloat z, cso_save_vertex_shader(cso); cso_save_geometry_shader(cso); cso_save_vertex_elements(cso); - cso_save_vertex_buffers(cso); + cso_save_aux_vertex_buffer_slot(cso); /* rasterizer state: just scissor */ st->bitmap.rasterizer.scissor = ctx->Scissor.Enabled; @@ -526,7 +526,9 @@ draw_bitmap_quad(struct gl_context *ctx, GLint x, GLint y, GLfloat z, x, y, width, height, z, color, &vbuf, &offset); if (vbuf) { - util_draw_vertex_buffer(pipe, st->cso_context, vbuf, offset, + util_draw_vertex_buffer(pipe, st->cso_context, vbuf, + cso_get_aux_vertex_buffer_slot(st->cso_context), + offset, PIPE_PRIM_TRIANGLE_FAN, 4, /* verts */ 3); /* attribs/vert */ @@ -541,7 +543,7 @@ draw_bitmap_quad(struct gl_context *ctx, GLint x, GLint y, GLfloat z, cso_restore_vertex_shader(cso); cso_restore_geometry_shader(cso); cso_restore_vertex_elements(cso); - cso_restore_vertex_buffers(cso); + cso_restore_aux_vertex_buffer_slot(cso); cso_restore_stream_outputs(cso); pipe_resource_reference(&vbuf, NULL); |