diff options
author | Jonathan Gray <jsg@cvs.openbsd.org> | 2017-08-26 16:59:42 +0000 |
---|---|---|
committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2017-08-26 16:59:42 +0000 |
commit | 81ece42815e80818f160cdd85fab57d65b56ad15 (patch) | |
tree | 1059ff094da1aa50334115952fcb1cfcbda3acc6 /lib/mesa/src/gallium/drivers/etnaviv/etnaviv_query.c | |
parent | b0244145d5bb49623d58f6b5cab8143ada692b60 (diff) |
Revert to Mesa 13.0.6 to hopefully address rendering issues a handful of
people have reported with xpdf/fvwm on ivy bridge with modesetting driver.
Diffstat (limited to 'lib/mesa/src/gallium/drivers/etnaviv/etnaviv_query.c')
-rw-r--r-- | lib/mesa/src/gallium/drivers/etnaviv/etnaviv_query.c | 120 |
1 files changed, 0 insertions, 120 deletions
diff --git a/lib/mesa/src/gallium/drivers/etnaviv/etnaviv_query.c b/lib/mesa/src/gallium/drivers/etnaviv/etnaviv_query.c deleted file mode 100644 index b33e58046..000000000 --- a/lib/mesa/src/gallium/drivers/etnaviv/etnaviv_query.c +++ /dev/null @@ -1,120 +0,0 @@ -/* - * Copyright (c) 2016 Etnaviv Project - * - * 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 - * THE AUTHORS OR COPYRIGHT HOLDERS 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. - * - * Authors: - * Rob Clark <robclark@freedesktop.org> - * Christian Gmeiner <christian.gmeiner@gmail.com> - */ - -#include "pipe/p_screen.h" - -#include "etnaviv_context.h" -#include "etnaviv_query.h" -#include "etnaviv_query_sw.h" - -static struct pipe_query * -etna_create_query(struct pipe_context *pctx, unsigned query_type, - unsigned index) -{ - struct etna_context *ctx = etna_context(pctx); - struct etna_query *q; - - q = etna_sw_create_query(ctx, query_type); - - return (struct pipe_query *)q; -} - -static void -etna_destroy_query(struct pipe_context *pctx, struct pipe_query *pq) -{ - struct etna_query *q = etna_query(pq); - - q->funcs->destroy_query(etna_context(pctx), q); -} - -static boolean -etna_begin_query(struct pipe_context *pctx, struct pipe_query *pq) -{ - struct etna_query *q = etna_query(pq); - - return q->funcs->begin_query(etna_context(pctx), q); -} - -static bool -etna_end_query(struct pipe_context *pctx, struct pipe_query *pq) -{ - struct etna_query *q = etna_query(pq); - - q->funcs->end_query(etna_context(pctx), q); - return true; -} - -static boolean -etna_get_query_result(struct pipe_context *pctx, struct pipe_query *pq, - boolean wait, union pipe_query_result *result) -{ - struct etna_query *q = etna_query(pq); - - return q->funcs->get_query_result(etna_context(pctx), q, wait, result); -} - -static int -etna_get_driver_query_info(struct pipe_screen *pscreen, unsigned index, - struct pipe_driver_query_info *info) -{ - struct pipe_driver_query_info list[] = { - {"prims-emitted", PIPE_QUERY_PRIMITIVES_EMITTED, { 0 }}, - {"draw-calls", ETNA_QUERY_DRAW_CALLS, { 0 }}, - }; - - if (!info) - return ARRAY_SIZE(list); - - if (index >= ARRAY_SIZE(list)) - return 0; - - *info = list[index]; - - return 1; -} - -static void -etna_set_active_query_state(struct pipe_context *pipe, boolean enable) -{ -} - -void -etna_query_screen_init(struct pipe_screen *pscreen) -{ - pscreen->get_driver_query_info = etna_get_driver_query_info; -} - -void -etna_query_context_init(struct pipe_context *pctx) -{ - pctx->create_query = etna_create_query; - pctx->destroy_query = etna_destroy_query; - pctx->begin_query = etna_begin_query; - pctx->end_query = etna_end_query; - pctx->get_query_result = etna_get_query_result; - pctx->set_active_query_state = etna_set_active_query_state; -} |