---
src/intel/vulkan/anv_nir_apply_pipeline_layout.c | 18 +++++++++++-------
src/intel/vulkan/anv_nir_lower_ycbcr_textures.c | 2 +-
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/intel/vulkan/anv_nir_apply_pipeline_layout.c
b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c
index 505f7b0a93b..a9928894ae1 100644
--- a/src/intel/vulkan/anv_nir_apply_pipeline_layout.c
+++ b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c
@@ -89,10 +89,13 @@ get_used_bindings_block(nir_block *block,
}
case nir_instr_type_tex: {
nir_tex_instr *tex = nir_instr_as_tex(instr);
- assert(tex->texture);
- add_var_binding(state, tex->texture->var);
- if (tex->sampler)
- add_var_binding(state, tex->sampler->var);
+ nir_variable *texture = nir_tex_texture_var(tex);
+ assert(texture);
+ add_var_binding(state, texture);
+
+ nir_variable *sampler = nir_tex_sampler_var(tex);
+ if (sampler)
+ add_var_binding(state, sampler);
break;
}
default:
@@ -246,12 +249,13 @@ static void
lower_tex(nir_tex_instr *tex, struct apply_pipeline_layout_state *state)
{
/* No one should have come by and lowered it already */
- assert(tex->texture);
+ nir_variable *texture = nir_tex_texture_var(tex);
+ assert(texture);
state->builder.cursor = nir_before_instr(&tex->instr);
- unsigned set = tex->texture->var->data.descriptor_set;
- unsigned binding = tex->texture->var->data.binding;
+ unsigned set = texture->data.descriptor_set;
+ unsigned binding = texture->data.binding;
unsigned array_size =
state->layout->set[set].layout->binding[binding].array_size;
bool has_plane = has_tex_src_plane(tex);
diff --git a/src/intel/vulkan/anv_nir_lower_ycbcr_textures.c
b/src/intel/vulkan/anv_nir_lower_ycbcr_textures.c
index ebf1fd9c267..2ce8617f885 100644
--- a/src/intel/vulkan/anv_nir_lower_ycbcr_textures.c
+++ b/src/intel/vulkan/anv_nir_lower_ycbcr_textures.c
@@ -320,7 +320,7 @@ try_lower_tex_ycbcr(struct anv_pipeline_layout *layout,
nir_builder *builder,
nir_tex_instr *tex)
{
- nir_variable *var = tex->texture->var;
+ nir_variable *var = nir_tex_texture_var(tex);
const struct anv_descriptor_set_layout *set_layout =
layout->set[var->data.descriptor_set].layout;
const struct anv_descriptor_set_binding_layout *binding =
--
2.14.3
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
