Merge Mesa 21.1.5

8 files changed, 15 insertions, 125 deletions

diff --git a/lib/mesa/src/gallium/targets/pipe-loader/pipe.sym b/lib/mesa/src/gallium/targets/pipe-loader/pipe.sym
index 605cb83d8..3e5ef52b8 100644
--- a/lib/mesa/src/gallium/targets/pipe-loader/pipe.sym
+++ b/lib/mesa/src/gallium/targets/pipe-loader/pipe.sym
@@ -7,6 +7,7 @@
 		# due to LLVM being initialized multiple times.
 		radeon_drm_winsys_create;
 		amdgpu_winsys_create;
+		ac_init_shared_llvm_once;
 	local:
 		*;
 };
diff --git a/lib/mesa/src/gallium/targets/pipe-loader/pipe_i915.c b/lib/mesa/src/gallium/targets/pipe-loader/pipe_i915.c
index b4f5a72f2..82daf7083 100644
--- a/lib/mesa/src/gallium/targets/pipe-loader/pipe_i915.c
+++ b/lib/mesa/src/gallium/targets/pipe-loader/pipe_i915.c
@@ -1,27 +1,5 @@
 
 #include "target-helpers/inline_debug_helper.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "i915/drm/i915_drm_public.h"
 #include "i915/i915_public.h"
-
-static struct pipe_screen *
-create_screen(int fd, const struct pipe_screen_config *config)
-{
-   struct i915_winsys *iws;
-   struct pipe_screen *screen;
-
-   iws = i915_drm_winsys_create(fd);
-   if (!iws)
-      return NULL;
-
-   screen = i915_screen_create(iws);
-   if (!screen)
-      return NULL;
-
-   screen = debug_screen_wrap(screen);
-
-   return screen;
-}
-
-PUBLIC
-DRM_DRIVER_DESCRIPTOR("i915", NULL, create_screen)
diff --git a/lib/mesa/src/gallium/targets/pipe-loader/pipe_msm.c b/lib/mesa/src/gallium/targets/pipe-loader/pipe_msm.c
index 43b8f0b4e..807ac109b 100644
--- a/lib/mesa/src/gallium/targets/pipe-loader/pipe_msm.c
+++ b/lib/mesa/src/gallium/targets/pipe-loader/pipe_msm.c
@@ -1,21 +1,5 @@
 
+#include "target-helpers/drm_helper.h"
 #include "target-helpers/inline_debug_helper.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "freedreno/drm/freedreno_drm_public.h"
-
-static struct pipe_screen *
-create_screen(int fd, const struct pipe_screen_config *config)
-{
-   struct pipe_screen *screen;
-
-   screen = fd_drm_screen_create(fd, NULL);
-   if (!screen)
-      return NULL;
-
-   screen = debug_screen_wrap(screen);
-
-   return screen;
-}
-
-PUBLIC
-DRM_DRIVER_DESCRIPTOR("msm", NULL, create_screen)
diff --git a/lib/mesa/src/gallium/targets/pipe-loader/pipe_nouveau.c b/lib/mesa/src/gallium/targets/pipe-loader/pipe_nouveau.c
index 06fe95624..9ff6b8232 100644
--- a/lib/mesa/src/gallium/targets/pipe-loader/pipe_nouveau.c
+++ b/lib/mesa/src/gallium/targets/pipe-loader/pipe_nouveau.c
@@ -1,21 +1,5 @@
 
+#include "target-helpers/drm_helper.h"
 #include "target-helpers/inline_debug_helper.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "nouveau/drm/nouveau_drm_public.h"
-
-static struct pipe_screen *
-create_screen(int fd, const struct pipe_screen_config *config)
-{
-   struct pipe_screen *screen;
-
-   screen = nouveau_drm_screen_create(fd);
-   if (!screen)
-      return NULL;
-
-   screen = debug_screen_wrap(screen);
-
-   return screen;
-}
-
-PUBLIC
-DRM_DRIVER_DESCRIPTOR("nouveau", NULL, create_screen)
diff --git a/lib/mesa/src/gallium/targets/pipe-loader/pipe_r300.c b/lib/mesa/src/gallium/targets/pipe-loader/pipe_r300.c
index 17b310ee1..81cc13a34 100644
--- a/lib/mesa/src/gallium/targets/pipe-loader/pipe_r300.c
+++ b/lib/mesa/src/gallium/targets/pipe-loader/pipe_r300.c
@@ -1,17 +1,6 @@
+#include "target-helpers/drm_helper.h"
 #include "target-helpers/inline_debug_helper.h"
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "radeon/drm/radeon_drm_public.h"
 #include "radeon/radeon_winsys.h"
 #include "r300/r300_public.h"
-
-static struct pipe_screen *
-create_screen(int fd, const struct pipe_screen_config *config)
-{
-   struct radeon_winsys *sws;
-
-   sws = radeon_drm_winsys_create(fd, config, r300_screen_create);
-   return sws ? debug_screen_wrap(sws->screen) : NULL;
-}
-
-PUBLIC
-DRM_DRIVER_DESCRIPTOR("r300", NULL, create_screen)
diff --git a/lib/mesa/src/gallium/targets/pipe-loader/pipe_r600.c b/lib/mesa/src/gallium/targets/pipe-loader/pipe_r600.c
index 855aa9e4b..3c07d6f70 100644
--- a/lib/mesa/src/gallium/targets/pipe-loader/pipe_r600.c
+++ b/lib/mesa/src/gallium/targets/pipe-loader/pipe_r600.c
@@ -1,17 +1,6 @@
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
+#include "target-helpers/drm_helper.h"
 #include "target-helpers/inline_debug_helper.h"
 #include "radeon/drm/radeon_drm_public.h"
 #include "radeon/radeon_winsys.h"
 #include "r600/r600_public.h"
-
-static struct pipe_screen *
-create_screen(int fd, const struct pipe_screen_config *config)
-{
-   struct radeon_winsys *rw;
-
-   rw = radeon_drm_winsys_create(fd, config, r600_screen_create);
-   return rw ? debug_screen_wrap(rw->screen) : NULL;
-}
-
-PUBLIC
-DRM_DRIVER_DESCRIPTOR("r600", NULL, create_screen)
diff --git a/lib/mesa/src/gallium/targets/pipe-loader/pipe_radeonsi.c b/lib/mesa/src/gallium/targets/pipe-loader/pipe_radeonsi.c
index 9d925c727..d783f44aa 100644
--- a/lib/mesa/src/gallium/targets/pipe-loader/pipe_radeonsi.c
+++ b/lib/mesa/src/gallium/targets/pipe-loader/pipe_radeonsi.c
@@ -1,19 +1,5 @@
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
+#include "target-helpers/drm_helper.h"
 #include "target-helpers/inline_debug_helper.h"
 #include "radeonsi/si_public.h"
-#include "util/xmlpool.h"
-
-static struct pipe_screen *
-create_screen(int fd, const struct pipe_screen_config *config)
-{
-   struct pipe_screen *screen = radeonsi_screen_create(fd, config);
-
-   return screen ? debug_screen_wrap(screen) : NULL;
-}
-
-static const char *driconf_xml =
-   #include "radeonsi/si_driinfo.h"
-   ;
-
-PUBLIC
-DRM_DRIVER_DESCRIPTOR("radeonsi", &driconf_xml, create_screen)
+#include "util/driconf.h"
diff --git a/lib/mesa/src/gallium/targets/pipe-loader/pipe_vmwgfx.c b/lib/mesa/src/gallium/targets/pipe-loader/pipe_vmwgfx.c
index a60a5e898..33d08071d 100644
--- a/lib/mesa/src/gallium/targets/pipe-loader/pipe_vmwgfx.c
+++ b/lib/mesa/src/gallium/targets/pipe-loader/pipe_vmwgfx.c
@@ -1,27 +1,6 @@
 
 #include "target-helpers/inline_debug_helper.h"
-#include "state_tracker/drm_driver.h"
+#include "target-helpers/drm_helper.h"
+#include "frontend/drm_driver.h"
 #include "svga/drm/svga_drm_public.h"
 #include "svga/svga_public.h"
-
-static struct pipe_screen *
-create_screen(int fd, const struct pipe_screen_config *config)
-{
-   struct svga_winsys_screen *sws;
-   struct pipe_screen *screen;
-
-   sws = svga_drm_winsys_screen_create(fd);
-   if (!sws)
-      return NULL;
-
-   screen = svga_screen_create(sws);
-   if (!screen)
-      return NULL;
-
-   screen = debug_screen_wrap(screen);
-
-   return screen;
-}
-
-PUBLIC
-DRM_DRIVER_DESCRIPTOR("vmwgfx", NULL, create_screen)