Mesa (staging/22.0): r300: set PIPE_BIND_CONSTANT_BUFFER for const_uploader

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: 8f8ec897d0443a6e36e6229311868505a6008656
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8f8ec897d0443a6e36e6229311868505a6008656

Author: Pavel Ondračka <pavel.ondracka at gmail.com>
Date:   Sun Apr 24 18:58:14 2022 +0200

r300: set PIPE_BIND_CONSTANT_BUFFER for const_uploader

Fixes constant uploads with nine.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5966
CC: mesa-stable
Signed-off-by: Pavel Ondračka <pavel.ondracka at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16125>
(cherry picked from commit e01f86c67b0bd955758366827cb8322aa1bec263)

---

 .pick_status.json                       | 2 +-
 src/gallium/drivers/r300/r300_context.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 8c64e3e680e..d7f82283336 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -372,7 +372,7 @@
         "description": "r300: set PIPE_BIND_CONSTANT_BUFFER for const_uploader",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "because_sha": null
     },
     {
diff --git a/src/gallium/drivers/r300/r300_context.c b/src/gallium/drivers/r300/r300_context.c
index 3acc55d312a..8c8d02cb463 100644
--- a/src/gallium/drivers/r300/r300_context.c
+++ b/src/gallium/drivers/r300/r300_context.c
@@ -442,7 +442,9 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen,
                                      PIPE_BIND_CUSTOM, PIPE_USAGE_STREAM, 0);
     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->context.const_uploader = u_upload_create(&r300->context, 1024 * 1024,
+                                                   PIPE_BIND_CONSTANT_BUFFER,
+                                                   PIPE_USAGE_STREAM, 0);
 
     r300->blitter = util_blitter_create(&r300->context);
     if (r300->blitter == NULL)