X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fi965%2Fbrw_queryobj.c;h=7baa2131e119eccaaca6b92f37724c8983dfc0a6;hp=c6ed8e26d32b1d464c938efca12e019723276cdf;hb=ddcfc35f62ed3ad83b100beacb5b30394dcd9960;hpb=d1b34baf9b9c977d2bcd612aa8ea7256f2143ad8 diff --git a/src/mesa/drivers/dri/i965/brw_queryobj.c b/src/mesa/drivers/dri/i965/brw_queryobj.c index c6ed8e26d32..7baa2131e11 100644 --- a/src/mesa/drivers/dri/i965/brw_queryobj.c +++ b/src/mesa/drivers/dri/i965/brw_queryobj.c @@ -34,11 +34,6 @@ * fragments that passed the depth test, or the hardware timer. They are * appropriately synced with the stage of the pipeline for our extensions' * needs. - * - * To avoid getting samples from another context's rendering in our results, - * we capture the counts at the start and end of every batchbuffer while the - * query is active, and sum up the differences. (We should do so for - * GL_TIME_ELAPSED as well, but don't). */ #include "main/imports.h" @@ -48,104 +43,69 @@ #include "intel_batchbuffer.h" #include "intel_reg.h" -static void -write_timestamp(struct intel_context *intel, drm_intel_bo *query_bo, int idx) +/** + * Emit PIPE_CONTROLs to write the current GPU timestamp into a buffer. + */ +void +brw_write_timestamp(struct brw_context *brw, drm_intel_bo *query_bo, int idx) { - if (intel->gen >= 6) { - /* Emit workaround flushes: */ - if (intel->gen == 6) { - /* The timestamp write below is a non-zero post-sync op, which on - * Gen6 necessitates a CS stall. CS stalls need stall at scoreboard - * set. See the comments for intel_emit_post_sync_nonzero_flush(). - */ - BEGIN_BATCH(4); - OUT_BATCH(_3DSTATE_PIPE_CONTROL | (4 - 2)); - OUT_BATCH(PIPE_CONTROL_CS_STALL | PIPE_CONTROL_STALL_AT_SCOREBOARD); - OUT_BATCH(0); - OUT_BATCH(0); - ADVANCE_BATCH(); - } - - BEGIN_BATCH(5); - OUT_BATCH(_3DSTATE_PIPE_CONTROL | (5 - 2)); - OUT_BATCH(PIPE_CONTROL_WRITE_TIMESTAMP); - OUT_RELOC(query_bo, - I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, - PIPE_CONTROL_GLOBAL_GTT_WRITE | - idx * sizeof(uint64_t)); - OUT_BATCH(0); - OUT_BATCH(0); - ADVANCE_BATCH(); - } else { - BEGIN_BATCH(4); - OUT_BATCH(_3DSTATE_PIPE_CONTROL | (4 - 2) | - PIPE_CONTROL_WRITE_TIMESTAMP); - OUT_RELOC(query_bo, - I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, - PIPE_CONTROL_GLOBAL_GTT_WRITE | - idx * sizeof(uint64_t)); - OUT_BATCH(0); - OUT_BATCH(0); - ADVANCE_BATCH(); + if (brw->gen == 6) { + /* Emit Sandybridge workaround flush: */ + brw_emit_pipe_control_flush(brw, + PIPE_CONTROL_CS_STALL | + PIPE_CONTROL_STALL_AT_SCOREBOARD); } + + uint32_t flags = PIPE_CONTROL_WRITE_TIMESTAMP; + + if (brw->gen == 9 && brw->gt == 4) + flags |= PIPE_CONTROL_CS_STALL; + + brw_emit_pipe_control_write(brw, flags, + query_bo, idx * sizeof(uint64_t), 0, 0); } -static void -write_depth_count(struct intel_context *intel, drm_intel_bo *query_bo, int idx) +/** + * Emit PIPE_CONTROLs to write the PS_DEPTH_COUNT register into a buffer. + */ +void +brw_write_depth_count(struct brw_context *brw, drm_intel_bo *query_bo, int idx) { - if (intel->gen >= 6) { - /* Emit Sandybridge workaround flush: */ - if (intel->gen == 6) - intel_emit_post_sync_nonzero_flush(intel); - - BEGIN_BATCH(5); - OUT_BATCH(_3DSTATE_PIPE_CONTROL | (5 - 2)); - OUT_BATCH(PIPE_CONTROL_DEPTH_STALL | - PIPE_CONTROL_WRITE_DEPTH_COUNT); - OUT_RELOC(query_bo, - I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, - PIPE_CONTROL_GLOBAL_GTT_WRITE | - (idx * sizeof(uint64_t))); - OUT_BATCH(0); - OUT_BATCH(0); - ADVANCE_BATCH(); - } else { - BEGIN_BATCH(4); - OUT_BATCH(_3DSTATE_PIPE_CONTROL | (4 - 2) | - PIPE_CONTROL_DEPTH_STALL | - PIPE_CONTROL_WRITE_DEPTH_COUNT); - /* This object could be mapped cacheable, but we don't have an exposed - * mechanism to support that. Since it's going uncached, tell GEM that - * we're writing to it. The usual clflush should be all that's required - * to pick up the results. - */ - OUT_RELOC(query_bo, - I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, - PIPE_CONTROL_GLOBAL_GTT_WRITE | - (idx * sizeof(uint64_t))); - OUT_BATCH(0); - OUT_BATCH(0); - ADVANCE_BATCH(); - } + uint32_t flags = PIPE_CONTROL_WRITE_DEPTH_COUNT | PIPE_CONTROL_DEPTH_STALL; + + if (brw->gen == 9 && brw->gt == 4) + flags |= PIPE_CONTROL_CS_STALL; + + brw_emit_pipe_control_write(brw, flags, + query_bo, idx * sizeof(uint64_t), + 0, 0); } -/** Waits on the query object's BO and totals the results for this query */ +/** + * Wait on the query object's BO and calculate the final result. + */ static void brw_queryobj_get_results(struct gl_context *ctx, struct brw_query_object *query) { - struct intel_context *intel = intel_context(ctx); + struct brw_context *brw = brw_context(ctx); int i; uint64_t *results; + assert(brw->gen < 6); + if (query->bo == NULL) return; - if (drm_intel_bo_references(intel->batch.bo, query->bo)) - intel_batchbuffer_flush(intel); + /* If the application has requested the query result, but this batch is + * still contributing to it, flush it now so the results will be present + * when mapped. + */ + if (drm_intel_bo_references(brw->batch.bo, query->bo)) + intel_batchbuffer_flush(brw); - if (unlikely(INTEL_DEBUG & DEBUG_PERF)) { + if (unlikely(brw->perf_debug)) { if (drm_intel_bo_busy(query->bo)) { perf_debug("Stalling on the GPU waiting for a query object.\n"); } @@ -155,48 +115,39 @@ brw_queryobj_get_results(struct gl_context *ctx, results = query->bo->virtual; switch (query->Base.Target) { case GL_TIME_ELAPSED_EXT: - if (intel->gen >= 6) - query->Base.Result += 80 * (results[1] - results[0]); - else - query->Base.Result += 1000 * ((results[1] >> 32) - (results[0] >> 32)); + /* The query BO contains the starting and ending timestamps. + * Subtract the two and convert to nanoseconds. + */ + query->Base.Result += 1000 * ((results[1] >> 32) - (results[0] >> 32)); break; case GL_TIMESTAMP: - if (intel->gen >= 6) { - /* Our timer is a clock that increments every 80ns (regardless of - * other clock scaling in the system). The timestamp register we can - * read for glGetTimestamp() masks out the top 32 bits, so we do that - * here too to let the two counters be compared against each other. - * - * If we just multiplied that 32 bits of data by 80, it would roll - * over at a non-power-of-two, so an application couldn't use - * GL_QUERY_COUNTER_BITS to handle rollover correctly. Instead, we - * report 36 bits and truncate at that (rolling over 5 times as often - * as the HW counter), and when the 32-bit counter rolls over, it - * happens to also be at a rollover in the reported value from near - * (1<<36) to 0. - * - * The low 32 bits rolls over in ~343 seconds. Our 36-bit result - * rolls over every ~69 seconds. - */ - query->Base.Result = 80 * (results[0] & 0xffffffff); - query->Base.Result &= (1ull << 36) - 1; - } else { - query->Base.Result = 1000 * (results[0] >> 32); - } + /* The query BO contains a single timestamp value in results[0]. */ + query->Base.Result = 1000 * (results[0] >> 32); break; case GL_SAMPLES_PASSED_ARB: - /* Map and count the pixels from the current query BO */ - for (i = query->first_index; i <= query->last_index; i++) { + /* Loop over pairs of values from the BO, which are the PS_DEPTH_COUNT + * value at the start and end of the batchbuffer. Subtract them to + * get the number of fragments which passed the depth test in each + * individual batch, and add those differences up to get the number + * of fragments for the entire query. + * + * Note that query->Base.Result may already be non-zero. We may have + * run out of space in the query's BO and allocated a new one. If so, + * this function was already called to accumulate the results so far. + */ + for (i = 0; i < query->last_index; i++) { query->Base.Result += results[i * 2 + 1] - results[i * 2]; } break; case GL_ANY_SAMPLES_PASSED: case GL_ANY_SAMPLES_PASSED_CONSERVATIVE: - /* Set true if any of the sub-queries passed. */ - for (i = query->first_index; i <= query->last_index; i++) { + /* If the starting and ending PS_DEPTH_COUNT from any of the batches + * differ, then some fragments passed the depth test. + */ + for (i = 0; i < query->last_index; i++) { if (results[i * 2 + 1] != results[i * 2]) { query->Base.Result = GL_TRUE; break; @@ -204,24 +155,23 @@ brw_queryobj_get_results(struct gl_context *ctx, } break; - case GL_PRIMITIVES_GENERATED: - case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN: - /* We don't actually query the hardware for this value, so query->bo - * should always be NULL and execution should never reach here. - */ - assert(!"Unreachable"); - break; - default: - assert(!"Unrecognized query target in brw_queryobj_get_results()"); - break; + unreachable("Unrecognized query target in brw_queryobj_get_results()"); } drm_intel_bo_unmap(query->bo); + /* Now that we've processed the data stored in the query's buffer object, + * we can release it. + */ drm_intel_bo_unreference(query->bo); query->bo = NULL; } +/** + * The NewQueryObject() driver hook. + * + * Allocates and initializes a new query object. + */ static struct gl_query_object * brw_new_query_object(struct gl_context *ctx, GLuint id) { @@ -237,6 +187,9 @@ brw_new_query_object(struct gl_context *ctx, GLuint id) return &query->Base; } +/** + * The DeleteQuery() driver hook. + */ static void brw_delete_query(struct gl_context *ctx, struct gl_query_object *q) { @@ -246,68 +199,95 @@ brw_delete_query(struct gl_context *ctx, struct gl_query_object *q) free(query); } +/** + * Gen4-5 driver hook for glBeginQuery(). + * + * Initializes driver structures and emits any GPU commands required to begin + * recording data for the query. + */ static void brw_begin_query(struct gl_context *ctx, struct gl_query_object *q) { struct brw_context *brw = brw_context(ctx); - struct intel_context *intel = intel_context(ctx); struct brw_query_object *query = (struct brw_query_object *)q; + assert(brw->gen < 6); + switch (query->Base.Target) { case GL_TIME_ELAPSED_EXT: + /* For timestamp queries, we record the starting time right away so that + * we measure the full time between BeginQuery and EndQuery. There's + * some debate about whether this is the right thing to do. Our decision + * is based on the following text from the ARB_timer_query extension: + * + * "(5) Should the extension measure total time elapsed between the full + * completion of the BeginQuery and EndQuery commands, or just time + * spent in the graphics library? + * + * RESOLVED: This extension will measure the total time elapsed + * between the full completion of these commands. Future extensions + * may implement a query to determine time elapsed at different stages + * of the graphics pipeline." + * + * We write a starting timestamp now (at index 0). At EndQuery() time, + * we'll write a second timestamp (at index 1), and subtract the two to + * obtain the time elapsed. Notably, this includes time elapsed while + * the system was doing other work, such as running other applications. + */ drm_intel_bo_unreference(query->bo); - query->bo = drm_intel_bo_alloc(intel->bufmgr, "timer query", 4096, 4096); - write_timestamp(intel, query->bo, 0); + query->bo = drm_intel_bo_alloc(brw->bufmgr, "timer query", 4096, 4096); + brw_write_timestamp(brw, query->bo, 0); break; case GL_ANY_SAMPLES_PASSED: case GL_ANY_SAMPLES_PASSED_CONSERVATIVE: case GL_SAMPLES_PASSED_ARB: - /* Reset our driver's tracking of query state. */ + /* For occlusion queries, we delay taking an initial sample until the + * first drawing occurs in this batch. See the reasoning in the comments + * for brw_emit_query_begin() below. + * + * Since we're starting a new query, we need to be sure to throw away + * any previous occlusion query results. + */ drm_intel_bo_unreference(query->bo); query->bo = NULL; - query->first_index = -1; query->last_index = -1; brw->query.obj = query; - intel->stats_wm++; - break; - case GL_PRIMITIVES_GENERATED: - /* We don't actually query the hardware for this value; we keep track of - * 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: - /* We don't actually query the hardware for this value; we keep track of - * it a software counter. So just reset the counter. + /* Depth statistics on Gen4 require strange workarounds, so we try to + * avoid them when necessary. They're required for occlusion queries, + * so turn them on now. */ - brw->sol.primitives_written = 0; - brw->sol.counting_primitives_written = true; + brw->stats_wm++; + brw->ctx.NewDriverState |= BRW_NEW_STATS_WM; break; default: - assert(!"Unrecognized query target in brw_begin_query()"); - break; + unreachable("Unrecognized query target in brw_begin_query()"); } } /** - * Begin the ARB_occlusion_query query on a query object. + * Gen4-5 driver hook for glEndQuery(). + * + * Emits GPU commands to record a final query value, ending any data capturing. + * However, the final result isn't necessarily available until the GPU processes + * those commands. brw_queryobj_get_results() processes the captured data to + * produce the final result. */ static void brw_end_query(struct gl_context *ctx, struct gl_query_object *q) { struct brw_context *brw = brw_context(ctx); - struct intel_context *intel = intel_context(ctx); struct brw_query_object *query = (struct brw_query_object *)q; + assert(brw->gen < 6); + switch (query->Base.Target) { case GL_TIME_ELAPSED_EXT: - write_timestamp(intel, query->bo, 1); + /* Write the final timestamp. */ + brw_write_timestamp(brw, query->bo, 1); break; case GL_ANY_SAMPLES_PASSED: @@ -330,65 +310,50 @@ brw_end_query(struct gl_context *ctx, struct gl_query_object *q) brw_emit_query_begin(brw); } - if (query->bo) { - brw_emit_query_end(brw); + assert(query->bo); - drm_intel_bo_unreference(brw->query.bo); - brw->query.bo = NULL; - } + brw_emit_query_end(brw); brw->query.obj = NULL; - intel->stats_wm--; - break; - - case GL_PRIMITIVES_GENERATED: - /* We don't actually query the hardware for this value; we keep track of - * it in a software counter. So just read the counter and store it in - * 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. - */ - query->bo = NULL; - break; - - case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN: - /* We don't actually query the hardware for this value; we keep track of - * it in a software counter. So just read the counter and store it in - * 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. - */ - query->bo = NULL; + brw->stats_wm--; + brw->ctx.NewDriverState |= BRW_NEW_STATS_WM; break; default: - assert(!"Unrecognized query target in brw_end_query()"); - break; + unreachable("Unrecognized query target in brw_end_query()"); } } +/** + * The Gen4-5 WaitQuery() driver hook. + * + * Wait for a query result to become available and return it. This is the + * backing for glGetQueryObjectiv() with the GL_QUERY_RESULT pname. + */ static void brw_wait_query(struct gl_context *ctx, struct gl_query_object *q) { struct brw_query_object *query = (struct brw_query_object *)q; + assert(brw_context(ctx)->gen < 6); + brw_queryobj_get_results(ctx, query); query->Base.Ready = true; } +/** + * The Gen4-5 CheckQuery() driver hook. + * + * Checks whether a query result is ready yet. If not, flushes. + * This is the backing for glGetQueryObjectiv()'s QUERY_RESULT_AVAILABLE pname. + */ static void brw_check_query(struct gl_context *ctx, struct gl_query_object *q) { - struct intel_context *intel = intel_context(ctx); + struct brw_context *brw = brw_context(ctx); struct brw_query_object *query = (struct brw_query_object *)q; + assert(brw->gen < 6); + /* From the GL_ARB_occlusion_query spec: * * "Instead of allowing for an infinite loop, performing a @@ -396,8 +361,8 @@ static void brw_check_query(struct gl_context *ctx, struct gl_query_object *q) * not ready yet on the first time it is queried. This ensures that * the async query will return true in finite time. */ - if (query->bo && drm_intel_bo_references(intel->batch.bo, query->bo)) - intel_batchbuffer_flush(intel); + if (query->bo && drm_intel_bo_references(brw->batch.bo, query->bo)) + intel_batchbuffer_flush(brw); if (query->bo == NULL || !drm_intel_bo_busy(query->bo)) { brw_queryobj_get_results(ctx, query); @@ -405,60 +370,97 @@ static void brw_check_query(struct gl_context *ctx, struct gl_query_object *q) } } -/** Called just before primitive drawing to get a beginning PS_DEPTH_COUNT. */ +/** + * Ensure there query's BO has enough space to store a new pair of values. + * + * If not, gather the existing BO's results and create a new buffer of the + * same size. + */ +static void +ensure_bo_has_space(struct gl_context *ctx, struct brw_query_object *query) +{ + struct brw_context *brw = brw_context(ctx); + + assert(brw->gen < 6); + + if (!query->bo || query->last_index * 2 + 1 >= 4096 / sizeof(uint64_t)) { + + if (query->bo != NULL) { + /* The old query BO did not have enough space, so we allocated a new + * one. Gather the results so far (adding up the differences) and + * release the old BO. + */ + brw_queryobj_get_results(ctx, query); + } + + query->bo = drm_intel_bo_alloc(brw->bufmgr, "query", 4096, 1); + query->last_index = 0; + } +} + +/** + * Record the PS_DEPTH_COUNT value (for occlusion queries) just before + * primitive drawing. + * + * In a pre-hardware context world, the single PS_DEPTH_COUNT register is + * shared among all applications using the GPU. However, our query value + * needs to only include fragments generated by our application/GL context. + * + * To accommodate this, we record PS_DEPTH_COUNT at the start and end of + * each batchbuffer (technically, the first primitive drawn and flush time). + * Subtracting each pair of values calculates the change in PS_DEPTH_COUNT + * caused by a batchbuffer. Since there is no preemption inside batches, + * this is guaranteed to only measure the effects of our current application. + * + * Adding each of these differences (in case drawing is done over many batches) + * produces the final expected value. + * + * In a world with hardware contexts, PS_DEPTH_COUNT is saved and restored + * as part of the context state, so this is unnecessary, and skipped. + */ void brw_emit_query_begin(struct brw_context *brw) { - struct intel_context *intel = &brw->intel; - struct gl_context *ctx = &intel->ctx; + struct gl_context *ctx = &brw->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) + if (brw->hw_ctx) return; - /* Get a new query BO if we're going to need it. */ - if (brw->query.bo == NULL || - brw->query.index * 2 + 1 >= 4096 / sizeof(uint64_t)) { - drm_intel_bo_unreference(brw->query.bo); - brw->query.bo = NULL; - - brw->query.bo = drm_intel_bo_alloc(intel->bufmgr, "query", 4096, 1); - - /* clear target buffer */ - drm_intel_bo_map(brw->query.bo, true); - memset((char *)brw->query.bo->virtual, 0, 4096); - drm_intel_bo_unmap(brw->query.bo); + /* Skip if we're not doing any queries, or we've already recorded the + * initial query value for this batchbuffer. + */ + if (!query || brw->query.begin_emitted) + return; - brw->query.index = 0; - } + ensure_bo_has_space(ctx, query); - write_depth_count(intel, brw->query.bo, brw->query.index * 2); + brw_write_depth_count(brw, query->bo, query->last_index * 2); - if (query->bo != brw->query.bo) { - if (query->bo != NULL) - brw_queryobj_get_results(ctx, query); - drm_intel_bo_reference(brw->query.bo); - query->bo = brw->query.bo; - query->first_index = brw->query.index; - } - query->last_index = brw->query.index; brw->query.begin_emitted = true; } -/** Called at batchbuffer flush to get an ending PS_DEPTH_COUNT */ +/** + * Called at batchbuffer flush to get an ending PS_DEPTH_COUNT + * (for non-hardware context platforms). + * + * See the explanation in brw_emit_query_begin(). + */ void brw_emit_query_end(struct brw_context *brw) { - struct intel_context *intel = &brw->intel; + struct brw_query_object *query = brw->query.obj; + + if (brw->hw_ctx) + return; if (!brw->query.begin_emitted) return; - write_depth_count(intel, brw->query.bo, brw->query.index * 2 + 1); + brw_write_depth_count(brw, query->bo, query->last_index * 2 + 1); brw->query.begin_emitted = false; - brw->query.index++; + query->last_index++; } /** @@ -468,43 +470,99 @@ brw_emit_query_end(struct brw_context *brw) * current GPU time. This is unlike GL_TIME_ELAPSED, which measures the * time while the query is active. */ -static void +void brw_query_counter(struct gl_context *ctx, struct gl_query_object *q) { - struct intel_context *intel = intel_context(ctx); + struct brw_context *brw = brw_context(ctx); struct brw_query_object *query = (struct brw_query_object *) q; assert(q->Target == GL_TIMESTAMP); drm_intel_bo_unreference(query->bo); - query->bo = drm_intel_bo_alloc(intel->bufmgr, "timestamp query", 4096, 4096); - write_timestamp(intel, query->bo, 0); + query->bo = drm_intel_bo_alloc(brw->bufmgr, "timestamp query", 4096, 4096); + brw_write_timestamp(brw, query->bo, 0); + + query->flushed = false; } +/** + * Read the TIMESTAMP register immediately (in a non-pipelined fashion). + * + * This is used to implement the GetTimestamp() driver hook. + */ static uint64_t brw_get_timestamp(struct gl_context *ctx) { - struct intel_context *intel = intel_context(ctx); + struct brw_context *brw = brw_context(ctx); uint64_t result = 0; - drm_intel_reg_read(intel->bufmgr, TIMESTAMP, &result); + switch (brw->intelScreen->hw_has_timestamp) { + case 3: /* New kernel, always full 36bit accuracy */ + drm_intel_reg_read(brw->bufmgr, TIMESTAMP | 1, &result); + break; + case 2: /* 64bit kernel, result is left-shifted by 32bits, losing 4bits */ + drm_intel_reg_read(brw->bufmgr, TIMESTAMP, &result); + result = result >> 32; + break; + case 1: /* 32bit kernel, result is 36bit wide but may be inaccurate! */ + drm_intel_reg_read(brw->bufmgr, TIMESTAMP, &result); + break; + } /* See logic in brw_queryobj_get_results() */ - result = result >> 32; result *= 80; result &= (1ull << 36) - 1; - return result; } -void brw_init_queryobj_functions(struct dd_function_table *functions) +/** + * Is this type of query written by PIPE_CONTROL? + */ +bool +brw_is_query_pipelined(struct brw_query_object *query) +{ + switch (query->Base.Target) { + case GL_TIMESTAMP: + case GL_TIME_ELAPSED: + case GL_ANY_SAMPLES_PASSED: + case GL_ANY_SAMPLES_PASSED_CONSERVATIVE: + case GL_SAMPLES_PASSED_ARB: + return true; + + case GL_PRIMITIVES_GENERATED: + case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN: + case GL_VERTICES_SUBMITTED_ARB: + case GL_PRIMITIVES_SUBMITTED_ARB: + case GL_VERTEX_SHADER_INVOCATIONS_ARB: + case GL_GEOMETRY_SHADER_INVOCATIONS: + case GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED_ARB: + case GL_FRAGMENT_SHADER_INVOCATIONS_ARB: + case GL_CLIPPING_INPUT_PRIMITIVES_ARB: + case GL_CLIPPING_OUTPUT_PRIMITIVES_ARB: + case GL_COMPUTE_SHADER_INVOCATIONS_ARB: + case GL_TESS_CONTROL_SHADER_PATCHES_ARB: + case GL_TESS_EVALUATION_SHADER_INVOCATIONS_ARB: + return false; + + default: + unreachable("Unrecognized query target in is_query_pipelined()"); + } +} + +/* Initialize query object functions used on all generations. */ +void brw_init_common_queryobj_functions(struct dd_function_table *functions) { functions->NewQueryObject = brw_new_query_object; functions->DeleteQuery = brw_delete_query; + functions->GetTimestamp = brw_get_timestamp; +} + +/* Initialize Gen4/5-specific query object functions. */ +void gen4_init_queryobj_functions(struct dd_function_table *functions) +{ functions->BeginQuery = brw_begin_query; functions->EndQuery = brw_end_query; - functions->QueryCounter = brw_query_counter; functions->CheckQuery = brw_check_query; functions->WaitQuery = brw_wait_query; - functions->GetTimestamp = brw_get_timestamp; + functions->QueryCounter = brw_query_counter; }