diff options
author | Jordan Justen <[email protected]> | 2016-03-17 01:38:05 -0700 |
---|---|---|
committer | Jordan Justen <[email protected]> | 2016-03-17 01:44:07 -0700 |
commit | 3fd308a357b9057447d21c67718d13524dbbb40d (patch) | |
tree | 9f59a4b5c5fd2a2edefed9a51377221f6ddc3a20 /src/mesa/drivers/dri/i965/brw_fs.cpp | |
parent | 5464f0c046ac68630355932639f18a02dc4b2d92 (diff) | |
parent | 7d021cb15e6d67ecef8b020fd36c4a680bcc9c39 (diff) |
Merge remote-tracking branch 'origin/master' into vulkan
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_fs.cpp')
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index b5f1a874368..874053c8489 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -5788,6 +5788,8 @@ brw_compile_cs(const struct brw_compiler *compiler, void *log_data, nir_shader *shader = nir_shader_clone(mem_ctx, src_shader); shader = brw_nir_apply_sampler_key(shader, compiler->devinfo, &key->tex, true); + brw_nir_lower_cs_shared(shader); + prog_data->base.total_shared += shader->num_shared; shader = brw_postprocess_nir(shader, compiler->devinfo, true); prog_data->local_size[0] = shader->info.cs.local_size[0]; |