OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: trivial tidy ups

Browse Source 
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
This commit is contained in:
Timothy Arceri
2017-03-14 15:50:34 +11:00
parent b7e03d87e4
commit 304b35b0e9
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/amd/vulkan/radv_pipeline.c
View File

@@ -41,6 +41,7 @@
#include "ac_nir_to_llvm.h" #include "ac_nir_to_llvm.h"
#include "vk_format.h" #include "vk_format.h"
#include "util/debug.h" #include "util/debug.h"
void radv_shader_variant_destroy(struct radv_device *device, void radv_shader_variant_destroy(struct radv_device *device,
struct radv_shader_variant *variant); 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 */ /* Vulkan uses the separate-shader linking model */
nir->info->separate_shader = true; nir->info->separate_shader = true;
// nir = brw_preprocess_nir(compiler, nir);
nir_shader_gather_info(nir, entry_point->impl); nir_shader_gather_info(nir, entry_point->impl);
nir_variable_mode indirect_mask = 0; nir_variable_mode indirect_mask = 0;
// if (compiler->glsl_compiler_options[stage].EmitNoIndirectInput)
indirect_mask |= nir_var_shader_in; indirect_mask |= nir_var_shader_in;
// if (compiler->glsl_compiler_options[stage].EmitNoIndirectTemp)
indirect_mask |= nir_var_local; indirect_mask |= nir_var_local;
nir_lower_indirect_derefs(nir, indirect_mask); 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); radv_pipeline_init_blend_state(pipeline, pCreateInfo, extra);
/* */
if (modules[MESA_SHADER_VERTEX]) { if (modules[MESA_SHADER_VERTEX]) {
bool as_es = modules[MESA_SHADER_GEOMETRY] != NULL; bool as_es = modules[MESA_SHADER_GEOMETRY] != NULL;
union ac_shader_variant_key key = radv_compute_vs_key(pCreateInfo, as_es); union ac_shader_variant_key key = radv_compute_vs_key(pCreateInfo, as_es);

1
src/amd/vulkan/radv_pipeline_cache.c
View File

@@ -305,6 +305,7 @@ struct cache_header {
uint32_t device_id; uint32_t device_id;
uint8_t uuid[VK_UUID_SIZE]; uint8_t uuid[VK_UUID_SIZE];
}; };
void void
radv_pipeline_cache_load(struct radv_pipeline_cache *cache, radv_pipeline_cache_load(struct radv_pipeline_cache *cache,
const void *data, size_t size) const void *data, size_t size)