Mesa (main): i915g: Reduce ARB_fp max tex indirections to match i915c.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: e00a749759bd0e7ed90b4cc675eb9ed6fe5dc69a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e00a749759bd0e7ed90b4cc675eb9ed6fe5dc69a

Author: Emma Anholt <emma at anholt.net>
Date:   Tue Aug 17 20:55:37 2021 -0700

i915g: Reduce ARB_fp max tex indirections to match i915c.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12436>

---

 src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt | 4 ++++
 src/gallium/drivers/i915/i915_screen.c                | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt b/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt
index abb0931164f..0176e2e2e7c 100644
--- a/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt
+++ b/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt
@@ -209,7 +209,11 @@ spec at arb_depth_texture@texwrap formats bordercolor at GL_DEPTH_COMPONENT32- border
 spec at arb_es2_compatibility@arb_es2_compatibility-drawbuffers,Fail
 spec at arb_es2_compatibility@texwrap formats bordercolor,Fail
 spec at arb_es2_compatibility@texwrap formats bordercolor at GL_RGB565- border color only,Fail
+
+# fails at 4 samples (for our 4 supported indirections) because the 1D coordinate workaround
+# causes an extra texture indirection phase.
 spec at arb_fragment_program@fp-indirections2,Fail
+
 spec at arb_fragment_program_shadow@tex-shadow1d,Fail
 spec at arb_fragment_program_shadow@tex-shadow2d,Fail
 spec at arb_fragment_program_shadow@tex-shadow2drect,Fail
diff --git a/src/gallium/drivers/i915/i915_screen.c b/src/gallium/drivers/i915/i915_screen.c
index dbe765d45cd..62c9f34d237 100644
--- a/src/gallium/drivers/i915/i915_screen.c
+++ b/src/gallium/drivers/i915/i915_screen.c
@@ -226,7 +226,7 @@ i915_get_shader_param(struct pipe_screen *screen, enum pipe_shader_type shader,
       case PIPE_SHADER_CAP_MAX_TEX_INSTRUCTIONS:
          return I915_MAX_TEX_INSN;
       case PIPE_SHADER_CAP_MAX_TEX_INDIRECTIONS:
-         return 8;
+         return 4;
       case PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH:
          return 0;
       case PIPE_SHADER_CAP_MAX_INPUTS: