svn merge ^/branches/released .

1 files changed, 4 insertions, 1 deletions

diff --git a/mesalib/src/mesa/state_tracker/st_cb_bitmap.c b/mesalib/src/mesa/state_tracker/st_cb_bitmap.c
index ddd130a81..51623c179 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_bitmap.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_bitmap.c
@@ -349,6 +349,7 @@ setup_bitmap_vertex_data(struct st_context *st, bool normalized,
    if (!st->bitmap.vbuf) {

       st->bitmap.vbuf = pipe_buffer_create(pipe->screen, 

                                            PIPE_BIND_VERTEX_BUFFER,

+                                           PIPE_USAGE_STREAM,

                                            max_slots *

                                            sizeof(st->bitmap.vertices));

    }

@@ -456,6 +457,7 @@ draw_bitmap_quad(struct gl_context *ctx, GLint x, GLint y, GLfloat z,
    cso_save_fragment_shader(cso);

    cso_save_vertex_shader(cso);

    cso_save_vertex_elements(cso);

+   cso_save_vertex_buffers(cso);

 

    /* rasterizer state: just scissor */

    st->bitmap.rasterizer.scissor = ctx->Scissor.Enabled;

@@ -517,7 +519,7 @@ draw_bitmap_quad(struct gl_context *ctx, GLint x, GLint y, GLfloat z,
                                      sv->texture->target != PIPE_TEXTURE_RECT,

                                      x, y, width, height, z, color);

 

-   util_draw_vertex_buffer(pipe, st->bitmap.vbuf, offset,

+   util_draw_vertex_buffer(pipe, st->cso_context, st->bitmap.vbuf, offset,

                            PIPE_PRIM_TRIANGLE_FAN,

                            4,  /* verts */

                            3); /* attribs/vert */

@@ -531,6 +533,7 @@ draw_bitmap_quad(struct gl_context *ctx, GLint x, GLint y, GLfloat z,
    cso_restore_fragment_shader(cso);

    cso_restore_vertex_shader(cso);

    cso_restore_vertex_elements(cso);

+   cso_restore_vertex_buffers(cso);

 }