gallium: remove PIPE_USAGE_STATIC

[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 6c38b1096c189ec0e6650092df97c77a1dba4a7d..1d52aff34396235d98c41dec22a59a6ac3d1450c 100644 (file)
--- a/src/gallium/tests/trivial/quad-tex.c
+++ b/src/gallium/tests/trivial/quad-tex.c
@@ -57,16 +57,12 @@
 #include "util/u_memory.h"
 /* util_make_[fragment|vertex]_passthrough_shader */
 #include "util/u_simple_shaders.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"
+/* to get a hardware pipe driver */
+#include "pipe-loader/pipe_loader.h"
 
 struct program
 {
+       struct pipe_loader_device *dev;
        struct pipe_screen *screen;
        struct pipe_context *pipe;
        struct cso_context *cso;
@@ -82,7 +78,7 @@ struct program
        void *vs;
        void *fs;
 
-       float clear_color[4];
+       union pipe_color_union clear_color;
 
        struct pipe_resource *vbuf;
        struct pipe_resource *target;
@@ -93,20 +89,25 @@ struct program
 static void init_prog(struct program *p)
 {
        struct pipe_surface surf_tmpl;
-       /* create the software rasterizer */
-       p->screen = sw_screen_create(null_sw_create());
-       /* wrap the screen with any debugger */
-       p->screen = debug_screen_wrap(p->screen);
+       int ret;
+
+       /* find a hardware device */
+       ret = pipe_loader_probe(&p->dev, 1);
+       assert(ret);
+
+       /* init a pipe screen */
+       p->screen = pipe_loader_create_screen(p->dev, PIPE_SEARCH_DIR);
+       assert(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);
 
        /* set clear color */
-       p->clear_color[0] = 0.3;
-       p->clear_color[1] = 0.1;
-       p->clear_color[2] = 0.3;
-       p->clear_color[3] = 1.0;
+       p->clear_color.f[0] = 0.3;
+       p->clear_color.f[1] = 0.1;
+       p->clear_color.f[2] = 0.3;
+       p->clear_color.f[3] = 1.0;
 
        /* vertex buffer */
        {
@@ -130,7 +131,7 @@ static void init_prog(struct program *p)
                };
 
                p->vbuf = pipe_buffer_create(p->screen, PIPE_BIND_VERTEX_BUFFER,
-                                            PIPE_USAGE_STATIC, sizeof(vertices));
+                                            PIPE_USAGE_DEFAULT, sizeof(vertices));
                pipe_buffer_write(p->pipe, p->vbuf, 0, sizeof(vertices), vertices);
        }
 
@@ -174,17 +175,13 @@ static void init_prog(struct program *p)
                box.width = 2;
                box.height = 2;
 
-               t = p->pipe->get_transfer(p->pipe, p->tex, 0, PIPE_TRANSFER_WRITE, &box);
-
-               ptr = p->pipe->transfer_map(p->pipe, t);
+               ptr = p->pipe->transfer_map(p->pipe, p->tex, 0, PIPE_TRANSFER_WRITE, &box, &t);
                ptr[0] = 0xffff0000;
                ptr[1] = 0xff0000ff;
                ptr[2] = 0xff00ff00;
                ptr[3] = 0xffffff00;
                p->pipe->transfer_unmap(p->pipe, t);
 
-               p->pipe->transfer_destroy(p->pipe, t);
-
                u_sampler_view_default_template(&v_tmplt, p->tex, p->tex->format);
 
                p->view = p->pipe->create_sampler_view(p->pipe, p->tex, &v_tmplt);
@@ -200,7 +197,9 @@ static void init_prog(struct program *p)
        /* rasterizer */
        memset(&p->rasterizer, 0, sizeof(p->rasterizer));
        p->rasterizer.cull_face = PIPE_FACE_NONE;
-       p->rasterizer.gl_rasterization_rules = 1;
+       p->rasterizer.half_pixel_center = 1;
+       p->rasterizer.bottom_edge_rule = 1;
+       p->rasterizer.depth_clip = 1;
 
        /* sampler */
        memset(&p->sampler, 0, sizeof(p->sampler));
@@ -213,7 +212,6 @@ static void init_prog(struct program *p)
        p->sampler.normalized_coords = 1;
 
        surf_tmpl.format = PIPE_FORMAT_B8G8R8A8_UNORM; /* All drivers support this */
-       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;
@@ -280,7 +278,7 @@ static void init_prog(struct program *p)
 static void close_prog(struct program *p)
 {
        /* unset bound textures as well */
-       cso_set_fragment_sampler_views(p->cso, 0, NULL);
+       cso_set_sampler_views(p->cso, PIPE_SHADER_FRAGMENT, 0, NULL);
 
        /* unset all state */
        cso_release_all(p->cso);
@@ -297,6 +295,7 @@ static void close_prog(struct program *p)
        cso_destroy_context(p->cso);
        p->pipe->destroy(p->pipe);
        p->screen->destroy(p->screen);
+       pipe_loader_release(&p->dev, 1);
 
        FREE(p);
 }
@@ -307,7 +306,7 @@ static void draw(struct program *p)
        cso_set_framebuffer(p->cso, &p->framebuffer);
 
        /* clear the render target */
-       p->pipe->clear(p->pipe, PIPE_CLEAR_COLOR, p->clear_color, 0, 0);
+       p->pipe->clear(p->pipe, PIPE_CLEAR_COLOR, &p->clear_color, 0, 0);
 
        /* set misc state we care about */
        cso_set_blend(p->cso, &p->blend);
@@ -316,11 +315,11 @@ static void draw(struct program *p)
        cso_set_viewport(p->cso, &p->viewport);
 
        /* sampler */
-       cso_single_sampler(p->cso, 0, &p->sampler);
-       cso_single_sampler_done(p->cso);
+       cso_single_sampler(p->cso, PIPE_SHADER_FRAGMENT, 0, &p->sampler);
+       cso_single_sampler_done(p->cso, PIPE_SHADER_FRAGMENT);
 
        /* texture sampler view */
-       cso_set_fragment_sampler_views(p->cso, 1, &p->view);
+       cso_set_sampler_views(p->cso, PIPE_SHADER_FRAGMENT, 1, &p->view);
 
        /* shaders */
        cso_set_fragment_shader_handle(p->cso, p->fs);
@@ -330,12 +329,12 @@ static void draw(struct program *p)
        cso_set_vertex_elements(p->cso, 2, p->velem);
 
        util_draw_vertex_buffer(p->pipe, p->cso,
-                               p->vbuf, 0,
+                               p->vbuf, 0, 0,
                                PIPE_PRIM_QUADS,
                                4,  /* verts */
                                2); /* attribs/vert */
 
-        p->pipe->flush(p->pipe, NULL);
+        p->pipe->flush(p->pipe, NULL, 0);
 
        debug_dump_surface_bmp(p->pipe, "result.bmp", p->framebuffer.cbufs[0]);
 }