OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

r600: fix r600_buffer_from_user_memory for rusticl

Browse Source 
Not entirely sure if it's actually required, but this makes it consistence
with r600_resource_create also calling r600_compute_global_buffer_create
for global memory buffers.

Cc: mesa-stable
Acked-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Patrick Lerda <patrick9876@free.fr>

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34623>
(cherry picked from commit f6e3c967d9a1f1c680613d53306a415afb977247)
This commit is contained in:
Karol Herbst
2025-04-20 16:46:35 +02:00
committed by Eric Engestrom
parent 53adfa7182
commit c42b829ac4
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.pick_status.json
View File

@@ -284,7 +284,7 @@
"description": "r600: fix r600_buffer_from_user_memory for rusticl", "description": "r600: fix r600_buffer_from_user_memory for rusticl",
"nominated": true, "nominated": true,
"nomination_type": 1, "nomination_type": 1,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": null, "because_sha": null,
"notes": null "notes": null

3
src/gallium/drivers/r600/r600_buffer_common.c
View File

@@ -600,8 +600,7 @@ r600_buffer_from_user_memory(struct pipe_screen *screen,
struct radeon_winsys *ws = rscreen->ws; struct radeon_winsys *ws = rscreen->ws;
struct r600_resource *rbuffer; struct r600_resource *rbuffer;
if ((templ->bind & PIPE_BIND_GLOBAL) && if (templ->bind & PIPE_BIND_GLOBAL) {
(templ->bind & PIPE_BIND_COMPUTE_RESOURCE)) {
rbuffer = r600_resource(r600_compute_global_buffer_create(screen, templ)); rbuffer = r600_resource(r600_compute_global_buffer_create(screen, templ));
((struct r600_resource_global *)rbuffer)->chunk->real_buffer = rbuffer; ((struct r600_resource_global *)rbuffer)->chunk->real_buffer = rbuffer;
} else { } else {