aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Eric Pelloux-Prayer <[email protected]>2019-12-05 10:07:52 +0100
committerPierre-Eric Pelloux-Prayer <[email protected]>2019-12-16 09:30:14 +0100
commit2c1983aefeb6dacfbc61f9edd71975ea359fae40 (patch)
treeb8d60abe4d33644f75bb3533c3755d586a28db2b
parent0e286f6cbf34206e0f243895e9b125ae1d08ca75 (diff)
gallium: refuse to create buffers larger than UINT32_MAX
pipe_resource.width0 is 32 bits and hardware support for bigger buffer is limited (eg: AMD hardware doesn't support buffer shader resources bigger than 4GB). Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2053 Reviewed-by: Marek Olšák <[email protected]> Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2948> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2948>
-rw-r--r--src/mesa/state_tracker/st_cb_bufferobjects.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.c b/src/mesa/state_tracker/st_cb_bufferobjects.c
index 6c20a57ef76..7776bf6ef91 100644
--- a/src/mesa/state_tracker/st_cb_bufferobjects.c
+++ b/src/mesa/state_tracker/st_cb_bufferobjects.c
@@ -289,6 +289,15 @@ bufferobj_data(struct gl_context *ctx,
struct st_memory_object *st_mem_obj = st_memory_object(memObj);
bool is_mapped = _mesa_bufferobj_mapped(obj, MAP_USER);
+ if (size > UINT32_MAX || offset > UINT32_MAX) {
+ /* pipe_resource.width0 is 32 bits only and increasing it
+ * to 64 bits doesn't make much sense since hw support
+ * for > 4GB resources is limited.
+ */
+ st_obj->Base.Size = 0;
+ return GL_FALSE;
+ }
+
if (target != GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD &&
size && st_obj->buffer &&
st_obj->Base.Size == size &&