AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: make samplerview bind mask apply to buffer resources too

Browse Source 
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11747>
This commit is contained in:
Mike Blumenkrantz
2021-05-11 10:13:45 -04:00
parent d48367fbad
commit de903ae0c7
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/zink_context.c
+2 -3
View File
@@ -1338,8 +1338,7 @@ unbind_samplerview(struct zink_context *ctx, enum pipe_shader_type stage, unsign
struct zink_resource *res = zink_resource(sv->base.texture);
check_samplerview_for_batch_ref(ctx, sv);
update_res_bind_count(ctx, res, stage == PIPE_SHADER_COMPUTE, true);
if (!res->obj->is_buffer)
res->sampler_binds[stage] &= ~BITFIELD_BIT(slot);
res->sampler_binds[stage] &= ~BITFIELD_BIT(slot);
}
static void
@@ -1401,12 +1400,12 @@ zink_set_sampler_views(struct pipe_context *pctx,
} else if (a != b)
update = true;
flush_pending_clears(ctx, res);
res->sampler_binds[shader_type] |= BITFIELD_BIT(start_slot + i);
check_for_layout_update(ctx, res, shader_type == PIPE_SHADER_COMPUTE);
zink_batch_usage_set(&b->image_view->batch_uses, ctx->batch.state);
if (!a)
update = true;
}
res->sampler_binds[shader_type] |= BITFIELD_BIT(start_slot + i);
zink_batch_resource_usage_set(&ctx->batch, res, false);
} else if (a) {
unbind_samplerview(ctx, shader_type, start_slot + i);
src/gallium/drivers/zink/zink_resource.h
+1 -1
View File
@@ -114,11 +114,11 @@ struct zink_resource {
VkImageLayout layout;
VkImageAspectFlags aspect;
bool optimal_tiling;
uint32_t sampler_binds[PIPE_SHADER_TYPES];
uint8_t fb_binds;
uint16_t image_bind_count[2]; //gfx, compute
};
};
uint32_t sampler_binds[PIPE_SHADER_TYPES];
uint16_t write_bind_count[2]; //gfx, compute
uint16_t bind_count[2]; //gfx, compute