Import Mesa 20.1.6

5 files changed, 8 insertions, 8 deletions

diff --git a/lib/mesa/src/gallium/winsys/virgl/common/meson.build b/lib/mesa/src/gallium/winsys/virgl/common/meson.build
index 9182b79a6..18a40f28e 100644
--- a/lib/mesa/src/gallium/winsys/virgl/common/meson.build
+++ b/lib/mesa/src/gallium/winsys/virgl/common/meson.build
@@ -22,7 +22,7 @@ libvirglcommon = static_library(
   'virglcommon',
   'virgl_resource_cache.c',
   c_args : c_vis_args,
-  include_directories : [inc_common, inc_gallium_drivers],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers],
 )
 
 dep_libvirglcommon = declare_dependency(
diff --git a/lib/mesa/src/gallium/winsys/virgl/common/virgl_resource_cache.c b/lib/mesa/src/gallium/winsys/virgl/common/virgl_resource_cache.c
index 8ec7b6b79..21ec987ba 100644
--- a/lib/mesa/src/gallium/winsys/virgl/common/virgl_resource_cache.c
+++ b/lib/mesa/src/gallium/winsys/virgl/common/virgl_resource_cache.c
@@ -45,7 +45,7 @@ static void
 virgl_resource_cache_entry_release(struct virgl_resource_cache *cache,
                                    struct virgl_resource_cache_entry *entry)
 {
-      LIST_DEL(&entry->head);
+      list_del(&entry->head);
       cache->entry_release_func(entry, cache->user_data);
 }
 
@@ -70,7 +70,7 @@ virgl_resource_cache_init(struct virgl_resource_cache *cache,
                           virgl_resource_cache_entry_release_func destroy_func,
                           void *user_data)
 {
-   LIST_INITHEAD(&cache->resources);
+   list_inithead(&cache->resources);
    cache->timeout_usecs = timeout_usecs;
    cache->entry_is_busy_func = is_busy_func;
    cache->entry_release_func = destroy_func;
@@ -91,7 +91,7 @@ virgl_resource_cache_add(struct virgl_resource_cache *cache,
 
    entry->timeout_start = now;
    entry->timeout_end = entry->timeout_start + cache->timeout_usecs;
-   LIST_ADDTAIL(&entry->head, &cache->resources);
+   list_addtail(&entry->head, &cache->resources);
 }
 
 struct virgl_resource_cache_entry *
@@ -135,7 +135,7 @@ virgl_resource_cache_remove_compatible(struct virgl_resource_cache *cache,
    }
 
    if (compat_entry)
-      LIST_DEL(&compat_entry->head);
+      list_del(&compat_entry->head);
 
    return compat_entry;
 }
diff --git a/lib/mesa/src/gallium/winsys/virgl/drm/meson.build b/lib/mesa/src/gallium/winsys/virgl/drm/meson.build
index cbb5fb9d4..0bfeafaea 100644
--- a/lib/mesa/src/gallium/winsys/virgl/drm/meson.build
+++ b/lib/mesa/src/gallium/winsys/virgl/drm/meson.build
@@ -22,6 +22,6 @@ libvirgldrm = static_library(
   'virgldrm',
   'virgl_drm_winsys.c',
   c_args : c_vis_args,
-  include_directories : [inc_common, inc_gallium_drivers],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers],
   dependencies : [dep_libdrm, dep_libvirglcommon],
 )
diff --git a/lib/mesa/src/gallium/winsys/virgl/vtest/meson.build b/lib/mesa/src/gallium/winsys/virgl/vtest/meson.build
index 9befea673..6363e62c7 100644
--- a/lib/mesa/src/gallium/winsys/virgl/vtest/meson.build
+++ b/lib/mesa/src/gallium/winsys/virgl/vtest/meson.build
@@ -22,6 +22,6 @@ libvirglvtest = static_library(
   'virglvtest',
   ['virgl_vtest_socket.c', 'virgl_vtest_winsys.c'],
   c_args : c_vis_args,
-  include_directories : [inc_common, inc_gallium_drivers],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers],
   dependencies : dep_libvirglcommon,
 )
diff --git a/lib/mesa/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c b/lib/mesa/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c
index 42a58a6dc..463bff01f 100644
--- a/lib/mesa/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c
+++ b/lib/mesa/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c
@@ -29,7 +29,7 @@
 #include <unistd.h>
 
 #include <os/os_process.h>
-#include <util/u_format.h>
+#include <util/format/u_format.h>
 
 #include "virgl_vtest_winsys.h"
 #include "virgl_vtest_public.h"