Re: [Mesa-dev] [PATCH 1/2] radv: stop redundent setting of active_stages

2017-10-18 Thread Timothy Arceri

Whoops I've fixed redundent -> redundant locally
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH 1/2] radv: stop redundent setting of active_stages

2017-10-18 Thread Timothy Arceri
We already set it when above in the nir compilation loop.
---
 src/amd/vulkan/radv_pipeline.c | 4 
 1 file changed, 4 deletions(-)

diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index 7102d07a03..15ef428be4 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -1641,32 +1641,28 @@ void radv_create_shaders(struct radv_pipeline *pipeline,
   pipeline->layout, keys ? 
keys + MESA_SHADER_FRAGMENT : 0,
   
&codes[MESA_SHADER_FRAGMENT], &code_sizes[MESA_SHADER_FRAGMENT]);
 
/* TODO: These are no longer used as keys we should refactor 
this */
if (keys) {
keys[MESA_SHADER_VERTEX].vs.export_prim_id =

pipeline->shaders[MESA_SHADER_FRAGMENT]->info.fs.prim_id_input;
keys[MESA_SHADER_TESS_EVAL].tes.export_prim_id =

pipeline->shaders[MESA_SHADER_FRAGMENT]->info.fs.prim_id_input;
}
-
-   pipeline->active_stages |= 
mesa_to_vk_shader_stage(MESA_SHADER_FRAGMENT);
}
 
for (int i = 0; i < MESA_SHADER_STAGES; ++i) {
if(modules[i] && !pipeline->shaders[i]) {
pipeline->shaders[i] = 
radv_shader_variant_create(device, modules[i], nir[i],
  
pipeline->layout,
  keys 
? keys + i : 0, &codes[i],
  
&code_sizes[i]);
-
-   pipeline->active_stages |= mesa_to_vk_shader_stage(i);
}
}
 
if(modules[MESA_SHADER_GEOMETRY]) {
void *gs_copy_code = NULL;
unsigned gs_copy_code_size = 0;
if (!pipeline->gs_copy_shader) {
pipeline->gs_copy_shader = radv_create_gs_copy_shader(
device, nir[MESA_SHADER_GEOMETRY], 
&gs_copy_code,
&gs_copy_code_size,
-- 
2.13.6

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev