radeonsi: fix user fence space when MCBP is enabled

[mesa.git] / src / gallium / auxiliary / renderonly / renderonly.h

diff --git a/src/gallium/auxiliary/renderonly/renderonly.h b/src/gallium/auxiliary/renderonly/renderonly.h
index 70641c45878a11e654bb0ca95b579087c218c5c6..fe13fea1495b437c39b7703f9a6264eb21926323 100644 (file)
--- a/src/gallium/auxiliary/renderonly/renderonly.h
+++ b/src/gallium/auxiliary/renderonly/renderonly.h
@@ -28,14 +28,12 @@
 #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 {
    uint32_t handle;
    uint32_t stride;
-
-   struct pipe_resource *prime;
 };
 
 struct renderonly {
@@ -59,7 +57,8 @@ struct renderonly {
     *   to be done in flush_resource(..) like a resolve to linear.
     */
    struct renderonly_scanout *(*create_for_resource)(struct pipe_resource *rsc,
-                                                     struct renderonly *ro);
+                                                     struct renderonly *ro,
+                                                     struct winsys_handle *out_handle);
    int kms_fd;
    int gpu_fd;
 };
@@ -68,14 +67,13 @@ struct renderonly *
 renderonly_dup(const struct renderonly *ro);
 
 static inline struct renderonly_scanout *
-renderonly_scanout_for_resource(struct pipe_resource *rsc, struct renderonly *ro)
+renderonly_scanout_for_resource(struct pipe_resource *rsc,
+                                struct renderonly *ro,
+                                struct winsys_handle *out_handle)
 {
-   return ro->create_for_resource(rsc, ro);
+   return ro->create_for_resource(rsc, ro, out_handle);
 }
 
-struct renderonly_scanout *
-renderonly_scanout_for_prime(struct pipe_resource *rsc, struct renderonly *ro);
-
 void
 renderonly_scanout_destroy(struct renderonly_scanout *scanout,
                           struct renderonly *ro);
@@ -87,7 +85,7 @@ renderonly_get_handle(struct renderonly_scanout *scanout,
    if (!scanout)
       return FALSE;
 
-   assert(handle->type == DRM_API_HANDLE_TYPE_KMS);
+   assert(handle->type == WINSYS_HANDLE_TYPE_KMS);
    handle->handle = scanout->handle;
    handle->stride = scanout->stride;
 
@@ -99,13 +97,15 @@ renderonly_get_handle(struct renderonly_scanout *scanout,
  */
 struct renderonly_scanout *
 renderonly_create_kms_dumb_buffer_for_resource(struct pipe_resource *rsc,
-                                               struct renderonly *ro);
+                                               struct renderonly *ro,
+                                               struct winsys_handle *out_handle);
 
 /**
  * Import GPU resource into scanout hw.
  */
 struct renderonly_scanout *
 renderonly_create_gpu_import_for_resource(struct pipe_resource *rsc,
-                                          struct renderonly *ro);
+                                          struct renderonly *ro,
+                                          struct winsys_handle *out_handle);
 
 #endif /* RENDERONLY_H_ */