Radeonsi was indeed broken with those fixes (only CubeShadow
samplers). The attached patch fixes it. Please add it to 10.2. Thanks.
Marek
On Tue, Jul 15, 2014 at 6:49 AM, Carl Worth <cwo...@cworth.org> wrote:
> Hi folks,
>
> I've pushed out an update to the 10.2 branch and I need some specific
> testing in the next three days.
>
> I've tested the branch on Intel (Haswell) as well as both swrast and
> Gallium softpipe and found no piglit regressions compared to the 10.2.3
> release.
>
> The branch includes a few patches to nouveau and radeonsi which I have
> not been able to test. If someone will test one of these drivers with
> piglit and let me know that all looks good, I'll be happy to include the
> patches in the release. Otherwise, I'll drop any untested patches before
> making the final release on Friday.
>
> Also, there's still time in the next three days for someone to nominate
> further driver-specific changes. I'll just need positive piglit test
> results for any such patches, (on top of the branch as it stands now),
> before I'll accept them.
>
> Thanks, all.
>
> -Carl
>
> --
> carl.d.wo...@intel.com
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
From e7467178faeab5c6bd5e6c4952fbce74ea3ff9e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.ol...@amd.com>
Date: Thu, 17 Jul 2014 22:24:50 +0200
Subject: [PATCH] radeonsi: add support for TXB2
This is needed by latest fixes for samplerCubeShadow with bias.
Otherwise, a crash occurs.
---
src/gallium/drivers/radeonsi/si_shader.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 09c99eb..397b6ee 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -1539,6 +1539,8 @@ static void tex_fetch_args(
/* Pack LOD bias value */
if (opcode == TGSI_OPCODE_TXB)
address[count++] = coords[3];
+ if (opcode == TGSI_OPCODE_TXB2)
+ address[count++] = lp_build_emit_fetch(bld_base, inst, 1, 0);
/* Pack depth comparison value */
switch (target) {
@@ -2497,6 +2499,7 @@ int si_pipe_shader_create(
bld_base->op_actions[TGSI_OPCODE_TEX] = tex_action;
bld_base->op_actions[TGSI_OPCODE_TXB] = txb_action;
+ bld_base->op_actions[TGSI_OPCODE_TXB2] = txb_action;
#if HAVE_LLVM >= 0x0304
bld_base->op_actions[TGSI_OPCODE_TXD] = txd_action;
#endif
--
1.9.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
