unsigned buffer_offset =
xfb_obj->Offset[buffer] / 4 +
linked_xfb_info->Outputs[i].DstOffset;
- if (brw->geometry_program) {
+ if (brw->programs[MESA_SHADER_GEOMETRY]) {
brw_update_sol_surface(
brw, xfb_obj->Buffers[buffer],
&brw->gs.base.surf_offset[surf_index],
linked_xfb_info->Buffers[buffer].Stride, buffer_offset);
}
} else {
- if (!brw->geometry_program)
+ if (!brw->programs[MESA_SHADER_GEOMETRY])
brw->ff_gs.surf_offset[surf_index] = 0;
else
brw->gs.base.surf_offset[surf_index] = 0;
/* We have two scenarios here:
* 1) We are using a geometry shader only to implement transform feedback
- * for a vertex shader (brw->geometry_program == NULL). In this case, we
- * only need surfaces for transform feedback in the GS stage.
+ * for a vertex shader (brw->programs[MESA_SHADER_GEOMETRY] == NULL).
+ * In this case, we only need surfaces for transform feedback in the
+ * GS stage.
* 2) We have a user-provided geometry shader. In this case we may need
* surfaces for transform feedback and/or other stuff, like textures,
* in the GS stage.
*/
- if (!brw->geometry_program) {
+ if (!brw->programs[MESA_SHADER_GEOMETRY]) {
/* BRW_NEW_VERTEX_PROGRAM */
prog = ctx->_Shader->CurrentProgram[MESA_SHADER_VERTEX];
if (prog) {
_mesa_init_transform_feedback_object(&brw_obj->base, name);
brw_obj->offset_bo =
- drm_intel_bo_alloc(brw->bufmgr, "transform feedback offsets", 16, 64);
+ brw_bo_alloc(brw->bufmgr, "transform feedback offsets", 16,
+ BRW_MEMZONE_OTHER);
brw_obj->prim_count_bo =
- drm_intel_bo_alloc(brw->bufmgr, "xfb primitive counts", 4096, 64);
+ brw_bo_alloc(brw->bufmgr, "xfb primitive counts", 16384,
+ BRW_MEMZONE_OTHER);
return &brw_obj->base;
}
struct brw_transform_feedback_object *brw_obj =
(struct brw_transform_feedback_object *) obj;
- for (unsigned i = 0; i < ARRAY_SIZE(obj->Buffers); i++) {
- _mesa_reference_buffer_object(ctx, &obj->Buffers[i], NULL);
- }
-
- drm_intel_bo_unreference(brw_obj->offset_bo);
- drm_intel_bo_unreference(brw_obj->prim_count_bo);
+ brw_bo_unreference(brw_obj->offset_bo);
+ brw_bo_unreference(brw_obj->prim_count_bo);
- free(brw_obj);
+ _mesa_delete_transform_feedback_object(ctx, obj);
}
/**
* Note that we expose one stream pre-Gen7, so the above is just (start, end).
*/
static void
-tally_prims_generated(struct brw_context *brw,
- struct brw_transform_feedback_object *obj)
+aggregate_transform_feedback_counter(
+ struct brw_context *brw,
+ struct brw_bo *bo,
+ struct brw_transform_feedback_counter *counter)
{
- const struct gl_context *ctx = &brw->ctx;
- const int streams = ctx->Const.MaxVertexStreams;
+ const unsigned streams = brw->ctx.Const.MaxVertexStreams;
/* If the current batch is still contributing to the number of primitives
* generated, flush it now so the results will be present when mapped.
*/
- if (drm_intel_bo_references(brw->batch.bo, obj->prim_count_bo))
+ if (brw_batch_references(&brw->batch, bo))
intel_batchbuffer_flush(brw);
- if (unlikely(brw->perf_debug && drm_intel_bo_busy(obj->prim_count_bo)))
+ if (unlikely(brw->perf_debug && brw_bo_busy(bo)))
perf_debug("Stalling for # of transform feedback primitives written.\n");
- drm_intel_bo_map(obj->prim_count_bo, false);
- uint64_t *prim_counts = obj->prim_count_bo->virtual;
+ uint64_t *prim_counts = brw_bo_map(brw, bo, MAP_READ);
+ prim_counts += counter->bo_start * streams;
- assert(obj->prim_count_buffer_index % (2 * streams) == 0);
- int pairs = obj->prim_count_buffer_index / (2 * streams);
+ for (unsigned i = counter->bo_start; i + 1 < counter->bo_end; i += 2) {
+ for (unsigned s = 0; s < streams; s++)
+ counter->accum[s] += prim_counts[streams + s] - prim_counts[s];
- for (int i = 0; i < pairs; i++) {
- for (int s = 0; s < streams; s++) {
- obj->prims_generated[s] += prim_counts[streams + s] - prim_counts[s];
- }
- prim_counts += 2 * streams; /* move to the next pair */
+ prim_counts += 2 * streams;
}
- drm_intel_bo_unmap(obj->prim_count_bo);
+ brw_bo_unmap(bo);
/* We've already gathered up the old data; we can safely overwrite it now. */
- obj->prim_count_buffer_index = 0;
+ counter->bo_start = counter->bo_end = 0;
}
/**
brw_save_primitives_written_counters(struct brw_context *brw,
struct brw_transform_feedback_object *obj)
{
+ const struct gen_device_info *devinfo = &brw->screen->devinfo;
const struct gl_context *ctx = &brw->ctx;
const int streams = ctx->Const.MaxVertexStreams;
+ assert(obj->prim_count_bo != NULL);
+
/* Check if there's enough space for a new pair of four values. */
- if (obj->prim_count_bo != NULL &&
- obj->prim_count_buffer_index + 2 * streams >= 4096 / sizeof(uint64_t)) {
- /* Gather up the results so far and release the BO. */
- tally_prims_generated(brw, obj);
+ if ((obj->counter.bo_end + 2) * streams * sizeof(uint64_t) >=
+ obj->prim_count_bo->size) {
+ aggregate_transform_feedback_counter(brw, obj->prim_count_bo,
+ &obj->previous_counter);
+ aggregate_transform_feedback_counter(brw, obj->prim_count_bo,
+ &obj->counter);
}
/* Flush any drawing so that the counters have the right values. */
brw_emit_mi_flush(brw);
/* Emit MI_STORE_REGISTER_MEM commands to write the values. */
- if (brw->gen >= 7) {
+ if (devinfo->gen >= 7) {
for (int i = 0; i < streams; i++) {
- int offset = (obj->prim_count_buffer_index + i) * sizeof(uint64_t);
+ int offset = (streams * obj->counter.bo_end + i) * sizeof(uint64_t);
brw_store_register_mem64(brw, obj->prim_count_bo,
GEN7_SO_NUM_PRIMS_WRITTEN(i),
offset);
} else {
brw_store_register_mem64(brw, obj->prim_count_bo,
GEN6_SO_NUM_PRIMS_WRITTEN,
- obj->prim_count_buffer_index * sizeof(uint64_t));
+ obj->counter.bo_end * sizeof(uint64_t));
}
/* Update where to write data to. */
- obj->prim_count_buffer_index += streams;
+ obj->counter.bo_end++;
}
static void
compute_vertices_written_so_far(struct brw_context *brw,
struct brw_transform_feedback_object *obj,
+ struct brw_transform_feedback_counter *counter,
uint64_t *vertices_written)
{
const struct gl_context *ctx = &brw->ctx;
}
/* Get the number of primitives generated. */
- tally_prims_generated(brw, obj);
+ aggregate_transform_feedback_counter(brw, obj->prim_count_bo, counter);
for (int i = 0; i < ctx->Const.MaxVertexStreams; i++) {
- vertices_written[i] = vertices_per_prim * obj->prims_generated[i];
+ vertices_written[i] = vertices_per_prim * counter->accum[i];
}
}
/**
- * Compute the number of vertices written by this transform feedback operation.
+ * Compute the number of vertices written by the last transform feedback
+ * begin/end block.
*/
-void
-brw_compute_xfb_vertices_written(struct brw_context *brw,
- struct brw_transform_feedback_object *obj)
+static void
+compute_xfb_vertices_written(struct brw_context *brw,
+ struct brw_transform_feedback_object *obj)
{
if (obj->vertices_written_valid || !obj->base.EndedAnytime)
return;
- compute_vertices_written_so_far(brw, obj, obj->vertices_written);
-
+ compute_vertices_written_so_far(brw, obj, &obj->previous_counter,
+ obj->vertices_written);
obj->vertices_written_valid = true;
}
assert(obj->EndedAnytime);
assert(stream < ctx->Const.MaxVertexStreams);
- brw_compute_xfb_vertices_written(brw, brw_obj);
+ compute_xfb_vertices_written(brw, brw_obj);
return brw_obj->vertices_written[stream];
}
struct brw_transform_feedback_object *brw_obj =
(struct brw_transform_feedback_object *) xfb_obj;
- assert(brw->gen == 6);
+ assert(brw->screen->devinfo.gen == 6);
if (ctx->_Shader->CurrentProgram[MESA_SHADER_GEOMETRY]) {
/* BRW_NEW_GEOMETRY_PROGRAM */
ADVANCE_BATCH();
}
- /* We're about to lose the information needed to compute the number of
- * vertices written during the last Begin/EndTransformFeedback section,
- * so we can't delay it any further.
- */
- brw_compute_xfb_vertices_written(brw, brw_obj);
-
- /* No primitives have been generated yet. */
- for (int i = 0; i < BRW_MAX_XFB_STREAMS; i++) {
- brw_obj->prims_generated[i] = 0;
- }
-
/* Store the starting value of the SO_NUM_PRIMS_WRITTEN counters. */
brw_save_primitives_written_counters(brw, brw_obj);
if (!obj->Paused)
brw_save_primitives_written_counters(brw, brw_obj);
+ /* We've reached the end of a transform feedback begin/end block. This
+ * means that future DrawTransformFeedback() calls will need to pick up the
+ * results of the current counter, and that it's time to roll back the
+ * current primitive counter to zero.
+ */
+ brw_obj->previous_counter = brw_obj->counter;
+ brw_reset_transform_feedback_counter(&brw_obj->counter);
+
/* EndTransformFeedback() means that we need to update the number of
* vertices written. Since it's only necessary if DrawTransformFeedback()
* is called and it means mapping a buffer object, we delay computing it
/* Reload SVBI 0 with the count of vertices written so far. */
uint64_t svbi;
- compute_vertices_written_so_far(brw, brw_obj, &svbi);
+ compute_vertices_written_so_far(brw, brw_obj, &brw_obj->counter, &svbi);
BEGIN_BATCH(4);
OUT_BATCH(_3DSTATE_GS_SVB_INDEX << 16 | (4 - 2));
projects / mesa.git / blobdiff