#include "virgl_protocol.h"
#include "virgl_resource.h"
#include "virgl_screen.h"
+#include "virgl_staging_mgr.h"
struct virgl_vertex_elements_state {
uint32_t handle;
/* Queries use internally created buffers and do not go through transfers.
* Index buffers are not bindable. They are not tracked.
*/
- MAYBE_UNUSED const unsigned tracked_bind = (PIPE_BIND_VERTEX_BUFFER |
+ ASSERTED const unsigned tracked_bind = (PIPE_BIND_VERTEX_BUFFER |
PIPE_BIND_CONSTANT_BUFFER |
PIPE_BIND_SHADER_BUFFER |
PIPE_BIND_SHADER_IMAGE);
}
+static void virgl_submit_cmd(struct virgl_winsys *vws,
+ struct virgl_cmd_buf *cbuf,
+ struct pipe_fence_handle **fence)
+{
+ if (unlikely(virgl_debug & VIRGL_DEBUG_SYNC)) {
+ struct pipe_fence_handle *sync_fence = NULL;
+
+ vws->submit_cmd(vws, cbuf, &sync_fence);
+
+ vws->fence_wait(vws, sync_fence, PIPE_TIMEOUT_INFINITE);
+ vws->fence_reference(vws, &sync_fence, NULL);
+ } else {
+ vws->submit_cmd(vws, cbuf, fence);
+ }
+}
+
static void virgl_flush_eq(struct virgl_context *ctx, void *closure,
struct pipe_fence_handle **fence)
{
ctx->num_draws = ctx->num_compute = 0;
virgl_transfer_queue_clear(&ctx->queue, ctx->cbuf);
- rs->vws->submit_cmd(rs->vws, ctx->cbuf, fence);
+
+ virgl_submit_cmd(rs->vws, ctx->cbuf, fence);
/* Reserve some space for transfers. */
if (ctx->encoded_transfers)
rs->vws->cmd_buf_destroy(vctx->cbuf);
if (vctx->uploader)
u_upload_destroy(vctx->uploader);
- if (vctx->transfer_uploader)
- u_upload_destroy(vctx->transfer_uploader);
+ if (vctx->supports_staging)
+ virgl_staging_destroy(&vctx->staging);
util_primconvert_destroy(vctx->primconvert);
virgl_transfer_queue_fini(&vctx->queue);
if (rs->tweak_gles_apply_bgra_dest_swizzle)
virgl_encode_tweak(vctx, virgl_tweak_gles_brga_apply_dest_swizzle, 1);
+
+ if (rs->tweak_gles_tf3_value > 0)
+ virgl_encode_tweak(vctx, virgl_tweak_gles_tf3_samples_passes_multiplier,
+ rs->tweak_gles_tf3_value);
}
struct pipe_context *virgl_context_create(struct pipe_screen *pscreen,
goto fail;
vctx->base.stream_uploader = vctx->uploader;
vctx->base.const_uploader = vctx->uploader;
- /* Use a custom/staging buffer for the transfer uploader, since we are
- * using it only for copies to other resources.
- */
+
+ /* We use a special staging buffer as the source of copy transfers. */
if ((rs->caps.caps.v2.capability_bits & VIRGL_CAP_COPY_TRANSFER) &&
vctx->encoded_transfers) {
- vctx->transfer_uploader = u_upload_create(&vctx->base, 1024 * 1024,
- PIPE_BIND_CUSTOM,
- PIPE_USAGE_STAGING,
- VIRGL_RESOURCE_FLAG_STAGING);
- if (!vctx->transfer_uploader)
- goto fail;
+ virgl_staging_init(&vctx->staging, &vctx->base, 1024 * 1024);
+ vctx->supports_staging = true;
}
vctx->hw_sub_ctx_id = rs->sub_ctx_id++;