diff options
| author | Samuel Pitoiset <[email protected]> | 2018-03-13 14:54:04 +0100 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2018-03-13 16:54:23 +0100 |
| commit | fbe694562b6a5f5f1b7112533326619af6ca79a5 (patch) | |
| tree | 211a3f917a81ff4f507c7abd787cf2541800edf1 /src/amd/vulkan/radv_pipeline.c | |
| parent | 237229430f303dc2395a85bc811adc6e25cc39d7 (diff) | |
ac/nir: move ac_nir_compiler_options and friends to radv folder
Also replace ac_ by radv_.
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
Diffstat (limited to 'src/amd/vulkan/radv_pipeline.c')
| -rw-r--r-- | src/amd/vulkan/radv_pipeline.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index acb46ec12f8..e02e06505e4 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -1589,7 +1589,7 @@ radv_generate_graphics_pipeline_key(struct radv_pipeline *pipeline, } static void -radv_fill_shader_keys(struct ac_shader_variant_key *keys, +radv_fill_shader_keys(struct radv_shader_variant_key *keys, const struct radv_pipeline_key *key, nir_shader **nir) { @@ -1672,7 +1672,7 @@ void radv_create_shaders(struct radv_pipeline *pipeline, nir_shader *nir[MESA_SHADER_STAGES] = {0}; void *codes[MESA_SHADER_STAGES] = {0}; unsigned code_sizes[MESA_SHADER_STAGES] = {0}; - struct ac_shader_variant_key keys[MESA_SHADER_STAGES] = {{{{0}}}}; + struct radv_shader_variant_key keys[MESA_SHADER_STAGES] = {{{{0}}}}; unsigned char hash[20], gs_copy_hash[20]; for (unsigned i = 0; i < MESA_SHADER_STAGES; ++i) { @@ -1787,7 +1787,7 @@ void radv_create_shaders(struct radv_pipeline *pipeline, if (device->physical_device->rad_info.chip_class >= GFX9 && modules[MESA_SHADER_TESS_CTRL]) { if (!pipeline->shaders[MESA_SHADER_TESS_CTRL]) { struct nir_shader *combined_nir[] = {nir[MESA_SHADER_VERTEX], nir[MESA_SHADER_TESS_CTRL]}; - struct ac_shader_variant_key key = keys[MESA_SHADER_TESS_CTRL]; + struct radv_shader_variant_key key = keys[MESA_SHADER_TESS_CTRL]; key.tcs.vs_key = keys[MESA_SHADER_VERTEX].vs; pipeline->shaders[MESA_SHADER_TESS_CTRL] = radv_shader_variant_create(device, modules[MESA_SHADER_TESS_CTRL], combined_nir, 2, pipeline->layout, |