summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2023-03-01 04:17:22 +1000
committerEric Engestrom <eric@engestrom.ch>2023-03-08 18:00:13 +0000
commit4b3a2e2475815f204d5fc568b09cdcf00a03820f (patch)
treec7ff05b55459c66520eb3ead2fe44122a0f5c795
parentbc594a5a916385e32b23f5a6067a4a2c8487deba (diff)
downloadmesa-4b3a2e2475815f204d5fc568b09cdcf00a03820f.tar.gz
llvmpipe: fix compute address bits to return native pointer size.
On 32-bit systems llvm will only be dealing with 32-bit ptrs Reviewed-by: Karol Herbst <kherbst@redhat.com> Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21601> (cherry picked from commit 53dda476a9e33503432b1f2d0b7da814377bb848)
-rw-r--r--.pick_status.json2
-rw-r--r--src/gallium/drivers/llvmpipe/lp_screen.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 7f331411d11..7377df04d03 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4108,7 +4108,7 @@
"description": "llvmpipe: fix compute address bits to return native pointer size.",
"nominated": true,
"nomination_type": 0,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": null
},
diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
index a4d7b405a44..5e594bb72df 100644
--- a/src/gallium/drivers/llvmpipe/lp_screen.c
+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
@@ -565,7 +565,7 @@ llvmpipe_get_compute_param(struct pipe_screen *_screen,
case PIPE_COMPUTE_CAP_ADDRESS_BITS:
if (ret) {
uint32_t *address_bits = ret;
- *address_bits = 64;
+ *address_bits = sizeof(void*) * 8;
}
return sizeof(uint32_t);
}