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

nir/tex_instr: Rename sampler to texture

Browse Source 
We're about to separate the two concepts.  When we do, the sampler will
become optional.  Doing a rename first makes the separation a bit more
safe because drivers that depend on GLSL or TGSI behaviour will be fine to
just use the texture index all the time.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jason Ekstrand
2016-02-06 09:05:10 -08:00
parent 3f42184994
commit ee85014b90
18 changed files with 95 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/compiler/nir/nir_print.c
View File

@@ -622,8 +622,8 @@ print_tex_instr(nir_tex_instr *instr, print_state *state)
case nir_tex_src_ddy:
fprintf(fp, "(ddy)");
break;
case nir_tex_src_sampler_offset:
fprintf(fp, "(sampler_offset)");
case nir_tex_src_texture_offset:
fprintf(fp, "(texture_offset)");
break;
default:
@@ -652,13 +652,13 @@ print_tex_instr(nir_tex_instr *instr, print_state *state)
fprintf(fp, "%u (gather_component), ", instr->component);
}
if (instr->sampler) {
print_deref(instr->sampler, state);
if (instr->texture) {
print_deref(instr->texture, state);
} else {
fprintf(fp, "%u", instr->sampler_index);
fprintf(fp, "%u", instr->texture_index);
}
fprintf(fp, " (sampler)");
fprintf(fp, " (texture)");
}
static void