From patchwork Mon Oct 19 19:48:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 7439471 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 160EC9F302 for ; Mon, 19 Oct 2015 19:48:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 292D3207FC for ; Mon, 19 Oct 2015 19:48:24 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id B1A03207F2 for ; Mon, 19 Oct 2015 19:48:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C349372114; Mon, 19 Oct 2015 12:48:20 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qg0-f44.google.com (mail-qg0-f44.google.com [209.85.192.44]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4A34A720F2 for ; Mon, 19 Oct 2015 12:48:19 -0700 (PDT) Received: by qgbb65 with SMTP id b65so62692985qgb.2 for ; Mon, 19 Oct 2015 12:48:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zFw58xo87NSH8K0x1zsimJJq6VqnNbU7dn1KpkH6Ew4=; b=OdRjkyFmEoeI0QVeiuIvvgt6dg99LYp6pNCQ/TWxPRw6U5gDLWp3rHEBt7UJifJzCA eVUTekdp/qG5WeH3AN/j9x+6tL2TUzx75MQ9Y+JgA2OL2ycFQNc2UYI7x0BDdcglCmrh LIUBZOU1A8etmduM0toryvjmCUsiTRUub5LMcYrRwbCTPTKbI+QBDXczff4NAc4QI4iJ 3pfrfjU1ipVSQoFEsSKebKhqPNF8ozsQ1e5/9nYYHCo7vz/XnGTOQju290WzJ/OA54Gt 6zL7Q47sfs8YuqS3ML2veHDeMmH0Ng1bfnOqCzfz6iDRt35gQXgJ3NnV1vohDZS9uwJk xDHw== X-Received: by 10.140.41.81 with SMTP id y75mr38654420qgy.5.1445284098443; Mon, 19 Oct 2015 12:48:18 -0700 (PDT) Received: from localhost ([2601:184:4000:26d7:6af7:28ff:fe77:e429]) by smtp.gmail.com with ESMTPSA id w3sm14902515qha.0.2015.10.19.12.48.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Oct 2015 12:48:17 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Subject: [RFCv0 8/8] freedreno/ir3: hack for mismatch on varying slots for glsl->tgsi->nir vs glsl->nir Date: Mon, 19 Oct 2015 15:48:01 -0400 Message-Id: <1445284081-29532-9-git-send-email-robdclark@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1445284081-29532-1-git-send-email-robdclark@gmail.com> References: <1445284081-29532-1-git-send-email-robdclark@gmail.com> Cc: Jason Ekstrand X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Complete hack just for debugging. It isn't intended that mixing and matching glsl->tgsi->nir vs glsl->nir between shader stages should actually work. --- src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c b/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c index 2b9a841..317ed79 100644 --- a/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c +++ b/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c @@ -2232,6 +2232,12 @@ setup_output(struct ir3_compile *ctx, nir_variable *out) unsigned slot = out->data.location; unsigned comp = 0; + // XXX temporary hack for NIR vs and TGSI fs.. since there is + // some disagreement about varying slots.. + if (ctx->so->shader->nir) + if (slot >= VARYING_SLOT_VAR0) + slot += 9; + DBG("; out: slot=%u, len=%ux%u, drvloc=%u", slot, array_len, ncomp, n);