gallium: add usage parameter to pipe_buffer_create

[mesa.git] / src / gallium / tests / trivial / quad-tex.c

diff --git a/src/gallium/tests/trivial/quad-tex.c b/src/gallium/tests/trivial/quad-tex.c
index 522ff3cb42de8ec20c97b6cff26f51e3fa71901d..af93e09d8d4ecd8a45b0130de3e3ecec6f821db5 100644 (file)
--- a/src/gallium/tests/trivial/quad-tex.c
+++ b/src/gallium/tests/trivial/quad-tex.c
@@ -58,18 +58,13 @@
 /* util_make_[fragment|vertex]_passthrough_shader */
 #include "util/u_simple_shaders.h"
 
-/* softpipe software driver */
-#include "softpipe/sp_public.h"
-
+/* sw_screen_create: to get a software pipe driver */
+#include "target-helpers/inline_sw_helper.h"
+/* debug_screen_wrap: to wrap with debug pipe drivers */
+#include "target-helpers/inline_debug_helper.h"
 /* null software winsys */
 #include "sw/null/null_sw_winsys.h"
 
-/* traceing support see src/gallium/drivers/trace/README for more info. */
-#if USE_TRACE
-#include "trace/tr_screen.h"
-#include "trace/tr_context.h"
-#endif
-
 struct program
 {
        struct pipe_screen *screen;
@@ -97,11 +92,13 @@ struct program
 
 static void init_prog(struct program *p)
 {
+       struct pipe_surface surf_tmpl;
        /* create the software rasterizer */
-       p->screen = softpipe_create_screen(null_sw_create());
-#if USE_TRACE
-       p->screen = trace_screen_create(p->screen);
-#endif
+       p->screen = sw_screen_create(null_sw_create());
+       /* wrap the screen with any debugger */
+       p->screen = debug_screen_wrap(p->screen);
+
+       /* create the pipe driver context and cso context */
        p->pipe = p->screen->context_create(p->screen, NULL);
        p->cso = cso_create_context(p->pipe);
 
@@ -132,7 +129,8 @@ static void init_prog(struct program *p)
                        }
                };
 
-               p->vbuf = pipe_buffer_create(p->screen, PIPE_BIND_VERTEX_BUFFER, sizeof(vertices));
+               p->vbuf = pipe_buffer_create(p->screen, PIPE_BIND_VERTEX_BUFFER,
+                                            PIPE_USAGE_STATIC, sizeof(vertices));
                pipe_buffer_write(p->pipe, p->vbuf, 0, sizeof(vertices), vertices);
        }
 
@@ -145,6 +143,7 @@ static void init_prog(struct program *p)
                tmplt.width0 = WIDTH;
                tmplt.height0 = HEIGHT;
                tmplt.depth0 = 1;
+               tmplt.array_size = 1;
                tmplt.last_level = 0;
                tmplt.bind = PIPE_BIND_RENDER_TARGET;
 
@@ -157,7 +156,6 @@ static void init_prog(struct program *p)
                struct pipe_transfer *t;
                struct pipe_resource t_tmplt;
                struct pipe_sampler_view v_tmplt;
-               struct pipe_subresource sub;
                struct pipe_box box;
 
                memset(&t_tmplt, 0, sizeof(t_tmplt));
@@ -166,17 +164,17 @@ static void init_prog(struct program *p)
                t_tmplt.width0 = 2;
                t_tmplt.height0 = 2;
                t_tmplt.depth0 = 1;
+               t_tmplt.array_size = 1;
                t_tmplt.last_level = 0;
                t_tmplt.bind = PIPE_BIND_RENDER_TARGET;
 
                p->tex = p->screen->resource_create(p->screen, &t_tmplt);
 
-               memset(&sub, 0, sizeof(sub));
                memset(&box, 0, sizeof(box));
                box.width = 2;
                box.height = 2;
 
-               t = p->pipe->get_transfer(p->pipe, p->tex, sub, PIPE_TRANSFER_WRITE, &box);
+               t = p->pipe->get_transfer(p->pipe, p->tex, 0, PIPE_TRANSFER_WRITE, &box);
 
                ptr = p->pipe->transfer_map(p->pipe, t);
                ptr[0] = 0xffff0000;
@@ -201,8 +199,7 @@ static void init_prog(struct program *p)
 
        /* rasterizer */
        memset(&p->rasterizer, 0, sizeof(p->rasterizer));
-       p->rasterizer.front_winding = PIPE_WINDING_CW;
-       p->rasterizer.cull_mode = PIPE_WINDING_NONE;
+       p->rasterizer.cull_face = PIPE_FACE_NONE;
        p->rasterizer.gl_rasterization_rules = 1;
 
        /* sampler */
@@ -215,12 +212,17 @@ static void init_prog(struct program *p)
        p->sampler.mag_img_filter = PIPE_TEX_MIPFILTER_LINEAR;
        p->sampler.normalized_coords = 1;
 
+       surf_tmpl.format = templat.format;
+       surf_tmpl.usage = PIPE_BIND_RENDER_TARGET;
+       surf_tmpl.u.tex.level = 0;
+       surf_tmpl.u.tex.first_layer = 0;
+       surf_tmpl.u.tex.last_layer = 0;
        /* drawing destination */
        memset(&p->framebuffer, 0, sizeof(p->framebuffer));
        p->framebuffer.width = WIDTH;
        p->framebuffer.height = HEIGHT;
        p->framebuffer.nr_cbufs = 1;
-       p->framebuffer.cbufs[0] = p->screen->get_tex_surface(p->screen, p->target, 0, 0, 0, PIPE_BIND_RENDER_TARGET);
+       p->framebuffer.cbufs[0] = p->pipe->create_surface(p->pipe, p->target, &surf_tmpl);
 
        /* viewport, depth isn't really needed */
        {
@@ -272,7 +274,7 @@ static void init_prog(struct program *p)
        }
 
        /* fragment shader */
-       p->fs = util_make_fragment_tex_shader(p->pipe, TGSI_TEXTURE_2D);
+       p->fs = util_make_fragment_tex_shader(p->pipe, TGSI_TEXTURE_2D, TGSI_INTERPOLATE_LINEAR);
 }
 
 static void close_prog(struct program *p)