Module: Mesa Branch: master Commit: 4b69ba381766cd911eb1284f1b0332a139ec8a75 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4b69ba381766cd911eb1284f1b0332a139ec8a75
Author: Jason Ekstrand <[email protected]> Date: Fri Dec 15 11:27:39 2017 -0800 anv/pipeline: Don't assert on more than 32 samplers This prevents an assert when running one unreleased Vulkan game. Tested-by: Józef Kucia <[email protected]> Reviewed-by: Topi Pohjolainen <[email protected]> Cc: "18.0" <[email protected]> --- src/intel/vulkan/genX_pipeline.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c index cfc3bea426..82fdf206a9 100644 --- a/src/intel/vulkan/genX_pipeline.c +++ b/src/intel/vulkan/genX_pipeline.c @@ -1081,7 +1081,13 @@ emit_3dstate_streamout(struct anv_pipeline *pipeline, static uint32_t get_sampler_count(const struct anv_shader_bin *bin) { - return DIV_ROUND_UP(bin->bind_map.sampler_count, 4); + uint32_t count_by_4 = DIV_ROUND_UP(bin->bind_map.sampler_count, 4); + + /* We can potentially have way more than 32 samplers and that's ok. + * However, the 3DSTATE_XS packets only have 3 bits to specify how + * many to pre-fetch and all values above 4 are marked reserved. + */ + return MIN2(count_by_4, 4); } static uint32_t _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
