diff options
author | Kenneth Graunke <[email protected]> | 2016-03-01 16:26:09 -0800 |
---|---|---|
committer | Kenneth Graunke <[email protected]> | 2016-03-01 17:11:29 -0800 |
commit | 89e421369c54a8edc4930352e062f03b5c66b886 (patch) | |
tree | 54ec1f2d99454da125abe0ed49164b1c47fd9d36 /src/intel/vulkan | |
parent | e941fd84707d4ed04a683f8862d184956a60f9ad (diff) | |
parent | 1be953797ea4ae31193ab40bd35133eef38ae0ce (diff) |
Merge remote-tracking branch 'origin/master' into vulkan
Diffstat (limited to 'src/intel/vulkan')
-rw-r--r-- | src/intel/vulkan/anv_pipeline.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c index 3dab205e5cc..647f2eb96b0 100644 --- a/src/intel/vulkan/anv_pipeline.c +++ b/src/intel/vulkan/anv_pipeline.c @@ -396,13 +396,8 @@ anv_pipeline_compile(struct anv_pipeline *pipeline, prog_data->binding_table.image_start = bias; /* Finish the optimization and compilation process */ - if (nir->stage != MESA_SHADER_VERTEX && - nir->stage != MESA_SHADER_TESS_CTRL && - nir->stage != MESA_SHADER_TESS_EVAL && - nir->stage != MESA_SHADER_FRAGMENT) { - nir = brw_nir_lower_io(nir, &pipeline->device->info, - compiler->scalar_stage[stage], false, NULL); - } + if (nir->stage == MESA_SHADER_COMPUTE) + brw_nir_lower_shared(nir); /* nir_lower_io will only handle the push constants; we need to set this * to the full number of possible uniforms. |