diff options
| author | Jason Ekstrand <[email protected]> | 2017-09-14 19:52:38 -0700 |
|---|---|---|
| committer | Jordan Justen <[email protected]> | 2017-10-20 12:49:17 -0700 |
| commit | 59fb59ad54d368683d5cc3b149f021452bddc05f (patch) | |
| tree | 734e742be190df8ae7a19a975c59ba7eeeded6eb /src/amd/vulkan | |
| parent | 341529dbee5c2b17fdcb7990484a383459bed305 (diff) | |
nir: Get rid of nir_shader::stage
It's redundant with nir_shader::info::stage.
Acked-by: Timothy Arceri <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>
Diffstat (limited to 'src/amd/vulkan')
| -rw-r--r-- | src/amd/vulkan/radv_shader.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index a5e2826401b..e572f693203 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -208,7 +208,7 @@ radv_shader_compile_to_nir(struct radv_device *device, spec_entries, num_spec_entries, stage, entrypoint_name, &supported_ext, &nir_options); nir = entry_point->shader; - assert(nir->stage == stage); + assert(nir->info.stage == stage); nir_validate_shader(nir); free(spec_entries); @@ -258,9 +258,9 @@ radv_shader_compile_to_nir(struct radv_device *device, * indirect indexing is trivial. */ nir_variable_mode indirect_mask = 0; - if (nir->stage == MESA_SHADER_GEOMETRY || - (nir->stage != MESA_SHADER_TESS_CTRL && - nir->stage != MESA_SHADER_TESS_EVAL && + if (nir->info.stage == MESA_SHADER_GEOMETRY || + (nir->info.stage != MESA_SHADER_TESS_CTRL && + nir->info.stage != MESA_SHADER_TESS_EVAL && !llvm_has_working_vgpr_indexing)) { indirect_mask |= nir_var_shader_in; } @@ -504,7 +504,7 @@ radv_shader_variant_create(struct radv_device *device, options.unsafe_math = !!(device->instance->debug_flags & RADV_DEBUG_UNSAFE_MATH); options.supports_spill = device->llvm_supports_spill; - return shader_variant_create(device, module, shaders, shader_count, shaders[shader_count - 1]->stage, + return shader_variant_create(device, module, shaders, shader_count, shaders[shader_count - 1]->info.stage, &options, false, code_out, code_size_out); } |