ac: fix texture query LOD for 1D textures on GFX9
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>
Wed, 25 Apr 2018 16:15:52 +0000 (18:15 +0200)
committerSamuel Pitoiset <samuel.pitoiset@gmail.com>
Fri, 27 Apr 2018 09:15:35 +0000 (11:15 +0200)
1D textures are allocated as 2D which means we only need
one coordinate for texture query LOD.

Fixes: 625dcbbc456 ("amd/common: pass address components individually to
ac_build_image_intrinsic")
Cc: 18.1 <mesa-stable@lists.freedesktop.org>
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
src/amd/common/ac_nir_to_llvm.c

index 900c1c4afeafa9cc2d7720057e66ccbdc9c57398..e4ae6ef49ad608fedcd445705b0294f8f659ef22 100644 (file)
@@ -1309,6 +1309,14 @@ static LLVMValueRef build_tex_intrinsic(struct ac_nir_context *ctx,
                }
        }
 
+       /* Fixup for GFX9 which allocates 1D textures as 2D. */
+       if (instr->op == nir_texop_lod && ctx->ac.chip_class >= GFX9) {
+               if ((args->dim == ac_image_2darray ||
+                    args->dim == ac_image_2d) && !args->coords[1]) {
+                       args->coords[1] = ctx->ac.i32_0;
+               }
+       }
+
        args->attributes = AC_FUNC_ATTR_READNONE;
        return ac_build_image_opcode(&ctx->ac, args);
 }