diff options
| author | Timothy Arceri <[email protected]> | 2017-03-14 15:50:34 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-03-15 11:45:04 +1100 |
| commit | 304b35b0e932188d78e7b089d2a936a65a746a09 (patch) | |
| tree | e67b509c7a5becd6a4ac7ba2eaf023b79bef8f02 | |
| parent | b7e03d87e4b8a89e778c674e0dc0736f189b5d4f (diff) | |
radv: trivial tidy ups
Reviewed-by: Edward O'Callaghan <[email protected]>
| -rw-r--r-- | src/amd/vulkan/radv_pipeline.c | 6 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_pipeline_cache.c | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index ce228df04a8..df763964970 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -41,6 +41,7 @@ #include "ac_nir_to_llvm.h" #include "vk_format.h" #include "util/debug.h" + void radv_shader_variant_destroy(struct radv_device *device, struct radv_shader_variant *variant); @@ -250,14 +251,10 @@ radv_shader_compile_to_nir(struct radv_device *device, /* Vulkan uses the separate-shader linking model */ nir->info->separate_shader = true; - // nir = brw_preprocess_nir(compiler, nir); - nir_shader_gather_info(nir, entry_point->impl); nir_variable_mode indirect_mask = 0; - // if (compiler->glsl_compiler_options[stage].EmitNoIndirectInput) indirect_mask |= nir_var_shader_in; - // if (compiler->glsl_compiler_options[stage].EmitNoIndirectTemp) indirect_mask |= nir_var_local; nir_lower_indirect_derefs(nir, indirect_mask); @@ -1531,7 +1528,6 @@ radv_pipeline_init(struct radv_pipeline *pipeline, radv_pipeline_init_blend_state(pipeline, pCreateInfo, extra); - /* */ if (modules[MESA_SHADER_VERTEX]) { bool as_es = modules[MESA_SHADER_GEOMETRY] != NULL; union ac_shader_variant_key key = radv_compute_vs_key(pCreateInfo, as_es); diff --git a/src/amd/vulkan/radv_pipeline_cache.c b/src/amd/vulkan/radv_pipeline_cache.c index 703400b5573..30f2dc16d3f 100644 --- a/src/amd/vulkan/radv_pipeline_cache.c +++ b/src/amd/vulkan/radv_pipeline_cache.c @@ -305,6 +305,7 @@ struct cache_header { uint32_t device_id; uint8_t uuid[VK_UUID_SIZE]; }; + void radv_pipeline_cache_load(struct radv_pipeline_cache *cache, const void *data, size_t size) |