fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 00:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: rename zink_context::dummy_buffer -> dummy_vertex_buffer

Browse source 
this is a bit more specific

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8943>
This commit is contained in:
Mike Blumenkrantz 2020-10-09 11:11:43 -04:00 • committed by Marge Bot
parent 0b69e8b16f
commit ce230f15e4
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/zink/zink_context.c
View file

@ -61,7 +61,7 @@ zink_context_destroy(struct pipe_context *pctx)
util_blitter_destroy(ctx->blitter);
pipe_resource_reference(&ctx->dummy_buffer, NULL);
pipe_resource_reference(&ctx->dummy_vertex_buffer, NULL);
for (unsigned i = 0; i < ARRAY_SIZE(ctx->null_buffers); i++)
pipe_resource_reference(&ctx->null_buffers[i], NULL);
@ -1750,9 +1750,9 @@ zink_context_create(struct pipe_screen *pscreen, void *priv, unsigned flags)
goto fail;
const uint8_t data[] = { 0 };
ctx->dummy_buffer = pipe_buffer_create_with_data(&ctx->base,
ctx->dummy_vertex_buffer = pipe_buffer_create_with_data(&ctx->base,
PIPE_BIND_VERTEX_BUFFER, PIPE_USAGE_IMMUTABLE, sizeof(data), data);
if (!ctx->dummy_buffer)
if (!ctx->dummy_vertex_buffer)
goto fail;
/* start the first batch */

2
src/gallium/drivers/zink/zink_context.h
View file

@ -170,7 +170,7 @@ struct zink_context {
struct list_head primitives_generated_queries;
bool queries_disabled, render_condition_active;
struct pipe_resource *dummy_buffer;
struct pipe_resource *dummy_vertex_buffer;
struct pipe_resource *null_buffers[5]; /* used to create zink_framebuffer->null_surface, one buffer per samplecount */
uint32_t num_so_targets;

4
src/gallium/drivers/zink/zink_draw.c
View file

@ -150,7 +150,7 @@ zink_bind_vertex_buffers(struct zink_batch *batch, struct zink_context *ctx)
buffer_offsets[i] = vb->buffer_offset;
zink_batch_reference_resource_rw(batch, res, false);
} else {
buffers[i] = zink_resource(ctx->dummy_buffer)->buffer;
buffers[i] = zink_resource(ctx->dummy_vertex_buffer)->buffer;
buffer_offsets[i] = 0;
}
}
@ -267,7 +267,7 @@ update_descriptors(struct zink_context *ctx, struct zink_screen *screen, bool is
buffer_infos[num_buffer_info].buffer = res ? res->buffer :
(screen->info.rb2_feats.nullDescriptor ?
VK_NULL_HANDLE :
zink_resource(ctx->dummy_buffer)->buffer);
zink_resource(ctx->dummy_vertex_buffer)->buffer);
buffer_infos[num_buffer_info].offset = res ? ctx->ubos[stage][index].buffer_offset : 0;
buffer_infos[num_buffer_info].range = res ? ctx->ubos[stage][index].buffer_size : VK_WHOLE_SIZE;
wds[num_wds].pBufferInfo = buffer_infos + num_buffer_info;