Import Mesa 18.3.2

8 files changed, 124 insertions, 6 deletions

diff --git a/lib/mesa/src/gallium/tests/graw/clear.c b/lib/mesa/src/gallium/tests/graw/clear.c
index 45b0cc069..2a08ae154 100644
--- a/lib/mesa/src/gallium/tests/graw/clear.c
+++ b/lib/mesa/src/gallium/tests/graw/clear.c
@@ -73,7 +73,6 @@ static void init( void )
    templat.depth0 = 1;
    templat.array_size = 1;
    templat.last_level = 0;
-   templat.nr_samples = 1;
    templat.bind = (PIPE_BIND_RENDER_TARGET |
                    PIPE_BIND_DISPLAY_TARGET);
    
diff --git a/lib/mesa/src/gallium/tests/graw/graw_util.h b/lib/mesa/src/gallium/tests/graw/graw_util.h
index 36064e18a..c919ec771 100644
--- a/lib/mesa/src/gallium/tests/graw/graw_util.h
+++ b/lib/mesa/src/gallium/tests/graw/graw_util.h
@@ -77,7 +77,6 @@ graw_util_create_window(struct graw_info *info,
       resource_temp.depth0 = 1;
       resource_temp.array_size = 1;
       resource_temp.last_level = 0;
-      resource_temp.nr_samples = 1;
       resource_temp.bind = (PIPE_BIND_RENDER_TARGET |
                             PIPE_BIND_DISPLAY_TARGET);
       info->color_buf[i] = info->screen->resource_create(info->screen,
@@ -109,7 +108,6 @@ graw_util_create_window(struct graw_info *info,
    resource_temp.depth0 = 1;
    resource_temp.array_size = 1;
    resource_temp.last_level = 0;
-   resource_temp.nr_samples = 1;
    resource_temp.bind = PIPE_BIND_DEPTH_STENCIL;
    info->zs_buf = info->screen->resource_create(info->screen, &resource_temp);
    if (!info->zs_buf) {
@@ -233,7 +231,6 @@ graw_util_create_tex2d(const struct graw_info *info,
    temp.depth0 = 1;
    temp.last_level = 0;
    temp.array_size = 1;
-   temp.nr_samples = 1;
    temp.bind = PIPE_BIND_SAMPLER_VIEW;
    
    tex = info->screen->resource_create(info->screen, &temp);
diff --git a/lib/mesa/src/gallium/tests/graw/meson.build b/lib/mesa/src/gallium/tests/graw/meson.build
new file mode 100644
index 000000000..fd416c162
--- /dev/null
+++ b/lib/mesa/src/gallium/tests/graw/meson.build
@@ -0,0 +1,36 @@
+# Copyright © 2018 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.
+
+progs = [
+  'clear', 'disasm', 'fs-fragcoord', 'fs-frontface', 'fs-test', 'fs-write-z',
+  'gs-test', 'occlusion-query', 'quad-sample', 'quad-tex', 'shader-leak',
+  'tex-srgb', 'tex-swizzle', 'tri', 'tri-large', 'tri-gs', 'tri-instanced',
+  'vs-test',
+]
+
+foreach t : progs
+  executable(
+    'graw-' + t,
+    t + '.c',
+    include_directories : inc_common,
+    link_with : [libgraw, libgraw_util, libmesa_util, libgallium],
+    dependencies : [dep_m, dep_thread]
+  )
+endforeach
diff --git a/lib/mesa/src/gallium/tests/meson.build b/lib/mesa/src/gallium/tests/meson.build
new file mode 100644
index 000000000..0ee04350c
--- /dev/null
+++ b/lib/mesa/src/gallium/tests/meson.build
@@ -0,0 +1,25 @@
+# Copyright © 2018 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.
+
+subdir('trivial')
+if with_gallium_softpipe
+  subdir('unit')
+endif
+subdir('graw')
diff --git a/lib/mesa/src/gallium/tests/trivial/Makefile.am b/lib/mesa/src/gallium/tests/trivial/Makefile.am
index 585fb699e..db9a54ff0 100644
--- a/lib/mesa/src/gallium/tests/trivial/Makefile.am
+++ b/lib/mesa/src/gallium/tests/trivial/Makefile.am
@@ -19,5 +19,7 @@ tri_SOURCES = tri.c
 
 quad_tex_SOURCES = quad-tex.c
 
+EXTRA_DIST = meson.build
+
 clean-local:
 	-rm -f result.bmp
diff --git a/lib/mesa/src/gallium/tests/trivial/meson.build b/lib/mesa/src/gallium/tests/trivial/meson.build
new file mode 100644
index 000000000..bbb25519e
--- /dev/null
+++ b/lib/mesa/src/gallium/tests/trivial/meson.build
@@ -0,0 +1,29 @@
+# Copyright © 2018 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.
+
+foreach t : ['compute', 'tri', 'quad-tex']
+  executable(
+    t,
+    '@0@.c'.format(t),
+    include_directories : inc_common,
+    link_with : [libmesa_util, libgallium, libpipe_loader_dynamic],
+    install : false,
+  )
+endforeach
diff --git a/lib/mesa/src/gallium/tests/unit/Makefile.am b/lib/mesa/src/gallium/tests/unit/Makefile.am
index c9bede75b..74d125fe4 100644
--- a/lib/mesa/src/gallium/tests/unit/Makefile.am
+++ b/lib/mesa/src/gallium/tests/unit/Makefile.am
@@ -2,7 +2,7 @@
 
 include $(top_srcdir)/src/gallium/Automake.inc
 
-EXTRA_DIST = SConscript
+EXTRA_DIST = SConscript meson.build
 
 AM_CFLAGS = \
 	$(GALLIUM_CFLAGS)
@@ -14,7 +14,6 @@ AM_CPPFLAGS = \
 LDADD = \
 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
 	$(top_builddir)/src/util/libmesautil.la \
-	$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
 	$(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
 	$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
 	$(GALLIUM_COMMON_LIB_DEPS)
diff --git a/lib/mesa/src/gallium/tests/unit/meson.build b/lib/mesa/src/gallium/tests/unit/meson.build
new file mode 100644
index 000000000..4a97810df
--- /dev/null
+++ b/lib/mesa/src/gallium/tests/unit/meson.build
@@ -0,0 +1,31 @@
+# Copyright © 2018 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.
+
+foreach t : ['pipe_barrier_test', 'u_cache_test', 'u_half_test',
+             'u_format_test', 'u_format_compatible_test', 'translate_test']
+  executable(
+    t,
+    '@0@.c'.format(t),
+    include_directories : [inc_common, inc_gallium_drivers, inc_gallium_winsys],
+    link_with : [libgallium, libmesa_util, libws_null],
+    dependencies : [driver_swrast, dep_thread],
+    install : false,
+  )
+endforeach