Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>
But please, fix the comment in the nv50_query struct, now it is "/* base + i * 32 */".
On 04/04/2015 06:00 AM, Ilia Mirkin wrote:
Commit 1a170980a09 started writing to q->data[4]/[5] but kept the per-query space at 16, which meant that in some cases we would write past the end of the buffer. Rotate by 32, like nvc0 does. Signed-off-by: Ilia Mirkin <imir...@alum.mit.edu> Tested-by: Nick Tenney <nick.ten...@gmail.com> Cc: "10.4 10.5" <mesa-sta...@lists.freedesktop.org> --- src/gallium/drivers/nouveau/nv50/nv50_query.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/nouveau/nv50/nv50_query.c b/src/gallium/drivers/nouveau/nv50/nv50_query.c index e81ac5a..6a23de4 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_query.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_query.c @@ -116,8 +116,8 @@ nv50_query_create(struct pipe_context *pipe, unsigned type, unsigned index) q->type = type;if (q->type == PIPE_QUERY_OCCLUSION_COUNTER) {- q->offset -= 16; - q->data -= 16 / sizeof(*q->data); /* we advance before query_begin ! */ + q->offset -= 32; + q->data -= 32 / sizeof(*q->data); /* we advance before query_begin ! */ }return (struct pipe_query *)q;@@ -150,8 +150,8 @@ nv50_query_begin(struct pipe_context *pipe, struct pipe_query *pq) * initialized it to TRUE. */ if (q->type == PIPE_QUERY_OCCLUSION_COUNTER) { - q->offset += 16; - q->data += 16 / sizeof(*q->data); + q->offset += 32; + q->data += 32 / sizeof(*q->data); if (q->offset - q->base == NV50_QUERY_ALLOC_SPACE) nv50_query_allocate(nv50, q, NV50_QUERY_ALLOC_SPACE);
_______________________________________________ Nouveau mailing list Nouveau@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/nouveau
