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

intel/fs: restrict max push length on older GPUs to a smaller amount

Browse Source 
Fixes crash in dEQP-GLES2.functional.uniform_api.random.79

Cc: mesa-stable
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12093>
This commit is contained in:
Dave Airlie
2021-07-28 13:51:38 +10:00
parent d9a4a0aebd
commit c8783001c7
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/intel/compiler/brw_fs.cpp
View File

@@ -2656,16 +2656,23 @@ fs_visitor::assign_constant_locations()
/* Now that we know how many regular uniforms we'll push, reduce the /* Now that we know how many regular uniforms we'll push, reduce the
* UBO push ranges so we don't exceed the 3DSTATE_CONSTANT limits. * UBO push ranges so we don't exceed the 3DSTATE_CONSTANT limits.
*/ */
/* For gen4/5:
* Only allow 16 registers (128 uniform components) as push constants.
*
* If changing this value, note the limitation about total_regs in
* brw_curbe.c/crocus_state.c
*/
const unsigned max_push_length = compiler->devinfo->ver < 6 ? 16 : 64;
unsigned push_length = DIV_ROUND_UP(stage_prog_data->nr_params, 8); unsigned push_length = DIV_ROUND_UP(stage_prog_data->nr_params, 8);
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
struct brw_ubo_range *range = &prog_data->ubo_ranges[i]; struct brw_ubo_range *range = &prog_data->ubo_ranges[i];
if (push_length + range->length > 64) if (push_length + range->length > max_push_length)
range->length = 64 - push_length; range->length = max_push_length - push_length;
push_length += range->length; push_length += range->length;
} }
assert(push_length <= 64); assert(push_length <= max_push_length);
} }
bool bool