瀏覽代碼

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

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>
tags/18.2-branchpoint
Marek Olšák 7 年之前
父節點
當前提交
17a42062cc
共有 1 個檔案被更改,包括 6 行新增3 行删除
  1. 6
    3
      src/gallium/drivers/r300/r300_context.c

+ 6
- 3
src/gallium/drivers/r300/r300_context.c 查看文件

@@ -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)

Loading…
取消
儲存