[Mesa-dev] [PATCH v3] nv50/ir: do not call textureMask() for surface ops

[Ilia Mirkin]

On Wed, Dec 2, 2015 at 3:10 PM, Samuel Pitoiset
<samuel.pitoiset at gmail.com> wrote:
> That texture mask thing doesn't seem to be needed for surface ops, so
> just as nve4+, let do that only for texture ops.
>
> This fixes a segfault with 'test_surface_st' from
> gallium/tests/trivial/compute.c on Fermi because this test uses sustp.
>
> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>

Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>

> ---
>  src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
> index 41d2cc9..16d87e3 100644
> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
> @@ -2084,7 +2084,8 @@ RegAlloc::InsertConstraintsPass::texConstraintNVC0(TexInstruction *tex)
>  {
>     int n, s;
>
> -   textureMask(tex);
> +   if (isTextureOp(tex->op))
> +      textureMask(tex);
>
>     if (tex->op == OP_TXQ) {
>        s = tex->srcCount(0xff);
> --
> 2.6.2
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev