fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 02:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

r300g/swtcl: make pipe_context uploaders use malloc'd memory as before

Browse source 
Discovered by Roland Scheidegger.

The resource_create code uses GPU memory for PIPE_BIND_CUSTOM, but
malloc'd memory otherwise. Vertex and index buffers should use malloc'd
memory.

Cc: 18.0 18.1 <mesa-stable@lists.freedesktop.org>
(cherry picked from commit 17a42062cc)
This commit is contained in:
Marek Olšák 2018-06-04 20:39:07 -04:00 • committed by Dylan Baker
parent f5865f1f58
commit 3a85a6180b
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gallium/drivers/r300/r300_context.c
View file

@ -88,6 +88,8 @@ static void r300_destroy_context(struct pipe_context* context)
if (r300->uploader)
u_upload_destroy(r300->uploader);
if (r300->context.stream_uploader)
u_upload_destroy(r300->context.stream_uploader);
/* XXX: This function assumes r300->query_list was initialized */
r300_release_referenced_objects(r300);
@ -424,10 +426,11 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen,
r300->context.create_video_codec = vl_create_decoder;
r300->context.create_video_buffer = vl_video_buffer_create;
r300->uploader = u_upload_create(&r300->context, 1024 * 1024,
r300->uploader = u_upload_create(&r300->context, 128 * 1024,
PIPE_BIND_CUSTOM, PIPE_USAGE_STREAM, 0);
r300->context.stream_uploader = r300->uploader;
r300->context.const_uploader = r300->uploader;
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->blitter = util_blitter_create(&r300->context);
if (r300->blitter == NULL)