diff options
| author | Jason Ekstrand <[email protected]> | 2017-11-01 08:02:34 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2017-11-02 09:55:21 -0700 |
| commit | 172e8e42c4eb898a80e3b967d495b4b8619905c7 (patch) | |
| tree | 0285568fc38777099d9ba460409e2b1af6d11f61 /src/intel | |
| parent | 7b4387519c382cffef9c62bbbbefcfe71cfde905 (diff) | |
intel/fs: Don't allocate a param array for zero push constants
Thanks to the ralloc invariant of "any pointer returned from ralloc can
be used as a context", calling ralloc_size with a size of zero will
cause it to allocate at least a header. If we don't have any push
constants, then NULL is perfectly acceptable (and even preferred).
Reviewed-by: Lionel Landwerlin <[email protected]>
Reviewed-by: Tapani Pälli <[email protected]>
Diffstat (limited to 'src/intel')
| -rw-r--r-- | src/intel/compiler/brw_fs.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp index e2176827a64..afad6805d29 100644 --- a/src/intel/compiler/brw_fs.cpp +++ b/src/intel/compiler/brw_fs.cpp @@ -2092,7 +2092,14 @@ fs_visitor::assign_constant_locations() */ uint32_t *param = stage_prog_data->param; stage_prog_data->nr_params = num_push_constants; - stage_prog_data->param = ralloc_array(mem_ctx, uint32_t, num_push_constants); + if (num_push_constants) { + stage_prog_data->param = ralloc_array(mem_ctx, uint32_t, + num_push_constants); + } else { + stage_prog_data->param = NULL; + } + assert(stage_prog_data->nr_pull_params == 0); + assert(stage_prog_data->pull_param == NULL); if (num_pull_constants > 0) { stage_prog_data->nr_pull_params = num_pull_constants; stage_prog_data->pull_param = ralloc_array(mem_ctx, uint32_t, |