diff options
| author | Lucas Stach <[email protected]> | 2017-06-09 18:23:16 +0200 |
|---|---|---|
| committer | Lucas Stach <[email protected]> | 2017-07-19 16:26:49 +0200 |
| commit | c4818808991134cc7d7741c8f29dc50f6d2102a0 (patch) | |
| tree | 79added36f8a71a9687360cb024988e5822e4fe8 /src/gallium/auxiliary/renderonly/renderonly.h | |
| parent | a9fad437f7ad1c1a8c0a694c2d8b4b6ad4d32098 (diff) | |
renderonly/etnaviv: stop importing resource from renderonly
The current way of importing the resource from renderonly after allocation
is opaque and is taking away control from the driver, which it needs in
order to implement more advanced scenarios than the simple linear scanout
with matching stride alignments.
Signed-off-by: Lucas Stach <[email protected]>
Reviewed-by: Christian Gmeiner <[email protected]>
Acked-by: Daniel Stone <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary/renderonly/renderonly.h')
| -rw-r--r-- | src/gallium/auxiliary/renderonly/renderonly.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gallium/auxiliary/renderonly/renderonly.h b/src/gallium/auxiliary/renderonly/renderonly.h index 70641c45878..6a89c29e2ef 100644 --- a/src/gallium/auxiliary/renderonly/renderonly.h +++ b/src/gallium/auxiliary/renderonly/renderonly.h @@ -34,8 +34,6 @@ 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); @@ -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_ */ |