Browse Source

iris: actually pin the buffers

tags/19.1-branchpoint
Kenneth Graunke 7 years ago
parent
commit
7b8c0f058e
2 changed files with 16 additions and 1 deletions
  1. 2
    1
      src/gallium/drivers/iris/iris_context.h
  2. 14
    0
      src/gallium/drivers/iris/iris_state.c

+ 2
- 1
src/gallium/drivers/iris/iris_context.h View File

@@ -285,8 +285,9 @@ struct iris_context {
unsigned num_samplers[MESA_SHADER_STAGES];
unsigned num_textures[MESA_SHADER_STAGES];

/** 3DSTATE_STREAMOUT and 3DSTATE_SO_DECL_LIST packets */
struct pipe_stream_output_target *so_target[PIPE_MAX_SO_BUFFERS];
bool streamout_active;
/** 3DSTATE_STREAMOUT and 3DSTATE_SO_DECL_LIST packets */
uint32_t *streamout;

struct iris_state_ref unbound_tex;

+ 14
- 0
src/gallium/drivers/iris/iris_state.c View File

@@ -1708,6 +1708,11 @@ iris_set_stream_output_targets(struct pipe_context *ctx,
ice->state.dirty |= IRIS_DIRTY_STREAMOUT;
}

for (int i = 0; i < 4; i++) {
pipe_so_target_reference(&ice->state.so_target[i],
i < num_targets ? targets[i] : NULL);
}

/* No need to update 3DSTATE_SO_BUFFER unless SOL is active. */
if (!active)
return;
@@ -2893,6 +2898,15 @@ iris_upload_render_state(struct iris_context *ice,
if (dirty & IRIS_DIRTY_SO_BUFFERS) {
iris_batch_emit(batch, genx->so_buffers,
4 * 4 * GENX(3DSTATE_SO_BUFFER_length));
for (int i = 0; i < 4; i++) {
struct iris_stream_output_target *tgt =
(void *) ice->state.so_target[i];
if (tgt) {
iris_use_pinned_bo(batch, iris_resource_bo(tgt->base.buffer),
true);
iris_use_pinned_bo(batch, iris_resource_bo(tgt->offset.res), true);
}
}
}

if ((dirty & IRIS_DIRTY_SO_DECL_LIST) && ice->state.streamout) {

Loading…
Cancel
Save