projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util/ralloc: fix ralloc alignment.
[mesa.git]
/
src
/
gallium
/
drivers
/
virgl
/
virgl_winsys.h
diff --git
a/src/gallium/drivers/virgl/virgl_winsys.h
b/src/gallium/drivers/virgl/virgl_winsys.h
index 6346c21fafcb365e54c48a77e4393f3345027e79..97885c999550af4fb011305a26f33cd8c4fc9a13 100644
(file)
--- a/
src/gallium/drivers/virgl/virgl_winsys.h
+++ b/
src/gallium/drivers/virgl/virgl_winsys.h
@@
-31,7
+31,8
@@
struct pipe_fence_handle;
struct winsys_handle;
struct virgl_hw_res;
struct winsys_handle;
struct virgl_hw_res;
-#define VIRGL_MAX_CMDBUF_DWORDS (16*1024)
+#define VIRGL_MAX_TBUF_DWORDS 1024
+#define VIRGL_MAX_CMDBUF_DWORDS ((64 * 1024) + VIRGL_MAX_TBUF_DWORDS)
struct virgl_drm_caps {
union virgl_caps caps;
struct virgl_drm_caps {
union virgl_caps caps;
@@
-44,6
+45,8
@@
struct virgl_cmd_buf {
struct virgl_winsys {
unsigned pci_id;
struct virgl_winsys {
unsigned pci_id;
+ int supports_fences; /* In/Out fences are supported */
+ int supports_encoded_transfers; /* Encoded transfers are supported */
void (*destroy)(struct virgl_winsys *vws);
void (*destroy)(struct virgl_winsys *vws);
@@
-67,23
+70,32
@@
struct virgl_winsys {
uint32_t last_level, uint32_t nr_samples,
uint32_t size);
uint32_t last_level, uint32_t nr_samples,
uint32_t size);
- void (*resource_unref)(struct virgl_winsys *vws, struct virgl_hw_res *res);
+ void (*resource_reference)(struct virgl_winsys *qws,
+ struct virgl_hw_res **dres,
+ struct virgl_hw_res *sres);
void *(*resource_map)(struct virgl_winsys *vws, struct virgl_hw_res *res);
void (*resource_wait)(struct virgl_winsys *vws, struct virgl_hw_res *res);
void *(*resource_map)(struct virgl_winsys *vws, struct virgl_hw_res *res);
void (*resource_wait)(struct virgl_winsys *vws, struct virgl_hw_res *res);
+ boolean (*resource_is_busy)(struct virgl_winsys *vws,
+ struct virgl_hw_res *res);
struct virgl_hw_res *(*resource_create_from_handle)(struct virgl_winsys *vws,
struct virgl_hw_res *(*resource_create_from_handle)(struct virgl_winsys *vws,
- struct winsys_handle *whandle);
+ struct winsys_handle *whandle,
+ uint32_t *plane,
+ uint32_t *stride,
+ uint32_t *plane_offset,
+ uint64_t *modifier);
boolean (*resource_get_handle)(struct virgl_winsys *vws,
struct virgl_hw_res *res,
uint32_t stride,
struct winsys_handle *whandle);
boolean (*resource_get_handle)(struct virgl_winsys *vws,
struct virgl_hw_res *res,
uint32_t stride,
struct winsys_handle *whandle);
- struct virgl_cmd_buf *(*cmd_buf_create)(struct virgl_winsys *ws);
+ struct virgl_cmd_buf *(*cmd_buf_create)(struct virgl_winsys *ws
, uint32_t size
);
void (*cmd_buf_destroy)(struct virgl_cmd_buf *buf);
void (*emit_res)(struct virgl_winsys *vws, struct virgl_cmd_buf *buf, struct virgl_hw_res *res, boolean write_buffer);
void (*cmd_buf_destroy)(struct virgl_cmd_buf *buf);
void (*emit_res)(struct virgl_winsys *vws, struct virgl_cmd_buf *buf, struct virgl_hw_res *res, boolean write_buffer);
- int (*submit_cmd)(struct virgl_winsys *vws, struct virgl_cmd_buf *buf);
+ int (*submit_cmd)(struct virgl_winsys *vws, struct virgl_cmd_buf *buf,
+ struct pipe_fence_handle **fence);
boolean (*res_is_referenced)(struct virgl_winsys *vws,
struct virgl_cmd_buf *buf,
boolean (*res_is_referenced)(struct virgl_winsys *vws,
struct virgl_cmd_buf *buf,
@@
-92,7
+104,7
@@
struct virgl_winsys {
int (*get_caps)(struct virgl_winsys *vws, struct virgl_drm_caps *caps);
/* fence */
int (*get_caps)(struct virgl_winsys *vws, struct virgl_drm_caps *caps);
/* fence */
- struct pipe_fence_handle *(*cs_create_fence)(struct virgl_winsys *vws);
+ struct pipe_fence_handle *(*cs_create_fence)(struct virgl_winsys *vws
, int fd
);
bool (*fence_wait)(struct virgl_winsys *vws,
struct pipe_fence_handle *fence,
uint64_t timeout);
bool (*fence_wait)(struct virgl_winsys *vws,
struct pipe_fence_handle *fence,
uint64_t timeout);
@@
-107,6
+119,12
@@
struct virgl_winsys {
unsigned level, unsigned layer,
void *winsys_drawable_handle,
struct pipe_box *sub_box);
unsigned level, unsigned layer,
void *winsys_drawable_handle,
struct pipe_box *sub_box);
+ void (*fence_server_sync)(struct virgl_winsys *vws,
+ struct virgl_cmd_buf *cbuf,
+ struct pipe_fence_handle *fence);
+
+ int (*fence_get_fd)(struct virgl_winsys *vws,
+ struct pipe_fence_handle *fence);
};
/* this defaults all newer caps,
};
/* this defaults all newer caps,
@@
-137,5
+155,12
@@
static inline void virgl_ws_fill_new_caps_defaults(struct virgl_drm_caps *caps)
caps->caps.v2.shader_buffer_offset_alignment = 32;
caps->caps.v2.capability_bits = 0;
caps->caps.v2.max_vertex_attrib_stride = 0;
caps->caps.v2.shader_buffer_offset_alignment = 32;
caps->caps.v2.capability_bits = 0;
caps->caps.v2.max_vertex_attrib_stride = 0;
+ caps->caps.v2.max_image_samples = 0;
+ caps->caps.v2.max_compute_work_group_invocations = 0;
+ caps->caps.v2.max_compute_shared_memory_size = 0;
+ caps->caps.v2.host_feature_check_version = 0;
}
}
+
+extern enum virgl_formats pipe_to_virgl_format(enum pipe_format format);
+
#endif
#endif