OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv/pipeline: Whack nir->num_uniforms to MAX_PUSH_CONSTANT_SIZE

Browse Source 
This way any image uniforms end up having locations higher than
MAX_PUSH_CONSTANT_SIZE.  There's no bug here at the moment, but this
consistency will make the next commit easier.  Also, because
nir_apply_pipeline_layout properly increments nir->num_uniforms when
it expands the param array, we no longer need to stomp it to match
prog_data::nr_params because it already does.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jason Ekstrand
2017-09-29 11:09:04 -07:00
parent 4dfb8b3416
commit 63c938fd18
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/intel/vulkan/anv_pipeline.c
View File

@@ -401,6 +401,7 @@ anv_pipeline_compile(struct anv_pipeline *pipeline,
* them the maximum possible number * them the maximum possible number
*/ */
assert(nir->num_uniforms <= MAX_PUSH_CONSTANTS_SIZE); assert(nir->num_uniforms <= MAX_PUSH_CONSTANTS_SIZE);
nir->num_uniforms = MAX_PUSH_CONSTANTS_SIZE;
prog_data->nr_params += MAX_PUSH_CONSTANTS_SIZE / sizeof(float); prog_data->nr_params += MAX_PUSH_CONSTANTS_SIZE / sizeof(float);
} }
@@ -433,10 +434,7 @@ anv_pipeline_compile(struct anv_pipeline *pipeline,
if (pipeline->layout) if (pipeline->layout)
anv_nir_apply_pipeline_layout(pipeline, nir, prog_data, map); anv_nir_apply_pipeline_layout(pipeline, nir, prog_data, map);
/* nir_lower_io will only handle the push constants; we need to set this assert(nir->num_uniforms == prog_data->nr_params * 4);
* to the full number of possible uniforms.
*/
nir->num_uniforms = prog_data->nr_params * 4;
return nir; return nir;
} }