return "shader_out";
case nir_var_uniform:
return "uniform";
- case nir_var_ubo:
+ case nir_var_mem_ubo:
return "ubo";
case nir_var_system_value:
return "system";
- case nir_var_ssbo:
+ case nir_var_mem_ssbo:
return "ssbo";
- case nir_var_shared:
+ case nir_var_mem_shared:
return "shared";
- case nir_var_private:
- return want_local_global_mode ? "private" : "";
- case nir_var_function:
- return want_local_global_mode ? "function" : "";
+ case nir_var_mem_global:
+ return "global";
+ case nir_var_shader_temp:
+ return want_local_global_mode ? "shader_temp" : "";
+ case nir_var_function_temp:
+ return want_local_global_mode ? "function_temp" : "";
default:
return "";
}
if (var->data.mode == nir_var_shader_in ||
var->data.mode == nir_var_shader_out ||
var->data.mode == nir_var_uniform ||
- var->data.mode == nir_var_ubo ||
- var->data.mode == nir_var_ssbo) {
+ var->data.mode == nir_var_mem_ubo ||
+ var->data.mode == nir_var_mem_ssbo) {
const char *loc = NULL;
char buf[4];
case MESA_SHADER_TESS_CTRL:
case MESA_SHADER_TESS_EVAL:
case MESA_SHADER_COMPUTE:
+ case MESA_SHADER_KERNEL:
default:
/* TODO */
break;
assert(dim < ARRAY_SIZE(dim_name) && dim_name[dim]);
fprintf(fp, " image_dim=%s", dim_name[dim]);
} else if (idx == NIR_INTRINSIC_IMAGE_ARRAY) {
- bool array = nir_intrinsic_image_dim(instr);
- fprintf(fp, " image_dim=%s", array ? "true" : "false");
+ bool array = nir_intrinsic_image_array(instr);
+ fprintf(fp, " image_array=%s", array ? "true" : "false");
} else if (idx == NIR_INTRINSIC_DESC_TYPE) {
VkDescriptorType desc_type = nir_intrinsic_desc_type(instr);
fprintf(fp, " desc_type=%s", vulkan_descriptor_type_name(desc_type));
nir_foreach_variable(var, var_list) {
if ((var->data.driver_location == nir_intrinsic_base(instr)) &&
(instr->intrinsic == nir_intrinsic_load_uniform ||
- var->data.location_frac == nir_intrinsic_component(instr)) &&
- var->name) {
+ (nir_intrinsic_component(instr) >= var->data.location_frac &&
+ nir_intrinsic_component(instr) <
+ (var->data.location_frac + glsl_get_components(var->type)))) &&
+ var->name) {
fprintf(fp, "\t/* %s */", var->name);
break;
}
case nir_tex_src_sampler_offset:
fprintf(fp, "(sampler_offset)");
break;
+ case nir_tex_src_texture_handle:
+ fprintf(fp, "(texture_handle)");
+ break;
+ case nir_tex_src_sampler_handle:
+ fprintf(fp, "(sampler_handle)");
+ break;
case nir_tex_src_plane:
fprintf(fp, "(plane)");
break;
fprintf(fp, "%u (gather_component), ", instr->component);
}
+ if (nir_tex_instr_has_explicit_tg4_offsets(instr)) {
+ fprintf(fp, "{ (%i, %i)", instr->tg4_offsets[0][0], instr->tg4_offsets[0][1]);
+ for (unsigned i = 1; i < 4; ++i)
+ fprintf(fp, ", (%i, %i)", instr->tg4_offsets[i][0],
+ instr->tg4_offsets[i][1]);
+ fprintf(fp, " } (offsets), ");
+ }
+
if (!has_texture_deref) {
fprintf(fp, "%u (texture), ", instr->texture_index);
}
{
state->fp = fp;
state->shader = shader;
- state->ht = _mesa_hash_table_create(NULL, _mesa_hash_pointer,
- _mesa_key_pointer_equal);
+ state->ht = _mesa_pointer_hash_table_create(NULL);
state->syms = _mesa_set_create(NULL, _mesa_key_hash_string,
_mesa_key_string_equal);
state->index = 0;
if (shader->info.label)
fprintf(fp, "label: %s\n", shader->info.label);
- switch (shader->info.stage) {
- case MESA_SHADER_COMPUTE:
+ if (gl_shader_stage_is_compute(shader->info.stage)) {
fprintf(fp, "local-size: %u, %u, %u%s\n",
shader->info.cs.local_size[0],
shader->info.cs.local_size[1],
shader->info.cs.local_size[2],
shader->info.cs.local_size_variable ? " (variable)" : "");
fprintf(fp, "shared-size: %u\n", shader->info.cs.shared_size);
- break;
- default:
- break;
}
fprintf(fp, "inputs: %u\n", shader->num_inputs);