gallium/tests: Fix compiler warning about unused vars in trivial tests.

[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 df0e1301f5ef2a2e10a8743177f24beefe0f3d7c..ba0a7ac8fb33ffd827d98d2bf93d7cb9b90a76e3 100644 (file)
--- a/src/gallium/tests/trivial/quad-tex.c
+++ b/src/gallium/tests/trivial/quad-tex.c
@@ -27,8 +27,8 @@
 #define USE_TRACE 0
 #define WIDTH 300
 #define HEIGHT 300
-#define NEAR 30
-#define FAR 1000
+#define NEAR 0
+#define FAR 1
 #define FLIP 0
 
 /* pipe_*_state structs */
@@ -47,6 +47,7 @@
 /* constant state object helper */
 #include "cso_cache/cso_context.h"
 
+#include "util/macros.h"
 /* u_sampler_view_default_template */
 #include "util/u_sampler.h"
 /* debug_dump_surface_bmp */
@@ -73,7 +74,7 @@ struct program
        struct pipe_sampler_state sampler;
        struct pipe_viewport_state viewport;
        struct pipe_framebuffer_state framebuffer;
-       struct pipe_vertex_element velem[2];
+       struct cso_velems_state velem;
 
        void *vs;
        void *fs;
@@ -89,7 +90,7 @@ struct program
 static void init_prog(struct program *p)
 {
        struct pipe_surface surf_tmpl;
-       int ret;
+       ASSERTED int ret;
 
        /* find a hardware device */
        ret = pipe_loader_probe(&p->dev, 1);
@@ -174,6 +175,7 @@ static void init_prog(struct program *p)
                memset(&box, 0, sizeof(box));
                box.width = 2;
                box.height = 2;
+               box.depth = 1;
 
                ptr = p->pipe->transfer_map(p->pipe, p->tex, 0, PIPE_TRANSFER_WRITE, &box, &t);
                ptr[0] = 0xffff0000;
@@ -199,7 +201,8 @@ static void init_prog(struct program *p)
        p->rasterizer.cull_face = PIPE_FACE_NONE;
        p->rasterizer.half_pixel_center = 1;
        p->rasterizer.bottom_edge_rule = 1;
-       p->rasterizer.depth_clip = 1;
+       p->rasterizer.depth_clip_near = 1;
+       p->rasterizer.depth_clip_far = 1;
 
        /* sampler */
        memset(&p->sampler, 0, sizeof(p->sampler));
@@ -226,7 +229,7 @@ static void init_prog(struct program *p)
        {
                float x = 0;
                float y = 0;
-               float z = FAR;
+               float z = NEAR;
                float half_width = (float)WIDTH / 2.0f;
                float half_height = (float)HEIGHT / 2.0f;
                float half_depth = ((float)FAR - (float)NEAR) / 2.0f;
@@ -250,16 +253,18 @@ static void init_prog(struct program *p)
        }
 
        /* vertex elements state */
-       memset(p->velem, 0, sizeof(p->velem));
-       p->velem[0].src_offset = 0 * 4 * sizeof(float); /* offset 0, first element */
-       p->velem[0].instance_divisor = 0;
-       p->velem[0].vertex_buffer_index = 0;
-       p->velem[0].src_format = PIPE_FORMAT_R32G32B32A32_FLOAT;
+       memset(&p->velem, 0, sizeof(p->velem));
+        p->velem.count = 2;
 
-       p->velem[1].src_offset = 1 * 4 * sizeof(float); /* offset 16, second element */
-       p->velem[1].instance_divisor = 0;
-       p->velem[1].vertex_buffer_index = 0;
-       p->velem[1].src_format = PIPE_FORMAT_R32G32B32A32_FLOAT;
+       p->velem.velems[0].src_offset = 0 * 4 * sizeof(float); /* offset 0, first element */
+       p->velem.velems[0].instance_divisor = 0;
+       p->velem.velems[0].vertex_buffer_index = 0;
+       p->velem.velems[0].src_format = PIPE_FORMAT_R32G32B32A32_FLOAT;
+
+       p->velem.velems[1].src_offset = 1 * 4 * sizeof(float); /* offset 16, second element */
+       p->velem.velems[1].instance_divisor = 0;
+       p->velem.velems[1].vertex_buffer_index = 0;
+       p->velem.velems[1].src_format = PIPE_FORMAT_R32G32B32A32_FLOAT;
 
        /* vertex shader */
        {
@@ -305,7 +310,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, NULL, &p->clear_color, 0, 0);
 
        /* set misc state we care about */
        cso_set_blend(p->cso, &p->blend);
@@ -324,7 +329,7 @@ static void draw(struct program *p)
        cso_set_vertex_shader_handle(p->cso, p->vs);
 
        /* vertex element data */
-       cso_set_vertex_elements(p->cso, 2, p->velem);
+       cso_set_vertex_elements(p->cso, &p->velem);
 
        util_draw_vertex_buffer(p->pipe, p->cso,
                                p->vbuf, 0, 0,