X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fsoftpipe%2Fsp_query.c;h=c28d28d5f5d75d9ffc2a34bfd3cb0751e5c42a72;hb=d67b9ba9a1af18306aa68f16ee1b9bbc124da42e;hp=379cf4ad064d201f35d12bea4e8b7bf53a001a98;hpb=9d58724c51c387c360d2423e29b80ddc0bfa66b7;p=mesa.git diff --git a/src/gallium/drivers/softpipe/sp_query.c b/src/gallium/drivers/softpipe/sp_query.c index 379cf4ad064..c28d28d5f5d 100644 --- a/src/gallium/drivers/softpipe/sp_query.c +++ b/src/gallium/drivers/softpipe/sp_query.c @@ -1,6 +1,6 @@ /************************************************************************** * - * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas. + * Copyright 2007 VMware, Inc. * All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a @@ -18,7 +18,7 @@ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR + * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -26,10 +26,11 @@ **************************************************************************/ /* Author: - * Keith Whitwell + * Keith Whitwell */ #include "draw/draw_context.h" +#include "os/os_time.h" #include "pipe/p_defines.h" #include "util/u_memory.h" #include "sp_context.h" @@ -37,8 +38,11 @@ #include "sp_state.h" struct softpipe_query { + unsigned type; uint64_t start; uint64_t end; + struct pipe_query_data_so_statistics so; + struct pipe_query_data_pipeline_statistics stats; }; @@ -49,10 +53,26 @@ static struct softpipe_query *softpipe_query( struct pipe_query *p ) static struct pipe_query * softpipe_create_query(struct pipe_context *pipe, - unsigned type) + unsigned type, + unsigned index) { - assert(type == PIPE_QUERY_OCCLUSION_COUNTER); - return (struct pipe_query *)CALLOC_STRUCT( softpipe_query ); + struct softpipe_query* sq; + + assert(type == PIPE_QUERY_OCCLUSION_COUNTER || + type == PIPE_QUERY_OCCLUSION_PREDICATE || + type == PIPE_QUERY_TIME_ELAPSED || + type == PIPE_QUERY_SO_STATISTICS || + type == PIPE_QUERY_SO_OVERFLOW_PREDICATE || + type == PIPE_QUERY_PRIMITIVES_EMITTED || + type == PIPE_QUERY_PRIMITIVES_GENERATED || + type == PIPE_QUERY_PIPELINE_STATISTICS || + type == PIPE_QUERY_GPU_FINISHED || + type == PIPE_QUERY_TIMESTAMP || + type == PIPE_QUERY_TIMESTAMP_DISJOINT); + sq = CALLOC_STRUCT( softpipe_query ); + sq->type = type; + + return (struct pipe_query *)sq; } @@ -63,15 +83,54 @@ softpipe_destroy_query(struct pipe_context *pipe, struct pipe_query *q) } -static void +static boolean softpipe_begin_query(struct pipe_context *pipe, struct pipe_query *q) { struct softpipe_context *softpipe = softpipe_context( pipe ); struct softpipe_query *sq = softpipe_query(q); - - sq->start = softpipe->occlusion_count; + + switch (sq->type) { + case PIPE_QUERY_OCCLUSION_COUNTER: + case PIPE_QUERY_OCCLUSION_PREDICATE: + sq->start = softpipe->occlusion_count; + break; + case PIPE_QUERY_TIME_ELAPSED: + sq->start = os_time_get_nano(); + break; + case PIPE_QUERY_SO_STATISTICS: + sq->so.num_primitives_written = softpipe->so_stats.num_primitives_written; + sq->so.primitives_storage_needed = softpipe->so_stats.primitives_storage_needed; + break; + case PIPE_QUERY_SO_OVERFLOW_PREDICATE: + sq->end = FALSE; + break; + case PIPE_QUERY_PRIMITIVES_EMITTED: + sq->so.num_primitives_written = softpipe->so_stats.num_primitives_written; + break; + case PIPE_QUERY_PRIMITIVES_GENERATED: + sq->so.primitives_storage_needed = softpipe->so_stats.primitives_storage_needed; + break; + case PIPE_QUERY_TIMESTAMP: + case PIPE_QUERY_GPU_FINISHED: + case PIPE_QUERY_TIMESTAMP_DISJOINT: + break; + case PIPE_QUERY_PIPELINE_STATISTICS: + /* reset our cache */ + if (softpipe->active_statistics_queries == 0) { + memset(&softpipe->pipeline_statistics, 0, + sizeof(softpipe->pipeline_statistics)); + } + memcpy(&sq->stats, &softpipe->pipeline_statistics, + sizeof(sq->stats)); + softpipe->active_statistics_queries++; + break; + default: + assert(0); + break; + } softpipe->active_query_count++; softpipe->dirty |= SP_NEW_QUERY; + return true; } @@ -82,23 +141,148 @@ softpipe_end_query(struct pipe_context *pipe, struct pipe_query *q) struct softpipe_query *sq = softpipe_query(q); softpipe->active_query_count--; - sq->end = softpipe->occlusion_count; + switch (sq->type) { + case PIPE_QUERY_OCCLUSION_COUNTER: + case PIPE_QUERY_OCCLUSION_PREDICATE: + sq->end = softpipe->occlusion_count; + break; + case PIPE_QUERY_TIMESTAMP: + sq->start = 0; + /* fall through */ + case PIPE_QUERY_TIME_ELAPSED: + sq->end = os_time_get_nano(); + break; + case PIPE_QUERY_SO_OVERFLOW_PREDICATE: + sq->so.num_primitives_written = + softpipe->so_stats.num_primitives_written - sq->so.num_primitives_written; + sq->so.primitives_storage_needed = + softpipe->so_stats.primitives_storage_needed - sq->so.primitives_storage_needed; + sq->end = sq->so.primitives_storage_needed > sq->so.num_primitives_written; + break; + case PIPE_QUERY_SO_STATISTICS: + sq->so.num_primitives_written = + softpipe->so_stats.num_primitives_written - sq->so.num_primitives_written; + sq->so.primitives_storage_needed = + softpipe->so_stats.primitives_storage_needed - sq->so.primitives_storage_needed; + break; + case PIPE_QUERY_PRIMITIVES_EMITTED: + sq->so.num_primitives_written = + softpipe->so_stats.num_primitives_written - sq->so.num_primitives_written; + break; + case PIPE_QUERY_PRIMITIVES_GENERATED: + sq->so.primitives_storage_needed = + softpipe->so_stats.primitives_storage_needed - sq->so.primitives_storage_needed; + break; + case PIPE_QUERY_GPU_FINISHED: + case PIPE_QUERY_TIMESTAMP_DISJOINT: + break; + case PIPE_QUERY_PIPELINE_STATISTICS: + sq->stats.ia_vertices = + softpipe->pipeline_statistics.ia_vertices - sq->stats.ia_vertices; + sq->stats.ia_primitives = + softpipe->pipeline_statistics.ia_primitives - sq->stats.ia_primitives; + sq->stats.vs_invocations = + softpipe->pipeline_statistics.vs_invocations - sq->stats.vs_invocations; + sq->stats.gs_invocations = + softpipe->pipeline_statistics.gs_invocations - sq->stats.gs_invocations; + sq->stats.gs_primitives = + softpipe->pipeline_statistics.gs_primitives - sq->stats.gs_primitives; + sq->stats.c_invocations = + softpipe->pipeline_statistics.c_invocations - sq->stats.c_invocations; + sq->stats.c_primitives = + softpipe->pipeline_statistics.c_primitives - sq->stats.c_primitives; + sq->stats.ps_invocations = + softpipe->pipeline_statistics.ps_invocations - sq->stats.ps_invocations; + + softpipe->active_statistics_queries--; + break; + default: + assert(0); + break; + } softpipe->dirty |= SP_NEW_QUERY; } static boolean softpipe_get_query_result(struct pipe_context *pipe, - struct pipe_query *q, - boolean wait, - uint64_t *result ) + struct pipe_query *q, + boolean wait, + union pipe_query_result *vresult) { struct softpipe_query *sq = softpipe_query(q); - *result = sq->end - sq->start; + uint64_t *result = (uint64_t*)vresult; + + switch (sq->type) { + case PIPE_QUERY_SO_STATISTICS: { + struct pipe_query_data_so_statistics *stats = + (struct pipe_query_data_so_statistics *)vresult; + stats->num_primitives_written = sq->so.num_primitives_written; + stats->primitives_storage_needed = sq->so.primitives_storage_needed; + } + break; + case PIPE_QUERY_PIPELINE_STATISTICS: + memcpy(vresult, &sq->stats, + sizeof(struct pipe_query_data_pipeline_statistics)); + break; + case PIPE_QUERY_GPU_FINISHED: + vresult->b = TRUE; + break; + case PIPE_QUERY_SO_OVERFLOW_PREDICATE: + vresult->b = sq->end != 0; + 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_PRIMITIVES_EMITTED: + *result = sq->so.num_primitives_written; + break; + case PIPE_QUERY_PRIMITIVES_GENERATED: + *result = sq->so.primitives_storage_needed; + break; + case PIPE_QUERY_OCCLUSION_PREDICATE: + vresult->b = sq->end - sq->start != 0; + break; + default: + *result = sq->end - sq->start; + break; + } return TRUE; } +/** + * Called by rendering function to check rendering is conditional. + * \return TRUE if we should render, FALSE if we should skip rendering + */ +boolean +softpipe_check_render_cond(struct softpipe_context *sp) +{ + struct pipe_context *pipe = &sp->pipe; + boolean b, wait; + uint64_t result; + + if (!sp->render_cond_query) { + return TRUE; /* no query predicate, draw normally */ + } + + wait = (sp->render_cond_mode == PIPE_RENDER_COND_WAIT || + sp->render_cond_mode == PIPE_RENDER_COND_BY_REGION_WAIT); + + b = pipe->get_query_result(pipe, sp->render_cond_query, wait, + (void*)&result); + if (b) + return (!result) == sp->render_cond_cond; + else + return TRUE; +} + + void softpipe_init_query_funcs(struct softpipe_context *softpipe ) { softpipe->pipe.create_query = softpipe_create_query;