From patchwork Thu May 2 18:03:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 10927475 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8AB4914B6 for ; Thu, 2 May 2019 18:03:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7ADD121E5A for ; Thu, 2 May 2019 18:03:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6E6F221FAD; Thu, 2 May 2019 18:03:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 124A021E5A for ; Thu, 2 May 2019 18:03:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3CF4E89624; Thu, 2 May 2019 18:03:54 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by gabe.freedesktop.org (Postfix) with ESMTPS id D8173896C7 for ; Thu, 2 May 2019 18:03:52 +0000 (UTC) Received: by mail-pl1-x635.google.com with SMTP id bi2so1364671plb.13 for ; Thu, 02 May 2019 11:03:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KwVol6+NAKSj5claaoAPzFfVv/0b5wE9kH8oSQrsELw=; b=l4m+ES0oM0OVHsbeYUTZ8ZTO7WeXNkq5u8ltrKbUnZcZ+x772Jb4FyiUo3ZDpGxjp2 kxpIxlCug6VnkJXoU3NMQ+UMBxz4Ryp/PkaKPcnPjNOCFato/IUJARMiQBBWVUaZsp/y c0HTe3tI9XGVIQIrVIgjyIsDOOM1AsFYhAj5pWLSWxoSLXzp589qOIfw+tU2mUfOKpJz 50Svsu+b/xxGTO9Basqi1a9HBB+G1sDD+bgi4HFhqtvBav0eHCCsUdcKrzBhJffMyWl5 eB4vGbxni2zxJ+Qdnj+heyToyDP3CnHHkdY70CCVSsG28XNv9kDDMCV94/7ZgfNNuXDA Kmow== X-Gm-Message-State: APjAAAXHvi8WTFue1zetDx1fI8pyF1r3ZOv2mHNe0+JPcvF1iCd6y4C2 tve2Whxqt6er18IYA1Yr5dcxihiHT74= X-Google-Smtp-Source: APXvYqxdQTwKKcU21LwdRQIjdVvZ98Sfx9QUUzY2yxE9nyVZChVPu8kynaBWXQkGfs6WB28F/Lmmrw== X-Received: by 2002:a17:902:9f8c:: with SMTP id g12mr5228709plq.256.1556820231855; Thu, 02 May 2019 11:03:51 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id c18sm90371672pfc.0.2019.05.02.11.03.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 May 2019 11:03:50 -0700 (PDT) From: John Stultz To: dri-devel Subject: [RFC][PATCH 1/3] mesa: android: Remove unnecessary dependency tracking rules Date: Thu, 2 May 2019 11:03:44 -0700 Message-Id: <20190502180346.4769-2-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190502180346.4769-1-john.stultz@linaro.org> References: <20190502180346.4769-1-john.stultz@linaro.org> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KwVol6+NAKSj5claaoAPzFfVv/0b5wE9kH8oSQrsELw=; b=Ae66Y7F/dz45twsOu9n7DNHzu7fDmDinbKFOhwOIDbzyel45V5/hlkdzCLhrBt80xs rQ1l085cqF7I7rLWcXnlFO/WizWbM0XDVooXVRAAuurmZBH35NnQinmLmyzRpocAwwSM TtK+VBUvoqcHQyttDaSBVmeT9ImkUDX5I7E3BprFrl+WprOceJI5SyiFRdlIpP0gi6/Z FNWxoyiwmZ0VG2JJp/R47NUEyUmy9Koru/29p+Aqf7XkcrTIwUllDbk16+RTBb1vtn4z b89YoTM7oNT7XEvMqJoowzKu6G9uCvyrK8f1x9rJeDWoejDrFscJeFeiwNMr6cfyTjn4 vKtg== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rob Clark , Amit Pundir , Greg Hartman , Emil Velikov , Alistair Strachan , Jason Ekstrand Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Alistair Strachan The current AOSP master build system breaks building mesa due to the following error: external/mesa3d/src/compiler/Android.glsl.gen.mk:94: error: writing to readonly directory: "external/mesa3d/src/compiler/glsl/ir.h" This error is bogus -- nothing "writes" to ir.h -- but the rule is unnecessary because the generated header that is a dependency of the non-generated header should be added to LOCAL_GENERATED_SOURCES and this will track if the dependency needs to be regenerated. (This change fixes a similar problem affecting nir.h too.) Cc: Rob Clark Cc: Emil Velikov Cc: Amit Pundir Cc: Sumit Semwal Cc: Alistair Strachan Cc: Greg Hartman Cc: Tapani Pälli Cc: Jason Ekstrand Signed-off-by: Alistair Strachan [jstultz: Forward ported and tweaked commit subject] Signed-off-by: John Stultz --- src/compiler/Android.glsl.gen.mk | 2 -- src/compiler/Android.nir.gen.mk | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/compiler/Android.glsl.gen.mk b/src/compiler/Android.glsl.gen.mk index 3b94ea7bd2f..1308de2db97 100644 --- a/src/compiler/Android.glsl.gen.mk +++ b/src/compiler/Android.glsl.gen.mk @@ -90,8 +90,6 @@ $(intermediates)/glsl/glcpp/glcpp-lex.c: $(LOCAL_PATH)/glsl/glcpp/glcpp-lex.l $(intermediates)/glsl/glcpp/glcpp-parse.c: $(LOCAL_PATH)/glsl/glcpp/glcpp-parse.y $(call glsl_local-y-to-c-and-h) -$(LOCAL_PATH)/glsl/ir.h: $(intermediates)/glsl/ir_expression_operation.h - $(intermediates)/glsl/ir_expression_operation.h: $(LOCAL_PATH)/glsl/ir_expression_operation.py @mkdir -p $(dir $@) $(hide) $(MESA_PYTHON2) $< enum > $@ diff --git a/src/compiler/Android.nir.gen.mk b/src/compiler/Android.nir.gen.mk index 894fb12c4be..26115f446a3 100644 --- a/src/compiler/Android.nir.gen.mk +++ b/src/compiler/Android.nir.gen.mk @@ -76,8 +76,6 @@ $(intermediates)/nir/nir_opcodes.h: $(nir_opcodes_h_deps) @mkdir -p $(dir $@) $(hide) $(MESA_PYTHON2) $(nir_opcodes_h_gen) $< > $@ -$(LOCAL_PATH)/nir/nir.h: $(intermediates)/nir/nir_opcodes.h - nir_opcodes_c_gen := $(LOCAL_PATH)/nir/nir_opcodes_c.py nir_opcodes_c_deps := \ $(LOCAL_PATH)/nir/nir_opcodes.py \ From patchwork Thu May 2 18:03:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 10927477 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B2C3214B6 for ; Thu, 2 May 2019 18:04:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A1A83204FD for ; Thu, 2 May 2019 18:04:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9581B21FAC; Thu, 2 May 2019 18:04:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E224A204FD for ; Thu, 2 May 2019 18:03:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E8EE18979D; Thu, 2 May 2019 18:03:55 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8D60E8979D for ; Thu, 2 May 2019 18:03:54 +0000 (UTC) Received: by mail-pl1-x642.google.com with SMTP id w24so1391730plp.2 for ; Thu, 02 May 2019 11:03:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SB6aYSwKk9czRCGXAkNNVoUj4B5oms2WdE735XnGGbw=; b=qmof02Fo4QdkiKH+sh7KHpdZsvrv+2MAokTusk7AUm7D/lzo1aq3ELczPjaEDXN6iF 7KSKQgEsqh1oCY7MJorQe05GMph2M0Ea9QMRD49kk3rqzOUdFrNIOt7U7dmH0HBBUwt3 0O90kfDXI/+4wy5/BkysaNg5OT2ixAJqOgwJRVSi/Tk/IBA07i3J1vZZC+pedOKHy/YE F82uxf4BpjaBcgoMl2w8YeYSjNoZh61AYGa/V9DJi85uk0YezbgatcBj7xIe22yPygbz U0/x+OkpSw77nJwevnEnDvx8JHrCmSF+nMbBxKF9DNIQEuRdXHsDntawmGDY+jx0zhRb ejJw== X-Gm-Message-State: APjAAAWZHDxPE4V2SzVx371JM+0OiQWBMQy1WBNonHZBNbMz5w7nlI00 03jaqVde0IxZrksfCozq6Gt4k32PYlE= X-Google-Smtp-Source: APXvYqzWcM7qoEm2ZrvjEtdeJ1lA0il8C6Edh+PW/hsK2r+txs3hOLyVrid91hFnoJ3i44hoGs+XPA== X-Received: by 2002:a17:902:e283:: with SMTP id cf3mr5307029plb.160.1556820233495; Thu, 02 May 2019 11:03:53 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id c18sm90371672pfc.0.2019.05.02.11.03.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 May 2019 11:03:52 -0700 (PDT) From: John Stultz To: dri-devel Subject: [RFC][PATCH 2/3] mesa: android: freedreno: build libfreedreno_{drm, ir3} static libs Date: Thu, 2 May 2019 11:03:45 -0700 Message-Id: <20190502180346.4769-3-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190502180346.4769-1-john.stultz@linaro.org> References: <20190502180346.4769-1-john.stultz@linaro.org> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SB6aYSwKk9czRCGXAkNNVoUj4B5oms2WdE735XnGGbw=; b=mrJjbct/Tc2ZBX8ZhhYbDz8ffuPNDfEW7lMJ1FpfUVeqUw96xDRppBHd+9UFqIvJGj j/aWr0Y7To2f5vKzcxMR+5bvZg7JznVmZbpfotpbI3psxOutEVJziWDUV569YQDIjjMV /aenj8ILlTbu42vmG3tAhM9/WFa6MI0INunDYkJUMoGSMH8vlEdXADwvGTSkiuQqosyQ 1gWRLk12FD6YI5/2lT26PXq6w0oPqoTUaV2tYaZ3qmx9/hAR1DIrbzdyThmsZ+DCxjtp P1ButBYojPWpQfFGSGMgtJRhzCsjai52GXsbWLwStsZ3GsEowk4X6loqQz1dQ/bvtXyK oTXQ== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Amit Pundir , Rob Clark , John Stultz , Greg Hartman , Emil Velikov , Alistair Strachan , Jason Ekstrand Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Amit Pundir Add libfreedreno_drm/ir3 to the build Cc: Rob Clark Cc: Emil Velikov Cc: Amit Pundir Cc: Sumit Semwal Cc: Alistair Strachan Cc: Greg Hartman Cc: Tapani Pälli Cc: Jason Ekstrand Signed-off-by: Amit Pundir [jstultz: Tweaked to add extra ir3 files from master] Signed-off-by: John Stultz --- Android.mk | 1 + src/freedreno/Android.drm.mk | 41 +++++++++++++++++++ src/freedreno/Android.ir3.mk | 51 ++++++++++++++++++++++++ src/freedreno/Android.mk | 30 ++++++++++++++ src/freedreno/Makefile.sources | 2 + src/gallium/Android.common.mk | 5 ++- src/gallium/drivers/freedreno/Android.mk | 2 +- src/gallium/targets/dri/Android.mk | 4 ++ 8 files changed, 134 insertions(+), 2 deletions(-) create mode 100644 src/freedreno/Android.drm.mk create mode 100644 src/freedreno/Android.ir3.mk create mode 100644 src/freedreno/Android.mk diff --git a/Android.mk b/Android.mk index d2b12ea4473..5fe028c6d19 100644 --- a/Android.mk +++ b/Android.mk @@ -110,6 +110,7 @@ endef # add subdirectories SUBDIRS := \ + src/freedreno \ src/gbm \ src/loader \ src/mapi \ diff --git a/src/freedreno/Android.drm.mk b/src/freedreno/Android.drm.mk new file mode 100644 index 00000000000..dfa9bed7d2e --- /dev/null +++ b/src/freedreno/Android.drm.mk @@ -0,0 +1,41 @@ +# Mesa 3-D graphics library +# +# Copyright (C) +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +# Android.mk for libfreedreno_drm.a + +# --------------------------------------- +# Build libfreedreno_drm +# --------------------------------------- + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + $(drm_SOURCES) + +LOCAL_C_INCLUDES := \ + $(MESA_TOP)/src/gallium/include \ + $(MESA_TOP)/src/gallium/auxiliary + +LOCAL_MODULE := libfreedreno_drm + +include $(MESA_COMMON_MK) +include $(BUILD_STATIC_LIBRARY) diff --git a/src/freedreno/Android.ir3.mk b/src/freedreno/Android.ir3.mk new file mode 100644 index 00000000000..c6a9d3288d7 --- /dev/null +++ b/src/freedreno/Android.ir3.mk @@ -0,0 +1,51 @@ +# Mesa 3-D graphics library +# +# Copyright (C) +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +# Android.mk for libfreedreno_ir3.a + +# --------------------------------------- +# Build libfreedreno_ir3 +# --------------------------------------- + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + $(ir3_SOURCES) + +LOCAL_C_INCLUDES := \ + $(MESA_TOP)/src/compiler/nir \ + $(MESA_TOP)/src/gallium/include \ + $(MESA_TOP)/src/gallium/auxiliary \ + $(MESA_TOP)/prebuilt-intermediates/nir \ + +# We need libmesa_nir to get NIR's generated include directories. +LOCAL_STATIC_LIBRARIES := \ + libmesa_nir + +LOCAL_MODULE := libfreedreno_ir3 + +LOCAL_GENERATED_SOURCES := \ + $(MESA_GEN_GLSL_H) \ + $(MESA_GEN_NIR_H) + +include $(MESA_COMMON_MK) +include $(BUILD_STATIC_LIBRARY) diff --git a/src/freedreno/Android.mk b/src/freedreno/Android.mk new file mode 100644 index 00000000000..e46e2199dc1 --- /dev/null +++ b/src/freedreno/Android.mk @@ -0,0 +1,30 @@ +# Mesa 3-D graphics library +# +# Copyright (C) +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +# Android.mk for libfreedreno_* + +LOCAL_PATH := $(call my-dir) + +include $(LOCAL_PATH)/Makefile.sources +include $(MESA_TOP)/src/gallium/drivers/freedreno/Android.gen.mk +include $(LOCAL_PATH)/Android.drm.mk +include $(LOCAL_PATH)/Android.ir3.mk diff --git a/src/freedreno/Makefile.sources b/src/freedreno/Makefile.sources index aa8edec82f2..a46a2c30913 100644 --- a/src/freedreno/Makefile.sources +++ b/src/freedreno/Makefile.sources @@ -36,6 +36,8 @@ ir3_SOURCES := \ ir3/ir3_nir.c \ ir3/ir3_nir.h \ ir3/ir3_nir_analyze_ubo_ranges.c \ + ir3/ir3_nir_lower_load_barycentric_at_sample.c \ + ir3/ir3_nir_lower_load_barycentric_at_offset.c \ ir3/ir3_nir_lower_io_offsets.c \ ir3/ir3_nir_lower_tg4_to_tex.c \ ir3/ir3_nir_move_varying_inputs.c \ diff --git a/src/gallium/Android.common.mk b/src/gallium/Android.common.mk index 782510ff0f4..0d55f04ac94 100644 --- a/src/gallium/Android.common.mk +++ b/src/gallium/Android.common.mk @@ -27,6 +27,9 @@ LOCAL_C_INCLUDES += \ $(GALLIUM_TOP)/include \ $(GALLIUM_TOP)/auxiliary \ $(GALLIUM_TOP)/winsys \ - $(GALLIUM_TOP)/drivers + $(GALLIUM_TOP)/drivers \ + $(MESA_TOP)/src/freedreno \ + $(MESA_TOP)/src/freedreno/ir3 \ + $(MESA_TOP)/src/freedreno/registers include $(MESA_COMMON_MK) diff --git a/src/gallium/drivers/freedreno/Android.mk b/src/gallium/drivers/freedreno/Android.mk index ccd88a7d16c..f0ae361cd6a 100644 --- a/src/gallium/drivers/freedreno/Android.mk +++ b/src/gallium/drivers/freedreno/Android.mk @@ -44,7 +44,7 @@ LOCAL_C_INCLUDES := \ LOCAL_GENERATED_SOURCES := $(MESA_GEN_NIR_H) LOCAL_SHARED_LIBRARIES := libdrm -LOCAL_STATIC_LIBRARIES := libmesa_glsl libmesa_nir +LOCAL_STATIC_LIBRARIES := libmesa_glsl libmesa_nir libfreedreno_drm libfreedreno_ir3 LOCAL_MODULE := libmesa_pipe_freedreno include $(LOCAL_PATH)/Android.gen.mk diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index 6134251b5ca..10b27a80ef3 100644 --- a/src/gallium/targets/dri/Android.mk +++ b/src/gallium/targets/dri/Android.mk @@ -53,6 +53,10 @@ LOCAL_SHARED_LIBRARIES += \ libexpat endif +LOCAL_STATIC_LIBRARIES += \ + libfreedreno_drm \ + libfreedreno_ir3 + ifeq ($(USE_LIBBACKTRACE),true) LOCAL_SHARED_LIBRARIES += libbacktrace endif From patchwork Thu May 2 18:03:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 10927479 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4F79E14DB for ; Thu, 2 May 2019 18:04:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3FDB0204FD for ; Thu, 2 May 2019 18:04:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3402621FAC; Thu, 2 May 2019 18:04:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DCE34204FD for ; Thu, 2 May 2019 18:04:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A24278979F; Thu, 2 May 2019 18:03:57 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id 37FC18979F for ; Thu, 2 May 2019 18:03:56 +0000 (UTC) Received: by mail-pf1-x444.google.com with SMTP id t87so929569pfa.2 for ; Thu, 02 May 2019 11:03:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jpaVbgGhNQN0ZzYUArMcOaCEqRA3aweYtZZ+kl3+Iik=; b=R5nf6xYF0CvtyYN1gxJSuN10h7aIKymiL2U6cgsHkzvonJ3n35S2JB4bDvhnBN68Pq 02sXAsKagzdE1GPHkTtmZbTDENH8rlsl29rhb9BvlEAT87CG90HBKRpBdQUSG0uOzkMl e3BMWDgkRwiXKaVyXk4vhGoNV92T4vFTAR7NMRh+pu/jAqw3pujNkOWum7UktScMmWIz +XXVLHkxYc4mZjssJUYeqFFsP6duEXDGDLDwdES9otawKX7R8+6rxH8a+WToBkZ1RM2n bQE66UL7q/ngLJuV2+YoBai3ybVmVOgK/CYNM7pVGEB4QEeNhV2wkS8yIQr2bPjf4jEX aU2g== X-Gm-Message-State: APjAAAUgFxI1SnGVm5bFELap21EJ2UVxfxMSEVv68ceTX8dwSocRgFvS DbK8rbxliFl+8auI1AxES3a4ged2TwQ= X-Google-Smtp-Source: APXvYqwceDCWRpUcoHSkNMOKxmMRsFZi4GuQE7+rJlABu1gYS8ge0GQn1qIJjSodlyJDCNC3jDHuQg== X-Received: by 2002:a63:e048:: with SMTP id n8mr5381287pgj.41.1556820235197; Thu, 02 May 2019 11:03:55 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id c18sm90371672pfc.0.2019.05.02.11.03.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 May 2019 11:03:54 -0700 (PDT) From: John Stultz To: dri-devel Subject: [PATCH 3/3] mesa: android: freedreno: Fix build failure due to path change Date: Thu, 2 May 2019 11:03:46 -0700 Message-Id: <20190502180346.4769-4-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190502180346.4769-1-john.stultz@linaro.org> References: <20190502180346.4769-1-john.stultz@linaro.org> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jpaVbgGhNQN0ZzYUArMcOaCEqRA3aweYtZZ+kl3+Iik=; b=alkrJWfOwMliBJkUsqM+4tkVkrN3rHO+A3ZWU5dC8rtbfYsAQpKVgG6ldJX0RVGq5b lgbucVUCwW0tAIyr/kamTILaTAxG3dGbJfw7FNT9jmpvdNxml2i0C5SqXNIqrHF0bYmT 82l4Fs6GjrMuRy3BFUXWx+7TKQ54u2iAN062f33yxIM9Mf6y3OLN10Ibu4KvGpAk8LQm jrVKPNduPSaxQhs5n8LwsMYsLKJvT8HTSECZ70lglmlO/zy9Mqk2WH6EuJVLx/waJ+IW IAtZwh8kStBU/9ZadUGdr5pIhmNpSfh40UzrYHLPe4DU2krb+z8Q1IEUzzlToPhwV5kW 8HJw== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rob Clark , Amit Pundir , Greg Hartman , Emil Velikov , Alistair Strachan , Jason Ekstrand Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP The ir3_nir_trig.py file was moved in a previous commit, aa0fed10d3574 (freedreno: move ir3 to common location), so update the Android.gen.mk file to match. Cc: Rob Clark Cc: Emil Velikov Cc: Amit Pundir Cc: Sumit Semwal Cc: Alistair Strachan Cc: Greg Hartman Cc: Tapani Pälli Cc: Jason Ekstrand Signed-off-by: John Stultz --- src/gallium/drivers/freedreno/Android.gen.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/freedreno/Android.gen.mk b/src/gallium/drivers/freedreno/Android.gen.mk index 17b6fbe1b7e..d29ba159d5c 100644 --- a/src/gallium/drivers/freedreno/Android.gen.mk +++ b/src/gallium/drivers/freedreno/Android.gen.mk @@ -25,7 +25,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES endif ir3_nir_trig_deps := \ - $(LOCAL_PATH)/ir3/ir3_nir_trig.py \ + $(MESA_TOP)/src/freedreno/ir3/ir3_nir_trig.py \ $(MESA_TOP)/src/compiler/nir/nir_algebraic.py intermediates := $(call local-generated-sources-dir)