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

microsoft/compiler: Handle images as derefs for GL

Browse source 
Reviewed-by: Sil Vilerino <sivileri@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14342>
This commit is contained in:
Jesse Natalie 2021-12-30 17:51:41 -08:00 • committed by Marge Bot
parent a7311ceafe
commit 1b62c86eb1
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/microsoft/compiler/nir_to_dxil.c
View file

@ -2469,7 +2469,8 @@ get_resource_handle(struct ntd_context *ctx, nir_src *src, enum dxil_resource_cl
return *handle_entry; return *handle_entry;
const struct dxil_value *value = get_src_ssa(ctx, src->ssa, 0); const struct dxil_value *value = get_src_ssa(ctx, src->ssa, 0);
if (ctx->opts->environment == DXIL_ENVIRONMENT_VULKAN) { if (nir_src_as_deref(*src) ||
ctx->opts->environment == DXIL_ENVIRONMENT_VULKAN) {
return value; return value;
} }
@ -3580,10 +3581,10 @@ emit_deref(struct ntd_context* ctx, nir_deref_instr* instr)
assert(instr->deref_type == nir_deref_type_var || assert(instr->deref_type == nir_deref_type_var ||
instr->deref_type == nir_deref_type_array); instr->deref_type == nir_deref_type_array);
/* In the non-Vulkan environment, there's nothing to emit. Any references to /* In the CL environment, there's nothing to emit. Any references to
* derefs will emit the necessary logic to handle scratch/shared GEP addressing * derefs will emit the necessary logic to handle scratch/shared GEP addressing
*/ */
if (ctx->opts->environment != DXIL_ENVIRONMENT_VULKAN) if (ctx->opts->environment == DXIL_ENVIRONMENT_CL)
return true; return true;
/* In the Vulkan environment, we don't have cached handles for textures or /* In the Vulkan environment, we don't have cached handles for textures or
@ -3600,9 +3601,11 @@ emit_deref(struct ntd_context* ctx, nir_deref_instr* instr)
const struct glsl_type *type = instr->type; const struct glsl_type *type = instr->type;
const struct dxil_value *binding; const struct dxil_value *binding;
unsigned binding_val = ctx->opts->environment == DXIL_ENVIRONMENT_GL ?
var->data.driver_location : var->data.binding;
if (instr->deref_type == nir_deref_type_var) { if (instr->deref_type == nir_deref_type_var) {
binding = dxil_module_get_int32_const(&ctx->mod, var->data.binding); binding = dxil_module_get_int32_const(&ctx->mod, binding_val);
} else { } else {
const struct dxil_value *base = get_src(ctx, &instr->parent, 0, nir_type_uint32); const struct dxil_value *base = get_src(ctx, &instr->parent, 0, nir_type_uint32);
const struct dxil_value *offset = get_src(ctx, &instr->arr.index, 0, nir_type_uint32); const struct dxil_value *offset = get_src(ctx, &instr->arr.index, 0, nir_type_uint32);
@ -3636,8 +3639,10 @@ emit_deref(struct ntd_context* ctx, nir_deref_instr* instr)
else else
res_class = DXIL_RESOURCE_CLASS_SRV; res_class = DXIL_RESOURCE_CLASS_SRV;
unsigned descriptor_set = ctx->opts->environment == DXIL_ENVIRONMENT_VULKAN ?
var->data.descriptor_set : (glsl_type_is_image(type) ? 1 : 0);
const struct dxil_value *handle = emit_createhandle_call(ctx, res_class, const struct dxil_value *handle = emit_createhandle_call(ctx, res_class,
get_resource_id(ctx, res_class, var->data.descriptor_set, var->data.binding), binding, false); get_resource_id(ctx, res_class, descriptor_set, binding_val), binding, false);
if (!handle) if (!handle)
return false; return false;

3
src/microsoft/compiler/nir_to_dxil.h
View file

@ -55,7 +55,8 @@ enum dxil_environment {
* All other resource variables have driver_location set instead, assigned from 0 -> N * All other resource variables have driver_location set instead, assigned from 0 -> N
* UBOs may or may not have interface variables, and are declared from ubo_binding_offset -> num_ubos; no dynamic indexing yet * UBOs may or may not have interface variables, and are declared from ubo_binding_offset -> num_ubos; no dynamic indexing yet
* SSBOs may or may not have interface variables, and are declared from from 0 -> num_ssbos; no dynamic indexing yet * SSBOs may or may not have interface variables, and are declared from from 0 -> num_ssbos; no dynamic indexing yet
* No images, immediate constant buffer, or scratch * Images are *not* lowered, so that dynamic indexing can deterministically get a base binding via the deref chain
* No immediate constant buffer, or scratch
*/ */
DXIL_ENVIRONMENT_GL, DXIL_ENVIRONMENT_GL,
/* In the CL environment: /* In the CL environment: