Module: Mesa Branch: main Commit: 4fe9a6053a9875ff169f2c7c4109ead9701c47d0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4fe9a6053a9875ff169f2c7c4109ead9701c47d0
Author: GKraats <vd.kra...@hccnet.nl> Date: Wed Nov 22 23:40:07 2023 +0100 i915G: show correct number of needed ALU instructions at errmess Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26340> --- src/gallium/drivers/i915/i915_fpc_emit.c | 6 ++---- src/gallium/drivers/i915/i915_fpc_translate.c | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/i915/i915_fpc_emit.c b/src/gallium/drivers/i915/i915_fpc_emit.c index 9c7e55b477a..603c79e089f 100644 --- a/src/gallium/drivers/i915/i915_fpc_emit.c +++ b/src/gallium/drivers/i915/i915_fpc_emit.c @@ -155,8 +155,7 @@ i915_emit_arith(struct i915_fp_compile *p, uint32_t op, uint32_t dest, *(p->csr++) = (op | A0_DEST(dest) | mask | saturate | A0_SRC0(src0)); *(p->csr++) = (A1_SRC0(src0) | A1_SRC1(src1)); *(p->csr++) = (A2_SRC1(src1) | A2_SRC2(src2)); - } else - i915_program_error(p, "Out of instructions"); + } if (GET_UREG_TYPE(dest) == REG_TYPE_R) p->register_phases[GET_UREG_NR(dest)] = p->nr_tex_indirect; @@ -239,8 +238,7 @@ i915_emit_texld(struct i915_fp_compile *p, uint32_t dest, uint32_t destmask, *(p->csr++) = T1_ADDRESS_REG(coord); *(p->csr++) = T2_MBZ; - } else - i915_program_error(p, "Out of instructions"); + } if (GET_UREG_TYPE(dest) == REG_TYPE_R) p->register_phases[GET_UREG_NR(dest)] = p->nr_tex_indirect; diff --git a/src/gallium/drivers/i915/i915_fpc_translate.c b/src/gallium/drivers/i915/i915_fpc_translate.c index 6bd7a073d81..4e9d030216c 100644 --- a/src/gallium/drivers/i915/i915_fpc_translate.c +++ b/src/gallium/drivers/i915/i915_fpc_translate.c @@ -859,8 +859,8 @@ i915_translate_token(struct i915_fp_compile *p, } else if (token->FullDeclaration.Declaration.File == TGSI_FILE_TEMPORARY) { if (token->FullDeclaration.Range.Last >= I915_MAX_TEMPORARY) { - i915_program_error(p, "Exceeded %d max TGSI temps", - I915_MAX_TEMPORARY); + i915_program_error(p, "Exceeded max TGSI temps (%d/%d)", + token->FullDeclaration.Range.Last + 1, I915_MAX_TEMPORARY); } else { uint32_t i; for (i = token->FullDeclaration.Range.First;
