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_clear.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_clear.c')
-rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_clear.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_clear.c b/mesalib/src/mesa/state_tracker/st_cb_clear.c index 90eb0af4f..4aa0bc18f 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_clear.c +++ b/mesalib/src/mesa/state_tracker/st_cb_clear.c @@ -176,7 +176,9 @@ draw_quad(struct st_context *st, /* draw */ util_draw_vertex_buffer(pipe, st->cso_context, - vbuf, offset, + vbuf, + cso_get_aux_vertex_buffer_slot(st->cso_context), + offset, PIPE_PRIM_TRIANGLE_FAN, 4, /* verts */ 2); /* attribs/vert */ @@ -225,7 +227,7 @@ clear_with_quad(struct gl_context *ctx, cso_save_vertex_shader(st->cso_context); cso_save_geometry_shader(st->cso_context); cso_save_vertex_elements(st->cso_context); - cso_save_vertex_buffers(st->cso_context); + cso_save_aux_vertex_buffer_slot(st->cso_context); /* blend state: RGBA masking */ { @@ -325,7 +327,7 @@ clear_with_quad(struct gl_context *ctx, cso_restore_vertex_shader(st->cso_context); cso_restore_geometry_shader(st->cso_context); cso_restore_vertex_elements(st->cso_context); - cso_restore_vertex_buffers(st->cso_context); + cso_restore_aux_vertex_buffer_slot(st->cso_context); cso_restore_stream_outputs(st->cso_context); } |