OSDN Git Service

i965: Use _mesa_NamedBufferSubData for users of _mesa_meta_setup_vertex_objects
authorIan Romanick <ian.d.romanick@intel.com>
Tue, 3 Nov 2015 03:10:08 +0000 (19:10 -0800)
committerIan Romanick <ian.d.romanick@intel.com>
Tue, 24 Nov 2015 19:50:29 +0000 (11:50 -0800)
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
(cherry picked from commit ed0bd6573b6ce83471e73d009dbab5220f9e80c0)

src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c

index aa6df16..6f64b54 100644 (file)
@@ -360,7 +360,7 @@ adjust_mip_level(const struct intel_mipmap_tree *mt,
 }
 
 static void
-prepare_vertex_data(void)
+prepare_vertex_data(GLuint vbo)
 {
    static const struct vertex verts[] = {
       { .x = -1.0f, .y = -1.0f },
@@ -368,7 +368,7 @@ prepare_vertex_data(void)
       { .x =  1.0f, .y =  1.0f },
       { .x = -1.0f, .y =  1.0f } };
 
-   _mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
+   _mesa_NamedBufferSubData(vbo, 0, sizeof(verts), verts);
 }
 
 static bool
@@ -448,7 +448,7 @@ brw_meta_stencil_blit(struct brw_context *brw,
    _mesa_Uniform1i(_mesa_GetUniformLocation(prog, "dst_num_samples"),
                    dst_mt->num_samples);
 
-   prepare_vertex_data();
+   prepare_vertex_data(ctx->Meta->Blit.VBO);
    _mesa_set_viewport(ctx, 0, dims.dst_x0, dims.dst_y0,
                       dims.dst_x1 - dims.dst_x0, dims.dst_y1 - dims.dst_y0);
    _mesa_ColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);