Import Mesa 20.0.8

4 files changed, 12 insertions, 14 deletions

diff --git a/lib/mesa/src/gallium/auxiliary/postprocess/pp_mlaa.c b/lib/mesa/src/gallium/auxiliary/postprocess/pp_mlaa.c
index 51e3e0260..e3ce5eaf0 100644
--- a/lib/mesa/src/gallium/auxiliary/postprocess/pp_mlaa.c
+++ b/lib/mesa/src/gallium/auxiliary/postprocess/pp_mlaa.c
@@ -122,7 +122,7 @@ pp_jimenezmlaa_run(struct pp_queue_t *ppq, struct pipe_resource *in,
    pp_filter_set_fb(p);
    pp_filter_misc_state(p);
    cso_set_depth_stencil_alpha(p->cso, &mstencil);
-   p->pipe->clear(p->pipe, PIPE_CLEAR_STENCIL | PIPE_CLEAR_COLOR0, NULL,
+   p->pipe->clear(p->pipe, PIPE_CLEAR_STENCIL | PIPE_CLEAR_COLOR0,
                   &p->clear_color, 0, 0);
 
    {
diff --git a/lib/mesa/src/gallium/auxiliary/postprocess/pp_private.h b/lib/mesa/src/gallium/auxiliary/postprocess/pp_private.h
index 7e63b5b2e..710909b71 100644
--- a/lib/mesa/src/gallium/auxiliary/postprocess/pp_private.h
+++ b/lib/mesa/src/gallium/auxiliary/postprocess/pp_private.h
@@ -30,7 +30,6 @@
 
 
 #include "postprocess.h"
-#include "cso_cache/cso_context.h"
 
 
 /**
@@ -49,7 +48,7 @@ struct pp_program
    struct pipe_sampler_state sampler_point;     /* point */
    struct pipe_viewport_state viewport;
    struct pipe_framebuffer_state framebuffer;
-   struct cso_velems_state velem;
+   struct pipe_vertex_element velem[2];
 
    union pipe_color_union clear_color;
 
diff --git a/lib/mesa/src/gallium/auxiliary/postprocess/pp_program.c b/lib/mesa/src/gallium/auxiliary/postprocess/pp_program.c
index 65d7f957a..4cd3990d6 100644
--- a/lib/mesa/src/gallium/auxiliary/postprocess/pp_program.c
+++ b/lib/mesa/src/gallium/auxiliary/postprocess/pp_program.c
@@ -109,15 +109,14 @@ pp_init_prog(struct pp_queue_t *ppq, struct pipe_context *pipe,
       PIPE_TEX_FILTER_NEAREST;
    p->sampler_point.normalized_coords = 1;
 
-   p->velem.count = 2;
-   p->velem.velems[0].src_offset = 0;
-   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);
-   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;
+   p->velem[0].src_offset = 0;
+   p->velem[0].instance_divisor = 0;
+   p->velem[0].vertex_buffer_index = 0;
+   p->velem[0].src_format = PIPE_FORMAT_R32G32B32A32_FLOAT;
+   p->velem[1].src_offset = 1 * 4 * sizeof(float);
+   p->velem[1].instance_divisor = 0;
+   p->velem[1].vertex_buffer_index = 0;
+   p->velem[1].src_format = PIPE_FORMAT_R32G32B32A32_FLOAT;
 
    if (!p->screen->is_format_supported(p->screen,
                                        PIPE_FORMAT_R32G32B32A32_FLOAT,
diff --git a/lib/mesa/src/gallium/auxiliary/postprocess/pp_run.c b/lib/mesa/src/gallium/auxiliary/postprocess/pp_run.c
index c6987153f..41fa7ed69 100644
--- a/lib/mesa/src/gallium/auxiliary/postprocess/pp_run.c
+++ b/lib/mesa/src/gallium/auxiliary/postprocess/pp_run.c
@@ -277,7 +277,7 @@ pp_filter_misc_state(struct pp_program *p)
    cso_set_rasterizer(p->cso, &p->rasterizer);
    cso_set_viewport(p->cso, &p->viewport);
 
-   cso_set_vertex_elements(p->cso, &p->velem);
+   cso_set_vertex_elements(p->cso, 2, p->velem);
 }
 
 /** Draw with the filter to the set output. */
@@ -300,5 +300,5 @@ void
 pp_filter_set_clear_fb(struct pp_program *p)
 {
    cso_set_framebuffer(p->cso, &p->framebuffer);
-   p->pipe->clear(p->pipe, PIPE_CLEAR_COLOR0, NULL, &p->clear_color, 0, 0);
+   p->pipe->clear(p->pipe, PIPE_CLEAR_COLOR0, &p->clear_color, 0, 0);
 }