diff options
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.h | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_primitive_restart.c | 12 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_queryobj.c | 4 |
3 files changed, 18 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index 2c9f5adc771..8d519e762b6 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -1038,6 +1038,8 @@ struct brw_context uint32_t offset_0_batch_start; uint32_t primitives_generated; uint32_t primitives_written; + bool counting_primitives_generated; + bool counting_primitives_written; } sol; uint32_t render_target_format[MESA_FORMAT_COUNT]; diff --git a/src/mesa/drivers/dri/i965/brw_primitive_restart.c b/src/mesa/drivers/dri/i965/brw_primitive_restart.c index 962ff18fede..02deba4fbb6 100644 --- a/src/mesa/drivers/dri/i965/brw_primitive_restart.c +++ b/src/mesa/drivers/dri/i965/brw_primitive_restart.c @@ -69,6 +69,18 @@ can_cut_index_handle_prims(struct gl_context *ctx, GLuint nr_prims, const struct _mesa_index_buffer *ib) { + struct brw_context *brw = brw_context(ctx); + + if (brw->sol.counting_primitives_generated || + brw->sol.counting_primitives_written) { + /* Counting primitives generated in hardware is not currently + * supported, so take the software path. We need to investigate + * the *_PRIMITIVES_COUNT registers to allow this to be handled + * entirely in hardware. + */ + return false; + } + if (!can_cut_index_handle_restart_index(ctx, ib)) { /* The primitive restart index can't be handled, so take * the software path diff --git a/src/mesa/drivers/dri/i965/brw_queryobj.c b/src/mesa/drivers/dri/i965/brw_queryobj.c index 72b83f45708..240fe32bdc5 100644 --- a/src/mesa/drivers/dri/i965/brw_queryobj.c +++ b/src/mesa/drivers/dri/i965/brw_queryobj.c @@ -171,6 +171,7 @@ brw_begin_query(struct gl_context *ctx, struct gl_query_object *q) * it a software counter. So just reset the counter. */ brw->sol.primitives_generated = 0; + brw->sol.counting_primitives_generated = true; break; case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN: @@ -178,6 +179,7 @@ brw_begin_query(struct gl_context *ctx, struct gl_query_object *q) * it a software counter. So just reset the counter. */ brw->sol.primitives_written = 0; + brw->sol.counting_primitives_written = true; break; default: @@ -249,6 +251,7 @@ brw_end_query(struct gl_context *ctx, struct gl_query_object *q) * the query object. */ query->Base.Result = brw->sol.primitives_generated; + brw->sol.counting_primitives_generated = false; /* And set brw->query.obj to NULL so that this query won't try to wait * for any rendering to complete. @@ -262,6 +265,7 @@ brw_end_query(struct gl_context *ctx, struct gl_query_object *q) * the query object. */ query->Base.Result = brw->sol.primitives_written; + brw->sol.counting_primitives_written = false; /* And set brw->query.obj to NULL so that this query won't try to wait * for any rendering to complete. |