AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i965: Merge brw_prepare_query_begin() and brw_emit_query_begin().

Browse Source 
This is a leftover from when we had to split those two functions due to
the separate BO validation step.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Eric Anholt
2012-10-17 17:48:05 -07:00
parent 99dc870613
commit 459b28aba7
3 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/i965/brw_context.h
-1
View File
@@ -1138,7 +1138,6 @@ void brw_workaround_depthstencil_alignment(struct brw_context *brw);
* brw_queryobj.c
*/
void brw_init_queryobj_functions(struct dd_function_table *functions);
void brw_prepare_query_begin(struct brw_context *brw);
void brw_emit_query_begin(struct brw_context *brw);
void brw_emit_query_end(struct brw_context *brw);
src/mesa/drivers/dri/i965/brw_draw_upload.c
+1 -4
View File
@@ -397,7 +397,7 @@ static void brw_prepare_vertices(struct brw_context *brw)
return;
if (brw->vb.nr_buffers)
goto prepare;
return;
for (i = j = 0; i < brw->vb.nr_enabled; i++) {
struct brw_vertex_element *input = brw->vb.enabled[i];
@@ -565,9 +565,6 @@ static void brw_prepare_vertices(struct brw_context *brw)
}
brw->vb.nr_buffers = j;
prepare:
brw_prepare_query_begin(brw);
}
static void brw_emit_vertices(struct brw_context *brw)
src/mesa/drivers/dri/i965/brw_queryobj.c
+6 -17
View File
@@ -392,14 +392,16 @@ static void brw_check_query(struct gl_context *ctx, struct gl_query_object *q)
}
}
/** Called to set up the query BO and account for its aperture space */
/** Called just before primitive drawing to get a beginning PS_DEPTH_COUNT. */
void
brw_prepare_query_begin(struct brw_context *brw)
brw_emit_query_begin(struct brw_context *brw)
{
struct intel_context *intel = &brw->intel;
struct gl_context *ctx = &intel->ctx;
struct brw_query_object *query = brw->query.obj;
/* Skip if we're not doing any queries. */
if (!brw->query.obj)
/* Skip if we're not doing any queries, or we've emitted the start. */
if (!query || brw->query.begin_emitted)
return;
/* Get a new query BO if we're going to need it. */
@@ -417,19 +419,6 @@ brw_prepare_query_begin(struct brw_context *brw)
brw->query.index = 0;
}
}
/** Called just before primitive drawing to get a beginning PS_DEPTH_COUNT. */
void
brw_emit_query_begin(struct brw_context *brw)
{
struct intel_context *intel = &brw->intel;
struct gl_context *ctx = &intel->ctx;
struct brw_query_object *query = brw->query.obj;
/* Skip if we're not doing any queries, or we've emitted the start. */
if (!query || brw->query.begin_emitted)
return;
write_depth_count(intel, brw->query.bo, brw->query.index * 2);