Mesa (main): i915g: Correct PIPE_SHADER_CAP_MAX_TEMPS.

[GitLab Mirror]

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

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

i915g: Correct PIPE_SHADER_CAP_MAX_TEMPS.

This is the value that i915c reported, too, and is required for ARB_fp.

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

---

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

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 b5ee53f6ee7..abb0931164f 100644
--- a/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt
+++ b/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt
@@ -210,7 +210,6 @@ 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
 spec at arb_fragment_program@fp-indirections2,Fail
-spec at arb_fragment_program@minmax,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 417f96bb4b7..dbe765d45cd 100644
--- a/src/gallium/drivers/i915/i915_screen.c
+++ b/src/gallium/drivers/i915/i915_screen.c
@@ -238,7 +238,8 @@ i915_get_shader_param(struct pipe_screen *screen, enum pipe_shader_type shader,
       case PIPE_SHADER_CAP_MAX_CONST_BUFFERS:
          return 1;
       case PIPE_SHADER_CAP_MAX_TEMPS:
-         return 12; /* XXX: 12 -> 32 ? */
+         /* 16 inter-phase temps, 3 intra-phase temps.  i915c reported 16. too. */
+         return 16;
       case PIPE_SHADER_CAP_TGSI_CONT_SUPPORTED:
       case PIPE_SHADER_CAP_TGSI_SQRT_SUPPORTED:
          return 0;