Merge branch 'gallium-polygon-stipple'

[mesa.git] / src / gallium / tests / trivial / tri.c

diff --git a/src/gallium/tests/trivial/tri.c b/src/gallium/tests/trivial/tri.c
index bfd2f3ca9a35a956f59c593500d2e079ebf63469..656e92ee8861abaa7fe150938777d83e22dcbd66 100644 (file)
--- a/src/gallium/tests/trivial/tri.c
+++ b/src/gallium/tests/trivial/tri.c
@@ -153,7 +153,7 @@ static void init_prog(struct program *p)
        p->rasterizer.cull_face = PIPE_FACE_NONE;
        p->rasterizer.gl_rasterization_rules = 1;
 
-       surf_tmpl.format = templat.format;
+       surf_tmpl.format = PIPE_FORMAT_B8G8R8A8_UNORM;
        surf_tmpl.usage = PIPE_BIND_RENDER_TARGET;
        surf_tmpl.u.tex.level = 0;
        surf_tmpl.u.tex.first_layer = 0;
@@ -258,7 +258,7 @@ static void draw(struct program *p)
        /* vertex element data */
        cso_set_vertex_elements(p->cso, 2, p->velem);
 
-       util_draw_vertex_buffer(p->pipe,
+       util_draw_vertex_buffer(p->pipe, p->cso,
                                p->vbuf, 0,
                                PIPE_PRIM_TRIANGLES,
                                3,  /* verts */