Attachment 119980 Details for Bug 93015 – patch that should fix the bug

[patch] patch that should fix the bug

0001-radeon-reset-query-buffers-for-PIPE_QUERY_TIMESTAMP.patch (text/plain), 2.21 KB, created by Nicolai Hähnle on 2015-11-20 13:01:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nicolai Hähnle

Created: 2015-11-20 13:01:41 UTC

Size: 2.21 KB

patch

obsolete

>From 976dc0a4cccbfdef9c09d217563f278e4276913c Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Nicolai=20H=C3=A4hnle?= <nhaehnle@gmail.com>
>Date: Fri, 20 Nov 2015 11:46:26 +0100
>Subject: [PATCH 1/2] radeon: reset query buffers for PIPE_QUERY_TIMESTAMP
>
>Since begin_query is not called for this query type, we need to reset the
>query buffer state in end_query instead.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93015
>---
> src/gallium/drivers/radeon/r600_query.c | 26 ++++++++++++++++++--------
> 1 file changed, 18 insertions(+), 8 deletions(-)
>
>diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c
>index ecf4084..4726b78 100644
>--- a/src/gallium/drivers/radeon/r600_query.c
>+++ b/src/gallium/drivers/radeon/r600_query.c
>@@ -654,17 +654,11 @@ static boolean r600_begin_query(struct pipe_context *ctx,
> 	return rquery->ops->begin(rctx, rquery);
> }
> 
>-boolean r600_query_hw_begin(struct r600_common_context *rctx,
>-			    struct r600_query *rquery)
>+static void r600_query_hw_reset_buffers(struct r600_common_context *rctx,
>+					struct r600_query_hw *query)
> {
>-	struct r600_query_hw *query = (struct r600_query_hw *)rquery;
> 	struct r600_query_buffer *prev = query->buffer.previous;
> 
>-	if (query->flags & R600_QUERY_HW_FLAG_NO_START) {
>-		assert(0);
>-		return false;
>-	}
>-
> 	/* Discard the old query buffers. */
> 	while (prev) {
> 		struct r600_query_buffer *qbuf = prev;
>@@ -682,6 +676,19 @@ boolean r600_query_hw_begin(struct r600_common_context *rctx,
> 
> 	query->buffer.results_end = 0;
> 	query->buffer.previous = NULL;
>+}
>+
>+boolean r600_query_hw_begin(struct r600_common_context *rctx,
>+			    struct r600_query *rquery)
>+{
>+	struct r600_query_hw *query = (struct r600_query_hw *)rquery;
>+
>+	if (query->flags & R600_QUERY_HW_FLAG_NO_START) {
>+		assert(0);
>+		return false;
>+	}
>+
>+	r600_query_hw_reset_buffers(rctx, query);
> 
> 	r600_query_hw_emit_start(rctx, query);
> 
>@@ -705,6 +712,9 @@ void r600_query_hw_end(struct r600_common_context *rctx,
> {
> 	struct r600_query_hw *query = (struct r600_query_hw *)rquery;
> 
>+	if (query->flags & R600_QUERY_HW_FLAG_NO_START)
>+		r600_query_hw_reset_buffers(rctx, query);
>+
> 	r600_query_hw_emit_stop(rctx, query);
> 
> 	if (!(query->flags & R600_QUERY_HW_FLAG_NO_START))
>-- 
>2.5.0
>

Actions: View | Splinter Review

Attachments on bug 93015: 119980 | 119981

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.