Import Mesa 18.3.2

7 files changed, 101 insertions, 12 deletions

diff --git a/lib/mesa/src/gallium/drivers/softpipe/Makefile.am b/lib/mesa/src/gallium/drivers/softpipe/Makefile.am
index fd77edc51..c8c2615a9 100644
--- a/lib/mesa/src/gallium/drivers/softpipe/Makefile.am
+++ b/lib/mesa/src/gallium/drivers/softpipe/Makefile.am
@@ -31,4 +31,4 @@ noinst_LTLIBRARIES = libsoftpipe.la
 
 libsoftpipe_la_SOURCES = $(C_SOURCES)
 
-EXTRA_DIST = SConscript
+EXTRA_DIST = SConscript meson.build
diff --git a/lib/mesa/src/gallium/drivers/softpipe/meson.build b/lib/mesa/src/gallium/drivers/softpipe/meson.build
new file mode 100644
index 000000000..a345ff62e
--- /dev/null
+++ b/lib/mesa/src/gallium/drivers/softpipe/meson.build
@@ -0,0 +1,89 @@
+# Copyright © 2017 Intel Corporation
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+files_softpipe = files(
+  'sp_buffer.c',
+  'sp_buffer.h',
+  'sp_clear.c',
+  'sp_clear.h',
+  'sp_context.c',
+  'sp_context.h',
+  'sp_compute.c',
+  'sp_draw_arrays.c',
+  'sp_fence.c',
+  'sp_fence.h',
+  'sp_flush.c',
+  'sp_flush.h',
+  'sp_fs_exec.c',
+  'sp_fs.h',
+  'sp_image.c',
+  'sp_image.h',
+  'sp_limits.h',
+  'sp_prim_vbuf.c',
+  'sp_prim_vbuf.h',
+  'sp_public.h',
+  'sp_quad_blend.c',
+  'sp_quad_depth_test.c',
+  'sp_quad_depth_test_tmp.h',
+  'sp_quad_fs.c',
+  'sp_quad.h',
+  'sp_quad_pipe.c',
+  'sp_quad_pipe.h',
+  'sp_quad_stipple.c',
+  'sp_query.c',
+  'sp_query.h',
+  'sp_screen.c',
+  'sp_screen.h',
+  'sp_setup.c',
+  'sp_setup.h',
+  'sp_state_blend.c',
+  'sp_state_clip.c',
+  'sp_state_derived.c',
+  'sp_state_image.c',
+  'sp_state.h',
+  'sp_state_rasterizer.c',
+  'sp_state_sampler.c',
+  'sp_state_shader.c',
+  'sp_state_so.c',
+  'sp_state_surface.c',
+  'sp_state_vertex.c',
+  'sp_surface.c',
+  'sp_surface.h',
+  'sp_tex_sample.c',
+  'sp_tex_sample.h',
+  'sp_tex_tile_cache.c',
+  'sp_tex_tile_cache.h',
+  'sp_texture.c',
+  'sp_texture.h',
+  'sp_tile_cache.c',
+  'sp_tile_cache.h',
+)
+
+libsoftpipe = static_library(
+  'softpipe',
+  files_softpipe,
+  include_directories : [inc_gallium_aux, inc_gallium, inc_include, inc_src],
+  c_args : [c_vis_args, c_msvc_compat_args],
+)
+
+driver_swrast = declare_dependency(
+  compile_args : '-DGALLIUM_SOFTPIPE',
+  link_with : libsoftpipe
+)
diff --git a/lib/mesa/src/gallium/drivers/softpipe/sp_buffer.c b/lib/mesa/src/gallium/drivers/softpipe/sp_buffer.c
index 69a6bd18c..e91d2af78 100644
--- a/lib/mesa/src/gallium/drivers/softpipe/sp_buffer.c
+++ b/lib/mesa/src/gallium/drivers/softpipe/sp_buffer.c
@@ -159,7 +159,7 @@ handle_op_uint(const struct pipe_shader_buffer *bview,
                bool just_read,
                unsigned char *data_ptr,
                uint qi,
-               unsigned opcode,
+               enum tgsi_opcode opcode,
                unsigned writemask,
                float rgba[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE],
                float rgba2[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE])
@@ -281,7 +281,7 @@ handle_op_uint(const struct pipe_shader_buffer *bview,
 static void
 sp_tgsi_op(const struct tgsi_buffer *buffer,
            const struct tgsi_buffer_params *params,
-           unsigned opcode,
+           enum tgsi_opcode opcode,
            const int s[TGSI_QUAD_SIZE],
            float rgba[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE],
            float rgba2[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE])
diff --git a/lib/mesa/src/gallium/drivers/softpipe/sp_image.c b/lib/mesa/src/gallium/drivers/softpipe/sp_image.c
index d5547e294..49b775cf0 100644
--- a/lib/mesa/src/gallium/drivers/softpipe/sp_image.c
+++ b/lib/mesa/src/gallium/drivers/softpipe/sp_image.c
@@ -384,7 +384,7 @@ handle_op_uint(const struct pipe_image_view *iview,
                char *data_ptr,
                uint qi,
                unsigned stride,
-               unsigned opcode,
+               enum tgsi_opcode opcode,
                int s,
                int t,
                float rgba[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE],
@@ -501,7 +501,7 @@ handle_op_int(const struct pipe_image_view *iview,
               char *data_ptr,
               uint qi,
               unsigned stride,
-              unsigned opcode,
+              enum tgsi_opcode opcode,
               int s,
               int t,
               float rgba[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE],
@@ -615,7 +615,7 @@ handle_op_r32f_xchg(const struct pipe_image_view *iview,
                     char *data_ptr,
                     uint qi,
                     unsigned stride,
-                    unsigned opcode,
+                    enum tgsi_opcode opcode,
                     int s,
                     int t,
                     float rgba[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE])
@@ -649,7 +649,7 @@ handle_op_r32f_xchg(const struct pipe_image_view *iview,
 static void
 sp_tgsi_op(const struct tgsi_image *image,
            const struct tgsi_image_params *params,
-           unsigned opcode,
+           enum tgsi_opcode opcode,
            const int s[TGSI_QUAD_SIZE],
            const int t[TGSI_QUAD_SIZE],
            const int r[TGSI_QUAD_SIZE],
diff --git a/lib/mesa/src/gallium/drivers/softpipe/sp_prim_vbuf.c b/lib/mesa/src/gallium/drivers/softpipe/sp_prim_vbuf.c
index 95d1ac151..1ce04a2f1 100644
--- a/lib/mesa/src/gallium/drivers/softpipe/sp_prim_vbuf.c
+++ b/lib/mesa/src/gallium/drivers/softpipe/sp_prim_vbuf.c
@@ -60,7 +60,7 @@ struct softpipe_vbuf_render
    struct softpipe_context *softpipe;
    struct setup_context *setup;
 
-   uint prim;
+   enum pipe_prim_type prim;
    uint vertex_size;
    uint nr_vertices;
    uint vertex_buffer_size;
@@ -133,7 +133,7 @@ sp_vbuf_unmap_vertices(struct vbuf_render *vbr,
 
 
 static void
-sp_vbuf_set_primitive(struct vbuf_render *vbr, unsigned prim)
+sp_vbuf_set_primitive(struct vbuf_render *vbr, enum pipe_prim_type prim)
 {
    struct softpipe_vbuf_render *cvbr = softpipe_vbuf_render(vbr);
    struct setup_context *setup_ctx = cvbr->setup;
diff --git a/lib/mesa/src/gallium/drivers/softpipe/sp_quad_depth_test.c b/lib/mesa/src/gallium/drivers/softpipe/sp_quad_depth_test.c
index 847a616f4..98dd36d21 100644
--- a/lib/mesa/src/gallium/drivers/softpipe/sp_quad_depth_test.c
+++ b/lib/mesa/src/gallium/drivers/softpipe/sp_quad_depth_test.c
@@ -803,7 +803,7 @@ depth_test_quads_fallback(struct quad_stage *qs,
       data.tile = sp_get_cached_tile(qs->softpipe->zsbuf_cache, 
                                      quads[0]->input.x0, 
                                      quads[0]->input.y0, quads[0]->input.layer);
-      data.clamp = !qs->softpipe->rasterizer->depth_clip;
+      data.clamp = !qs->softpipe->rasterizer->depth_clip_near;
 
       near_val = qs->softpipe->viewports[vp_idx].translate[2] - qs->softpipe->viewports[vp_idx].scale[2];
       far_val = near_val + (qs->softpipe->viewports[vp_idx].scale[2] * 2.0);
@@ -916,7 +916,7 @@ choose_depth_test(struct quad_stage *qs,
 
    boolean occlusion = qs->softpipe->active_query_count;
 
-   boolean clipped = !qs->softpipe->rasterizer->depth_clip;
+   boolean clipped = !qs->softpipe->rasterizer->depth_clip_near;
 
    if(!qs->softpipe->framebuffer.zsbuf)
       depth = depthwrite = stencil = FALSE;
diff --git a/lib/mesa/src/gallium/drivers/softpipe/sp_query.c b/lib/mesa/src/gallium/drivers/softpipe/sp_query.c
index 267c99977..5c9afe6fe 100644
--- a/lib/mesa/src/gallium/drivers/softpipe/sp_query.c
+++ b/lib/mesa/src/gallium/drivers/softpipe/sp_query.c
@@ -30,7 +30,7 @@
  */
 
 #include "draw/draw_context.h"
-#include "os/os_time.h"
+#include "util/os_time.h"
 #include "pipe/p_defines.h"
 #include "util/u_memory.h"
 #include "sp_context.h"