Attachment 140026 Details for Bug 106533 – patch

[patch] patch

0001-r300g-swtcl-make-pipe_context-uploaders-use-malloc-d.patch (text/plain), 2.01 KB, created by Marek Olšák on 2018-06-05 00:47:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marek Olšák

Created: 2018-06-05 00:47:42 UTC

Size: 2.01 KB

patch

obsolete

>From 25c27b3cf64b349fb7734216cffc30dd08e3492a Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
>Date: Mon, 4 Jun 2018 20:39:07 -0400
>Subject: [PATCH] r300g/swtcl: make pipe_context uploaders use malloc'd memory
> as before
>
>Discovered by Roland Scheidegger.
>
>The resource_create code uses GPU memory for PIPE_BIND_CUSTOM, but
>malloc'd memory otherwise. Vertex and index buffers should use malloc'd
>memory.
>
>Cc: 18.0 18.1 <mesa-stable@lists.freedesktop.org>
>---
> src/gallium/drivers/r300/r300_context.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
>diff --git a/src/gallium/drivers/r300/r300_context.c b/src/gallium/drivers/r300/r300_context.c
>index 627ba0c5702..79bfdc53d25 100644
>--- a/src/gallium/drivers/r300/r300_context.c
>+++ b/src/gallium/drivers/r300/r300_context.c
>@@ -88,6 +88,8 @@ static void r300_destroy_context(struct pipe_context* context)
> 
>     if (r300->uploader)
>         u_upload_destroy(r300->uploader);
>+    if (r300->context.stream_uploader)
>+        u_upload_destroy(r300->context.stream_uploader);
> 
>     /* XXX: This function assumes r300->query_list was initialized */
>     r300_release_referenced_objects(r300);
>@@ -424,10 +426,11 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen,
>     r300->context.create_video_codec = vl_create_decoder;
>     r300->context.create_video_buffer = vl_video_buffer_create;
> 
>-    r300->uploader = u_upload_create(&r300->context, 1024 * 1024,
>+    r300->uploader = u_upload_create(&r300->context, 128 * 1024,
>                                      PIPE_BIND_CUSTOM, PIPE_USAGE_STREAM, 0);
>-    r300->context.stream_uploader = r300->uploader;
>-    r300->context.const_uploader = r300->uploader;
>+    r300->context.stream_uploader = u_upload_create(&r300->context, 1024 * 1024,
>+                                                    0, PIPE_USAGE_STREAM, 0);
>+    r300->context.const_uploader = r300->context.stream_uploader;
> 
>     r300->blitter = util_blitter_create(&r300->context);
>     if (r300->blitter == NULL)
>-- 
>2.17.0
>

Actions: View | Splinter Review

Attachments on bug 106533: 139995 | 140026 | 140027

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.