radv: trivial tidy ups
authorTimothy Arceri <tarceri@itsqueeze.com>
Tue, 14 Mar 2017 04:50:34 +0000 (15:50 +1100)
committerTimothy Arceri <tarceri@itsqueeze.com>
Wed, 15 Mar 2017 00:45:04 +0000 (11:45 +1100)
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
src/amd/vulkan/radv_pipeline.c
src/amd/vulkan/radv_pipeline_cache.c

index ce228df04a86e0b3a92a5745f11e44918056bea6..df763964970b6ce3861ee2ca7239492c1eaa5e63 100644 (file)
@@ -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);
index 703400b55733a8bf94397ad1973d69e3da86495f..30f2dc16d3f984f430afd0a19ddd5c9683d58ccd 100644 (file)
@@ -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)