diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2021-10-28 09:49:03 -0400 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2021-11-03 20:15:49 +0000 |
| commit | 7495998ce2ddf0ec24911ca7878c3b405daad960 (patch) | |
| tree | f86631c911df18d108d1106bf698aaca266f19a9 | |
| parent | ce3598d34b95f8cb763b3f18b9964ebb12621e6f (diff) | |
| download | mesa-7495998ce2ddf0ec24911ca7878c3b405daad960.tar.gz | |
zink: clamp max buffer sizes to smallest buffer heap size
the max driver limit for these is irrelevant if there isn't enough memory
to allocate a buffer of that size
KHR-GL46.texture_buffer.texture_buffer_max_size
cc: mesa-stable
fixes #5568
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13584>
(cherry picked from commit ccfe36fffabbbc25cdd0fc0f7bf6bf30de0e1268)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/zink/zink_screen.c | 25 |
2 files changed, 23 insertions, 4 deletions
diff --git a/.pick_status.json b/.pick_status.json index 8a8549d56e9..8b21440fcae 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -589,7 +589,7 @@ "description": "zink: clamp max buffer sizes to smallest buffer heap size", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index c7606e8e748..21ea1acff41 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -279,6 +279,23 @@ zink_get_compute_param(struct pipe_screen *pscreen, enum pipe_shader_ir ir_type, } } +static uint32_t +get_smallest_buffer_heap(struct zink_screen *screen) +{ + enum zink_heap heaps[] = { + ZINK_HEAP_DEVICE_LOCAL, + ZINK_HEAP_DEVICE_LOCAL_VISIBLE, + ZINK_HEAP_HOST_VISIBLE_COHERENT, + ZINK_HEAP_HOST_VISIBLE_COHERENT + }; + unsigned size = UINT32_MAX; + for (unsigned i = 0; i < ARRAY_SIZE(heaps); i++) { + unsigned heap_idx = screen->info.mem_props.memoryTypes[screen->heap_map[i]].heapIndex; + size = MIN2(screen->info.mem_props.memoryHeaps[heap_idx].size, size); + } + return size; +} + static int zink_get_param(struct pipe_screen *pscreen, enum pipe_cap param) { @@ -525,7 +542,8 @@ zink_get_param(struct pipe_screen *pscreen, enum pipe_cap param) return 1; case PIPE_CAP_MAX_TEXTURE_BUFFER_SIZE: - return screen->info.props.limits.maxTexelBufferElements; + return MIN2(get_smallest_buffer_heap(screen), + screen->info.props.limits.maxTexelBufferElements); case PIPE_CAP_ENDIANNESS: return PIPE_ENDIAN_NATIVE; /* unsure */ @@ -620,7 +638,7 @@ zink_get_param(struct pipe_screen *pscreen, enum pipe_cap param) /* 1<<27 is required by VK spec */ assert(screen->info.props.limits.maxStorageBufferRange >= 1 << 27); /* but Gallium can't handle values that are too big, so clamp to VK spec minimum */ - return 1 << 27; + return MIN2(get_smallest_buffer_heap(screen), 1 << 27); case PIPE_CAP_TGSI_FS_COORD_ORIGIN_UPPER_LEFT: case PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_HALF_INTEGER: @@ -800,7 +818,8 @@ zink_get_shader_param(struct pipe_screen *pscreen, /* At least 16384 is guaranteed by VK spec */ assert(screen->info.props.limits.maxUniformBufferRange >= 16384); /* but Gallium can't handle values that are too big */ - return MIN2(screen->info.props.limits.maxUniformBufferRange, 1 << 31); + return MIN3(get_smallest_buffer_heap(screen), + screen->info.props.limits.maxUniformBufferRange, 1 << 31); case PIPE_SHADER_CAP_MAX_CONST_BUFFERS: return MIN2(screen->info.props.limits.maxPerStageDescriptorUniformBuffers, |