Merge Mesa 21.1.5

2 files changed, 3 insertions, 19 deletions

diff --git a/lib/mesa/src/gallium/auxiliary/renderonly/renderonly.c b/lib/mesa/src/gallium/auxiliary/renderonly/renderonly.c
index bfb6b758f..00c8a7eeb 100644
--- a/lib/mesa/src/gallium/auxiliary/renderonly/renderonly.c
+++ b/lib/mesa/src/gallium/auxiliary/renderonly/renderonly.c
@@ -31,26 +31,12 @@
 #include <stdio.h>
 #include <xf86drm.h>
 
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "pipe/p_screen.h"
 #include "util/format/u_format.h"
 #include "util/u_inlines.h"
 #include "util/u_memory.h"
 
-struct renderonly *
-renderonly_dup(const struct renderonly *ro)
-{
-   struct renderonly *copy;
-
-   copy = CALLOC_STRUCT(renderonly);
-   if (!copy)
-      return NULL;
-
-   memcpy(copy, ro, sizeof(*ro));
-
-   return copy;
-}
-
 void
 renderonly_scanout_destroy(struct renderonly_scanout *scanout,
 			   struct renderonly *ro)
diff --git a/lib/mesa/src/gallium/auxiliary/renderonly/renderonly.h b/lib/mesa/src/gallium/auxiliary/renderonly/renderonly.h
index a8d6a686e..0d08a16e3 100644
--- a/lib/mesa/src/gallium/auxiliary/renderonly/renderonly.h
+++ b/lib/mesa/src/gallium/auxiliary/renderonly/renderonly.h
@@ -28,7 +28,7 @@
 #define RENDERONLY_H
 
 #include <stdint.h>
-#include "state_tracker/drm_driver.h"
+#include "frontend/drm_driver.h"
 #include "pipe/p_state.h"
 
 struct renderonly_scanout {
@@ -59,13 +59,11 @@ struct renderonly {
    struct renderonly_scanout *(*create_for_resource)(struct pipe_resource *rsc,
                                                      struct renderonly *ro,
                                                      struct winsys_handle *out_handle);
+   void (*destroy)(struct renderonly *ro);
    int kms_fd;
    int gpu_fd;
 };
 
-struct renderonly *
-renderonly_dup(const struct renderonly *ro);
-
 static inline struct renderonly_scanout *
 renderonly_scanout_for_resource(struct pipe_resource *rsc,
                                 struct renderonly *ro,