diff options
| author | Emma Anholt <emma@anholt.net> | 2021-08-13 19:33:39 -0700 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-08-16 02:29:45 +0000 |
| commit | 5a088aead52edb344674a70321d63c83325a21f5 (patch) | |
| tree | 2ba80ac6ffee241fb1c29c91b519c80eb7f07514 /src/gallium/drivers/i915 | |
| parent | 4d9acfa5331be6140e84badff7a232dbf07b69b4 (diff) | |
i915g: Make the 1D workaround keep TXP's .w channel in the right spot.
Fixes: 390a3fcdc45e ("nir_to_tgsi: Add support for TXP.")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12367>
Diffstat (limited to 'src/gallium/drivers/i915')
| -rw-r--r-- | src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/i915/i915_fpc_emit.c | 2 |
2 files changed, 1 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 d78dd68938f..284fbab5045 100644 --- a/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt +++ b/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt @@ -697,7 +697,6 @@ spec@glsl-1.10@execution@loops@glsl-fs-unroll-side-effect,Fail spec@glsl-1.10@execution@samplers@glsl-fs-shadow1d,Fail spec@glsl-1.10@execution@samplers@glsl-fs-shadow1d-01,Fail spec@glsl-1.10@execution@samplers@glsl-fs-shadow1d-03,Fail -spec@glsl-1.10@execution@samplers@glsl-fs-shadow1d-04,Fail spec@glsl-1.10@execution@samplers@glsl-fs-shadow1d-07,Fail spec@glsl-1.10@execution@samplers@glsl-fs-shadow1d-08,Fail spec@glsl-1.10@execution@samplers@glsl-fs-shadow1d-bias,Fail diff --git a/src/gallium/drivers/i915/i915_fpc_emit.c b/src/gallium/drivers/i915/i915_fpc_emit.c index 4ca73b18d64..9d4e17d713c 100644 --- a/src/gallium/drivers/i915/i915_fpc_emit.c +++ b/src/gallium/drivers/i915/i915_fpc_emit.c @@ -192,7 +192,7 @@ i915_emit_texld(struct i915_fp_compile *p, uint32_t dest, uint32_t destmask, * program, texturing returns undefined results (even if the Y wrap is * REPEAT). */ - coord = swizzle(coord, X, X, Y, Z); + coord = swizzle(coord, X, X, Z, W); FALLTHROUGH; case 2: ignore |= (0xf << UREG_CHANNEL_Z_SHIFT); |