From: Dave Airlie Date: Tue, 1 Sep 2015 02:29:58 +0000 (+1000) Subject: r600g: fix calculation for gpr allocation X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0de53ccc8cbee0f63ba25c9e72664b3cbd31be54;p=mesa.git r600g: fix calculation for gpr allocation I've been chasing a geom shader hang on rv635 since I wrote r600 geom code, and finally I hacked some values from fglrx in and I could run texelfetch without failures. This is totally my fault as well, maths fail 101. This makes geom shaders on r600 not fail heavily. Cc: "10.6" "11.0" Reviewed-by: Alex Deucher Reviewed-by: Edward O'Callaghan Signed-off-by: Dave Airlie --- diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c index 51527631efd..89e959b6b0f 100644 --- a/src/gallium/drivers/r600/r600_state.c +++ b/src/gallium/drivers/r600/r600_state.c @@ -2051,7 +2051,7 @@ bool r600_adjust_gprs(struct r600_context *rctx) /* always privilege vs stage so that at worst we have the * pixel stage producing wrong output (not the vertex * stage) */ - new_num_ps_gprs = max_gprs - ((new_num_vs_gprs - new_num_es_gprs - new_num_gs_gprs) + def_num_clause_temp_gprs * 2); + new_num_ps_gprs = max_gprs - ((new_num_vs_gprs + new_num_es_gprs + new_num_gs_gprs) + def_num_clause_temp_gprs * 2); new_num_vs_gprs = num_vs_gprs; new_num_gs_gprs = num_gs_gprs; new_num_es_gprs = num_es_gprs;