From d03a5f20114203fd00e0004659fd2617f4c03a32 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 14 Jul 2011 09:02:09 +0200 Subject: mesa xserver git update 14 july 2011 --- mesalib/src/mesa/state_tracker/st_cb_queryobj.c | 363 ++++++++++++------------ 1 file changed, 184 insertions(+), 179 deletions(-) (limited to 'mesalib/src/mesa/state_tracker/st_cb_queryobj.c') diff --git a/mesalib/src/mesa/state_tracker/st_cb_queryobj.c b/mesalib/src/mesa/state_tracker/st_cb_queryobj.c index 1efcaf593..057499615 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_queryobj.c +++ b/mesalib/src/mesa/state_tracker/st_cb_queryobj.c @@ -1,179 +1,184 @@ -/************************************************************************** - * - * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas. - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sub license, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice (including the - * next paragraph) shall be included in all copies or substantial portions - * of the Software. - * - * 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 - * 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. - * - **************************************************************************/ - - -/** - * glBegin/EndQuery interface to pipe - * - * \author Brian Paul - */ - - -#include "main/imports.h" -#include "main/context.h" -#include "main/mfeatures.h" - -#include "pipe/p_context.h" -#include "pipe/p_defines.h" -#include "st_context.h" -#include "st_cb_queryobj.h" - - -#if FEATURE_queryobj - -static struct gl_query_object * -st_NewQueryObject(struct gl_context *ctx, GLuint id) -{ - struct st_query_object *stq = ST_CALLOC_STRUCT(st_query_object); - if (stq) { - stq->base.Id = id; - stq->base.Ready = GL_TRUE; - stq->pq = NULL; - stq->type = PIPE_QUERY_TYPES; /* an invalid value */ - return &stq->base; - } - return NULL; -} - - - -static void -st_DeleteQuery(struct gl_context *ctx, struct gl_query_object *q) -{ - struct pipe_context *pipe = st_context(ctx)->pipe; - struct st_query_object *stq = st_query_object(q); - - if (stq->pq) { - pipe->destroy_query(pipe, stq->pq); - stq->pq = NULL; - } - - free(stq); -} - - -static void -st_BeginQuery(struct gl_context *ctx, struct gl_query_object *q) -{ - struct pipe_context *pipe = st_context(ctx)->pipe; - struct st_query_object *stq = st_query_object(q); - unsigned type; - - /* convert GL query type to Gallium query type */ - switch (q->Target) { - case GL_ANY_SAMPLES_PASSED: - /* fall-through */ - case GL_SAMPLES_PASSED_ARB: - type = PIPE_QUERY_OCCLUSION_COUNTER; - break; - case GL_PRIMITIVES_GENERATED: - type = PIPE_QUERY_PRIMITIVES_GENERATED; - break; - case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN: - type = PIPE_QUERY_PRIMITIVES_EMITTED; - break; - case GL_TIME_ELAPSED_EXT: - type = PIPE_QUERY_TIME_ELAPSED; - break; - default: - assert(0 && "unexpected query target in st_BeginQuery()"); - return; - } - - if (stq->pq && stq->type != type) { - /* free old query of different type */ - pipe->destroy_query(pipe, stq->pq); - stq->pq = NULL; - stq->type = PIPE_QUERY_TYPES; /* an invalid value */ - } - - if (!stq->pq) { - stq->pq = pipe->create_query(pipe, type); - stq->type = type; - } - - assert(stq->type == type); - - pipe->begin_query(pipe, stq->pq); -} - - -static void -st_EndQuery(struct gl_context *ctx, struct gl_query_object *q) -{ - struct pipe_context *pipe = st_context(ctx)->pipe; - struct st_query_object *stq = st_query_object(q); - - pipe->end_query(pipe, stq->pq); -} - - -static void -st_WaitQuery(struct gl_context *ctx, struct gl_query_object *q) -{ - struct pipe_context *pipe = st_context(ctx)->pipe; - struct st_query_object *stq = st_query_object(q); - - /* this function should only be called if we don't have a ready result */ - assert(!stq->base.Ready); - - while (!stq->base.Ready && - !pipe->get_query_result(pipe, - stq->pq, - TRUE, - &q->Result)) - { - /* nothing */ - } - - q->Ready = GL_TRUE; -} - - -static void -st_CheckQuery(struct gl_context *ctx, struct gl_query_object *q) -{ - struct pipe_context *pipe = st_context(ctx)->pipe; - struct st_query_object *stq = st_query_object(q); - assert(!q->Ready); /* we should not get called if Ready is TRUE */ - q->Ready = pipe->get_query_result(pipe, stq->pq, FALSE, &q->Result); -} - - - - -void st_init_query_functions(struct dd_function_table *functions) -{ - functions->NewQueryObject = st_NewQueryObject; - functions->DeleteQuery = st_DeleteQuery; - functions->BeginQuery = st_BeginQuery; - functions->EndQuery = st_EndQuery; - functions->WaitQuery = st_WaitQuery; - functions->CheckQuery = st_CheckQuery; -} - -#endif /* FEATURE_queryobj */ +/************************************************************************** + * + * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sub license, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + * + * 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 + * 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. + * + **************************************************************************/ + + +/** + * glBegin/EndQuery interface to pipe + * + * \author Brian Paul + */ + + +#include "main/imports.h" +#include "main/context.h" +#include "main/mfeatures.h" + +#include "pipe/p_context.h" +#include "pipe/p_defines.h" +#include "st_context.h" +#include "st_cb_queryobj.h" +#include "st_cb_bitmap.h" + + +#if FEATURE_queryobj + +static struct gl_query_object * +st_NewQueryObject(struct gl_context *ctx, GLuint id) +{ + struct st_query_object *stq = ST_CALLOC_STRUCT(st_query_object); + if (stq) { + stq->base.Id = id; + stq->base.Ready = GL_TRUE; + stq->pq = NULL; + stq->type = PIPE_QUERY_TYPES; /* an invalid value */ + return &stq->base; + } + return NULL; +} + + + +static void +st_DeleteQuery(struct gl_context *ctx, struct gl_query_object *q) +{ + struct pipe_context *pipe = st_context(ctx)->pipe; + struct st_query_object *stq = st_query_object(q); + + if (stq->pq) { + pipe->destroy_query(pipe, stq->pq); + stq->pq = NULL; + } + + free(stq); +} + + +static void +st_BeginQuery(struct gl_context *ctx, struct gl_query_object *q) +{ + struct pipe_context *pipe = st_context(ctx)->pipe; + struct st_query_object *stq = st_query_object(q); + unsigned type; + + st_flush_bitmap_cache(st_context(ctx)); + + /* convert GL query type to Gallium query type */ + switch (q->Target) { + case GL_ANY_SAMPLES_PASSED: + /* fall-through */ + case GL_SAMPLES_PASSED_ARB: + type = PIPE_QUERY_OCCLUSION_COUNTER; + break; + case GL_PRIMITIVES_GENERATED: + type = PIPE_QUERY_PRIMITIVES_GENERATED; + break; + case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN: + type = PIPE_QUERY_PRIMITIVES_EMITTED; + break; + case GL_TIME_ELAPSED_EXT: + type = PIPE_QUERY_TIME_ELAPSED; + break; + default: + assert(0 && "unexpected query target in st_BeginQuery()"); + return; + } + + if (stq->pq && stq->type != type) { + /* free old query of different type */ + pipe->destroy_query(pipe, stq->pq); + stq->pq = NULL; + stq->type = PIPE_QUERY_TYPES; /* an invalid value */ + } + + if (!stq->pq) { + stq->pq = pipe->create_query(pipe, type); + stq->type = type; + } + + assert(stq->type == type); + + pipe->begin_query(pipe, stq->pq); +} + + +static void +st_EndQuery(struct gl_context *ctx, struct gl_query_object *q) +{ + struct pipe_context *pipe = st_context(ctx)->pipe; + struct st_query_object *stq = st_query_object(q); + + st_flush_bitmap_cache(st_context(ctx)); + + pipe->end_query(pipe, stq->pq); +} + + +static void +st_WaitQuery(struct gl_context *ctx, struct gl_query_object *q) +{ + struct pipe_context *pipe = st_context(ctx)->pipe; + struct st_query_object *stq = st_query_object(q); + + /* this function should only be called if we don't have a ready result */ + assert(!stq->base.Ready); + + while (!stq->base.Ready && + !pipe->get_query_result(pipe, + stq->pq, + TRUE, + &q->Result)) + { + /* nothing */ + } + + q->Ready = GL_TRUE; +} + + +static void +st_CheckQuery(struct gl_context *ctx, struct gl_query_object *q) +{ + struct pipe_context *pipe = st_context(ctx)->pipe; + struct st_query_object *stq = st_query_object(q); + assert(!q->Ready); /* we should not get called if Ready is TRUE */ + q->Ready = pipe->get_query_result(pipe, stq->pq, FALSE, &q->Result); +} + + + + +void st_init_query_functions(struct dd_function_table *functions) +{ + functions->NewQueryObject = st_NewQueryObject; + functions->DeleteQuery = st_DeleteQuery; + functions->BeginQuery = st_BeginQuery; + functions->EndQuery = st_EndQuery; + functions->WaitQuery = st_WaitQuery; + functions->CheckQuery = st_CheckQuery; +} + +#endif /* FEATURE_queryobj */ -- cgit v1.2.3