/**************************************************************************
*
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2007 VMware, Inc.
* Copyright 2010 VMware, Inc.
* All Rights Reserved.
*
#include "lp_query.h"
#include "lp_screen.h"
#include "lp_state.h"
+#include "lp_rast.h"
static struct llvmpipe_query *llvmpipe_query( struct pipe_query *p )
static struct pipe_query *
llvmpipe_create_query(struct pipe_context *pipe,
- unsigned type)
+ unsigned type,
+ unsigned index)
{
struct llvmpipe_query *pq;
union pipe_query_result *vresult)
{
struct llvmpipe_screen *screen = llvmpipe_screen(pipe->screen);
+ unsigned num_threads = MAX2(1, screen->num_threads);
struct llvmpipe_query *pq = llvmpipe_query(q);
uint64_t *result = (uint64_t *)vresult;
int i;
- if (!pq->fence) {
- /* no fence because there was no scene, so results is zero */
- *result = 0;
- return TRUE;
- }
-
- if (!lp_fence_signalled(pq->fence)) {
- if (!lp_fence_issued(pq->fence))
- llvmpipe_flush(pipe, NULL, __FUNCTION__);
+ if (pq->fence) {
+ /* only have a fence if there was a scene */
+ if (!lp_fence_signalled(pq->fence)) {
+ if (!lp_fence_issued(pq->fence))
+ llvmpipe_flush(pipe, NULL, __FUNCTION__);
- if (!wait)
- return FALSE;
+ if (!wait)
+ return FALSE;
- lp_fence_wait(pq->fence);
+ lp_fence_wait(pq->fence);
+ }
}
/* Sum the results from each of the threads:
switch (pq->type) {
case PIPE_QUERY_OCCLUSION_COUNTER:
- for (i = 0; i < screen->num_threads; i++) {
- *result += pq->count[i];
+ for (i = 0; i < num_threads; i++) {
+ *result += pq->end[i];
+ }
+ break;
+ case PIPE_QUERY_OCCLUSION_PREDICATE:
+ for (i = 0; i < num_threads; i++) {
+ /* safer (still not guaranteed) when there's an overflow */
+ vresult->b = vresult->b || pq->end[i];
}
break;
case PIPE_QUERY_TIMESTAMP:
- for (i = 0; i < screen->num_threads; i++) {
- if (pq->count[i] > *result) {
- *result = pq->count[i];
+ for (i = 0; i < num_threads; i++) {
+ if (pq->end[i] > *result) {
+ *result = pq->end[i];
}
- if (*result == 0)
- *result = os_time_get_nano();
}
break;
+ case PIPE_QUERY_TIMESTAMP_DISJOINT: {
+ struct pipe_query_data_timestamp_disjoint *td =
+ (struct pipe_query_data_timestamp_disjoint *)vresult;
+ /* os_get_time_nano return nanoseconds */
+ td->frequency = UINT64_C(1000000000);
+ td->disjoint = FALSE;
+ }
+ break;
+ case PIPE_QUERY_GPU_FINISHED:
+ vresult->b = TRUE;
+ break;
case PIPE_QUERY_PRIMITIVES_GENERATED:
*result = pq->num_primitives_generated;
break;
case PIPE_QUERY_PRIMITIVES_EMITTED:
*result = pq->num_primitives_written;
break;
+ case PIPE_QUERY_SO_OVERFLOW_PREDICATE:
+ vresult->b = pq->num_primitives_generated > pq->num_primitives_written;
+ break;
case PIPE_QUERY_SO_STATISTICS: {
struct pipe_query_data_so_statistics *stats =
(struct pipe_query_data_so_statistics *)vresult;
case PIPE_QUERY_PIPELINE_STATISTICS: {
struct pipe_query_data_pipeline_statistics *stats =
(struct pipe_query_data_pipeline_statistics *)vresult;
+ /* only ps_invocations come from binned query */
+ for (i = 0; i < num_threads; i++) {
+ pq->stats.ps_invocations += pq->end[i];
+ }
+ pq->stats.ps_invocations *= LP_RASTER_BLOCK_SIZE * LP_RASTER_BLOCK_SIZE;
*stats = pq->stats;
}
break;
}
- memset(pq->count, 0, sizeof(pq->count));
+ memset(pq->start, 0, sizeof(pq->start));
+ memset(pq->end, 0, sizeof(pq->end));
lp_setup_begin_query(llvmpipe->setup, pq);
- if (pq->type == PIPE_QUERY_PRIMITIVES_EMITTED) {
- pq->num_primitives_written = 0;
- llvmpipe->so_stats.num_primitives_written = 0;
- }
-
- if (pq->type == PIPE_QUERY_PRIMITIVES_GENERATED) {
- pq->num_primitives_generated = 0;
- llvmpipe->num_primitives_generated = 0;
- }
-
- if (pq->type == PIPE_QUERY_SO_STATISTICS) {
- pq->num_primitives_written = 0;
- llvmpipe->so_stats.num_primitives_written = 0;
- pq->num_primitives_generated = 0;
- llvmpipe->num_primitives_generated = 0;
- }
-
- if (pq->type == PIPE_QUERY_PIPELINE_STATISTICS) {
+ switch (pq->type) {
+ case PIPE_QUERY_PRIMITIVES_EMITTED:
+ pq->num_primitives_written = llvmpipe->so_stats.num_primitives_written;
+ break;
+ case PIPE_QUERY_PRIMITIVES_GENERATED:
+ pq->num_primitives_generated = llvmpipe->so_stats.primitives_storage_needed;
+ break;
+ case PIPE_QUERY_SO_STATISTICS:
+ pq->num_primitives_written = llvmpipe->so_stats.num_primitives_written;
+ pq->num_primitives_generated = llvmpipe->so_stats.primitives_storage_needed;
+ break;
+ case PIPE_QUERY_SO_OVERFLOW_PREDICATE:
+ pq->num_primitives_written = llvmpipe->so_stats.num_primitives_written;
+ pq->num_primitives_generated = llvmpipe->so_stats.primitives_storage_needed;
+ break;
+ case PIPE_QUERY_PIPELINE_STATISTICS:
/* reset our cache */
if (llvmpipe->active_statistics_queries == 0) {
memset(&llvmpipe->pipeline_statistics, 0,
}
memcpy(&pq->stats, &llvmpipe->pipeline_statistics, sizeof(pq->stats));
llvmpipe->active_statistics_queries++;
- }
-
- if (pq->type == PIPE_QUERY_OCCLUSION_COUNTER) {
- llvmpipe->active_occlusion_query = TRUE;
+ break;
+ case PIPE_QUERY_OCCLUSION_COUNTER:
+ case PIPE_QUERY_OCCLUSION_PREDICATE:
+ llvmpipe->active_occlusion_queries++;
llvmpipe->dirty |= LP_NEW_OCCLUSION_QUERY;
+ break;
+ default:
+ break;
}
}
lp_setup_end_query(llvmpipe->setup, pq);
- if (pq->type == PIPE_QUERY_PRIMITIVES_EMITTED) {
- pq->num_primitives_written = llvmpipe->so_stats.num_primitives_written;
- }
-
- if (pq->type == PIPE_QUERY_PRIMITIVES_GENERATED) {
- pq->num_primitives_generated = llvmpipe->num_primitives_generated;
- }
-
- if (pq->type == PIPE_QUERY_SO_STATISTICS) {
- pq->num_primitives_written = llvmpipe->so_stats.num_primitives_written;
- pq->num_primitives_generated = llvmpipe->num_primitives_generated;
- }
+ switch (pq->type) {
- if (pq->type == PIPE_QUERY_PIPELINE_STATISTICS) {
+ case PIPE_QUERY_PRIMITIVES_EMITTED:
+ pq->num_primitives_written =
+ llvmpipe->so_stats.num_primitives_written - pq->num_primitives_written;
+ break;
+ case PIPE_QUERY_PRIMITIVES_GENERATED:
+ pq->num_primitives_generated =
+ llvmpipe->so_stats.primitives_storage_needed - pq->num_primitives_generated;
+ break;
+ case PIPE_QUERY_SO_STATISTICS:
+ pq->num_primitives_written =
+ llvmpipe->so_stats.num_primitives_written - pq->num_primitives_written;
+ pq->num_primitives_generated =
+ llvmpipe->so_stats.primitives_storage_needed - pq->num_primitives_generated;
+ break;
+ case PIPE_QUERY_SO_OVERFLOW_PREDICATE:
+ pq->num_primitives_written =
+ llvmpipe->so_stats.num_primitives_written - pq->num_primitives_written;
+ pq->num_primitives_generated =
+ llvmpipe->so_stats.primitives_storage_needed - pq->num_primitives_generated;
+ break;
+ case PIPE_QUERY_PIPELINE_STATISTICS:
pq->stats.ia_vertices =
llvmpipe->pipeline_statistics.ia_vertices - pq->stats.ia_vertices;
pq->stats.ia_primitives =
llvmpipe->pipeline_statistics.ps_invocations - pq->stats.ps_invocations;
llvmpipe->active_statistics_queries--;
- }
-
- if (pq->type == PIPE_QUERY_OCCLUSION_COUNTER) {
- assert(llvmpipe->active_occlusion_query);
- llvmpipe->active_occlusion_query = FALSE;
+ break;
+ case PIPE_QUERY_OCCLUSION_COUNTER:
+ case PIPE_QUERY_OCCLUSION_PREDICATE:
+ assert(llvmpipe->active_occlusion_queries);
+ llvmpipe->active_occlusion_queries--;
llvmpipe->dirty |= LP_NEW_OCCLUSION_QUERY;
+ break;
+ default:
+ break;
}
}
if (!lp->render_cond_query)
return TRUE; /* no query predicate, draw normally */
+
wait = (lp->render_cond_mode == PIPE_RENDER_COND_WAIT ||
lp->render_cond_mode == PIPE_RENDER_COND_BY_REGION_WAIT);
b = pipe->get_query_result(pipe, lp->render_cond_query, wait, (void*)&result);
if (b)
- return result > 0;
+ return (!result == lp->render_cond_cond);
else
return TRUE;
}
projects / mesa.git / blobdiff