OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ac/nir: Support deref instructions in tex instructions.

Browse Source 
Acked-by: Rob Clark <robdclark@gmail.com>
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Acked-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Bas Nieuwenhuizen
2018-03-22 00:45:54 +01:00
committed by Jason Ekstrand
parent 9b14eacf0e
commit ca271e266e
2 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/amd/common/ac_nir_to_llvm.c
View File

@@ -3237,21 +3237,44 @@ static void tex_fetch_ptrs(struct ac_nir_context *ctx,
LLVMValueRef *res_ptr, LLVMValueRef *samp_ptr, LLVMValueRef *res_ptr, LLVMValueRef *samp_ptr,
LLVMValueRef *fmask_ptr) LLVMValueRef *fmask_ptr)
{ {
nir_deref_instr *texture_deref_instr = NULL;
nir_deref_instr *sampler_deref_instr = NULL;
nir_deref_var *texture_deref_var = NULL;
nir_deref_var *sampler_deref_var = NULL;
for (unsigned i = 0; i < instr->num_srcs; i++) {
switch (instr->src[i].src_type) {
case nir_tex_src_texture_deref:
texture_deref_instr = nir_src_as_deref(instr->src[i].src);
break;
case nir_tex_src_sampler_deref:
sampler_deref_instr = nir_src_as_deref(instr->src[i].src);
break;
default:
break;
}
}
if (!sampler_deref_instr)
sampler_deref_instr = texture_deref_instr;
if (!texture_deref_instr) {
texture_deref_var = instr->texture;
sampler_deref_var = instr->sampler ? instr->sampler : instr->texture;
}
if (instr->sampler_dim == GLSL_SAMPLER_DIM_BUF) if (instr->sampler_dim == GLSL_SAMPLER_DIM_BUF)
*res_ptr = get_sampler_desc(ctx, instr->texture, NULL, AC_DESC_BUFFER, instr, false, false); *res_ptr = get_sampler_desc(ctx, texture_deref_var, texture_deref_instr, AC_DESC_BUFFER, instr, false, false);
else else
*res_ptr = get_sampler_desc(ctx, instr->texture, NULL, AC_DESC_IMAGE, instr, false, false); *res_ptr = get_sampler_desc(ctx, texture_deref_var, texture_deref_instr, AC_DESC_IMAGE, instr, false, false);
if (samp_ptr) { if (samp_ptr) {
if (instr->sampler) *samp_ptr = get_sampler_desc(ctx, sampler_deref_var, sampler_deref_instr, AC_DESC_SAMPLER, instr, false, false);
*samp_ptr = get_sampler_desc(ctx, instr->sampler, NULL, AC_DESC_SAMPLER, instr, false, false);
else
*samp_ptr = get_sampler_desc(ctx, instr->texture, NULL, AC_DESC_SAMPLER, instr, false, false);
if (instr->sampler_dim < GLSL_SAMPLER_DIM_RECT) if (instr->sampler_dim < GLSL_SAMPLER_DIM_RECT)
*samp_ptr = sici_fix_sampler_aniso(ctx, *res_ptr, *samp_ptr); *samp_ptr = sici_fix_sampler_aniso(ctx, *res_ptr, *samp_ptr);
} }
if (fmask_ptr && !instr->sampler && (instr->op == nir_texop_txf_ms || if (fmask_ptr && !instr->sampler && (instr->op == nir_texop_txf_ms ||
instr->op == nir_texop_samples_identical)) instr->op == nir_texop_samples_identical))
*fmask_ptr = get_sampler_desc(ctx, instr->texture, NULL, AC_DESC_FMASK, instr, false, false); *fmask_ptr = get_sampler_desc(ctx, instr->texture, texture_deref_instr, AC_DESC_FMASK, instr, false, false);
} }
static LLVMValueRef apply_round_slice(struct ac_llvm_context *ctx, static LLVMValueRef apply_round_slice(struct ac_llvm_context *ctx,

13
src/amd/vulkan/radv_shader_info.c
View File

@@ -294,6 +294,19 @@ static void
gather_tex_info(const nir_shader *nir, const nir_tex_instr *instr, gather_tex_info(const nir_shader *nir, const nir_tex_instr *instr,
struct radv_shader_info *info) struct radv_shader_info *info)
{ {
for (unsigned i = 0; i < instr->num_srcs; i++) {
switch (instr->src[i].src_type) {
case nir_tex_src_texture_deref:
mark_sampler_desc(nir_deref_instr_get_variable(nir_src_as_deref(instr->src[i].src)), info);
break;
case nir_tex_src_sampler_deref:
mark_sampler_desc(nir_deref_instr_get_variable(nir_src_as_deref(instr->src[i].src)), info);
break;
default:
break;
}
}
if (instr->sampler) if (instr->sampler)
mark_sampler_desc(instr->sampler->var, info); mark_sampler_desc(instr->sampler->var, info);
if (instr->texture) if (instr->texture)