diff options
| author | Jason Ekstrand <[email protected]> | 2015-12-27 23:23:05 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-12-27 23:23:05 -0800 |
| commit | ea77b384e8c575922eca1c05398e19fcbfda9b09 (patch) | |
| tree | 4f8659bd8b48af785896daa224f6698a5ee269ec /src/vulkan | |
| parent | f948767471ba83427cbcdc244a511fbb954ca9e0 (diff) | |
| parent | 109c348284843054f708f4403260739b7db18275 (diff) | |
Merge remote-tracking branch 'mesa-public/master' into vulkan
This pulls in tessellation and the store_var changes that go with it.
Diffstat (limited to 'src/vulkan')
| -rw-r--r-- | src/vulkan/anv_meta.c | 2 | ||||
| -rw-r--r-- | src/vulkan/anv_pipeline.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/vulkan/anv_meta.c b/src/vulkan/anv_meta.c index 63976cdfe42..cf6678d852f 100644 --- a/src/vulkan/anv_meta.c +++ b/src/vulkan/anv_meta.c @@ -107,7 +107,7 @@ build_nir_copy_fragment_shader(enum glsl_sampler_dim tex_dim) nir_variable *color_out = nir_variable_create(b.shader, nir_var_shader_out, color_type, "f_color"); color_out->data.location = FRAG_RESULT_DATA0; - nir_store_var(&b, color_out, &tex->dest.ssa); + nir_store_var(&b, color_out, &tex->dest.ssa, 4); return b.shader; } diff --git a/src/vulkan/anv_pipeline.c b/src/vulkan/anv_pipeline.c index 02be5a81984..c2070be10ec 100644 --- a/src/vulkan/anv_pipeline.c +++ b/src/vulkan/anv_pipeline.c @@ -116,6 +116,9 @@ anv_shader_compile_to_nir(struct anv_device *device, nir_inline_functions(nir); nir_validate_shader(nir); + + nir_lower_system_values(nir); + nir_validate_shader(nir); } /* Vulkan uses the separate-shader linking model */ @@ -379,8 +382,8 @@ anv_pipeline_compile(struct anv_pipeline *pipeline, prog_data->binding_table.image_start = bias; /* Finish the optimization and compilation process */ - nir = brw_lower_nir(nir, &pipeline->device->info, NULL, - compiler->scalar_stage[stage]); + nir = brw_nir_lower_io(nir, &pipeline->device->info, + compiler->scalar_stage[stage]); /* nir_lower_io will only handle the push constants; we need to set this * to the full number of possible uniforms. |