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

microsoft/compiler: Don't store static-indexing handles that are dynamically emitted

Browse Source 
These handles can be emitted in control flow, which means that the handle
might be in a block which does not dominate a block that's processed
later on, which results in incorrect DXIL if we try to reference it.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26803>
This commit is contained in:
Jesse Natalie
2023-12-08 14:01:34 -08:00
committed by Marge Bot
parent 108b205830
commit 6fc8d0147e
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/microsoft/compiler/nir_to_dxil.c
+10 -12
View File
@@ -3328,39 +3328,39 @@ get_resource_handle(struct ntd_context *ctx, nir_src *src, enum dxil_resource_cl
{
/* This source might be one of:
* 1. Constant resource index - just look it up in precomputed handle arrays
* If it's null in that array, create a handle, and store the result
* If it's null in that array, create a handle
* 2. A handle from load_vulkan_descriptor - just get the stored SSA value
* 3. Dynamic resource index - create a handle for it here
*/
assert(src->ssa->num_components == 1 && src->ssa->bit_size == 32);
nir_const_value *const_block_index = nir_src_as_const_value(*src);
const struct dxil_value **handle_entry = NULL;
const struct dxil_value *handle_entry = NULL;
if (const_block_index) {
assert(ctx->opts->environment != DXIL_ENVIRONMENT_VULKAN);
switch (kind) {
case DXIL_RESOURCE_KIND_CBUFFER:
handle_entry = &ctx->cbv_handles[const_block_index->u32];
handle_entry = ctx->cbv_handles[const_block_index->u32];
break;
case DXIL_RESOURCE_KIND_RAW_BUFFER:
if (class == DXIL_RESOURCE_CLASS_UAV)
handle_entry = &ctx->ssbo_handles[const_block_index->u32];
handle_entry = ctx->ssbo_handles[const_block_index->u32];
else
handle_entry = &ctx->srv_handles[const_block_index->u32];
handle_entry = ctx->srv_handles[const_block_index->u32];
break;
case DXIL_RESOURCE_KIND_SAMPLER:
handle_entry = &ctx->sampler_handles[const_block_index->u32];
handle_entry = ctx->sampler_handles[const_block_index->u32];
break;
default:
if (class == DXIL_RESOURCE_CLASS_UAV)
handle_entry = &ctx->image_handles[const_block_index->u32];
handle_entry = ctx->image_handles[const_block_index->u32];
else
handle_entry = &ctx->srv_handles[const_block_index->u32];
handle_entry = ctx->srv_handles[const_block_index->u32];
break;
}
}
if (handle_entry && *handle_entry)
return *handle_entry;
if (handle_entry)
return handle_entry;
if (nir_src_as_deref(*src) ||
ctx->opts->environment == DXIL_ENVIRONMENT_VULKAN) {
@@ -3395,8 +3395,6 @@ get_resource_handle(struct ntd_context *ctx, nir_src *src, enum dxil_resource_cl
const struct dxil_value *value = get_src(ctx, src, 0, nir_type_uint);
const struct dxil_value *handle = emit_createhandle_call_dynamic(ctx, class,
space, base_binding, value, !const_block_index);
if (handle_entry)
*handle_entry = handle;
return handle;
}