util/tgsi: use ASSERT_BITFIELD_SIZE() to check opcode field size

[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 6162dd0ae72ed28170ba277a0ca08e14196f0b00..2ee544a41294399f82ab0cd228aa936468652315 100644 (file)
--- a/src/gallium/tests/trivial/quad-tex.c
+++ b/src/gallium/tests/trivial/quad-tex.c
@@ -50,7 +50,7 @@
 /* u_sampler_view_default_template */
 #include "util/u_sampler.h"
 /* debug_dump_surface_bmp */
-#include "util/u_debug.h"
+#include "util/u_debug_image.h"
 /* util_draw_vertex_buffer helper */
 #include "util/u_draw_quad.h"
 /* FREE & CALLOC_STRUCT */
@@ -96,12 +96,12 @@ static void init_prog(struct program *p)
        assert(ret);
 
        /* init a pipe screen */
-       p->screen = pipe_loader_create_screen(p->dev, PIPE_SEARCH_DIR);
+       p->screen = pipe_loader_create_screen(p->dev);
        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);
+       p->pipe = p->screen->context_create(p->screen, NULL, 0);
+       p->cso = cso_create_context(p->pipe, 0);
 
        /* set clear color */
        p->clear_color.f[0] = 0.3;
@@ -131,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);
        }
 
@@ -197,7 +197,8 @@ 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 */
@@ -211,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;
@@ -243,12 +243,10 @@ static void init_prog(struct program *p)
                p->viewport.scale[0] = half_width;
                p->viewport.scale[1] = half_height * scale;
                p->viewport.scale[2] = half_depth;
-               p->viewport.scale[3] = 1.0f;
 
                p->viewport.translate[0] = half_width + x;
                p->viewport.translate[1] = (half_height + y) * scale + bias;
                p->viewport.translate[2] = half_depth + z;
-               p->viewport.translate[3] = 0.0f;
        }
 
        /* vertex elements state */
@@ -268,20 +266,20 @@ static void init_prog(struct program *p)
                const uint semantic_names[] = { TGSI_SEMANTIC_POSITION,
                                                TGSI_SEMANTIC_GENERIC };
                const uint semantic_indexes[] = { 0, 0 };
-               p->vs = util_make_vertex_passthrough_shader(p->pipe, 2, semantic_names, semantic_indexes);
+               p->vs = util_make_vertex_passthrough_shader(p->pipe, 2, semantic_names, semantic_indexes, FALSE);
        }
 
        /* fragment shader */
-       p->fs = util_make_fragment_tex_shader(p->pipe, TGSI_TEXTURE_2D, TGSI_INTERPOLATE_LINEAR);
+       p->fs = util_make_fragment_tex_shader(p->pipe, TGSI_TEXTURE_2D,
+                                             TGSI_INTERPOLATE_LINEAR,
+                                             TGSI_RETURN_TYPE_FLOAT,
+                                             TGSI_RETURN_TYPE_FLOAT, false,
+                                              false);
 }
 
 static void close_prog(struct program *p)
 {
-       /* unset bound textures as well */
-       cso_set_sampler_views(p->cso, PIPE_SHADER_FRAGMENT, 0, NULL);
-
-       /* unset all state */
-       cso_release_all(p->cso);
+       cso_destroy_context(p->cso);
 
        p->pipe->delete_vs_state(p->pipe, p->vs);
        p->pipe->delete_fs_state(p->pipe, p->fs);
@@ -292,7 +290,6 @@ static void close_prog(struct program *p)
        pipe_resource_reference(&p->tex, NULL);
        pipe_resource_reference(&p->vbuf, NULL);
 
-       cso_destroy_context(p->cso);
        p->pipe->destroy(p->pipe);
        p->screen->destroy(p->screen);
        pipe_loader_release(&p->dev, 1);
@@ -302,6 +299,8 @@ static void close_prog(struct program *p)
 
 static void draw(struct program *p)
 {
+       const struct pipe_sampler_state *samplers[] = {&p->sampler};
+
        /* set the render target */
        cso_set_framebuffer(p->cso, &p->framebuffer);
 
@@ -315,8 +314,7 @@ 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_set_samplers(p->cso, PIPE_SHADER_FRAGMENT, 1, samplers);
 
        /* texture sampler view */
        cso_set_sampler_views(p->cso, PIPE_SHADER_FRAGMENT, 1, &p->view);
@@ -329,12 +327,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]);
 }