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: 163278 Delivered-To: patches@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp6032609ill; Thu, 2 May 2019 11:03:52 -0700 (PDT) X-Received: by 2002:aa7:991b:: with SMTP id z27mr5626445pff.168.1556820232315; Thu, 02 May 2019 11:03:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556820232; cv=none; d=google.com; s=arc-20160816; b=x2jeFY5Y4ZtNtPHyPb3HPveVB6Tp5lz0Lotymj7WN2MUobfFl/RAySFAWkqgaMU6D/ rjIm4rPqHGB6gZ7aCHQ+VDnboN0poGFG+DtKU+U4pCGj2Jr4P+g0lNxO3VRCXUD5PdV5 Xr5SVEqH7GNY7rAQiIs1CGCYM7q5BTmgA452znfI5Zwl1Jp6GUIFtPaZ0PKJtiMMkKgu 4ZM39DQyKuZDiiNQHTaa4VsGVC6PvKDIov4qoSdCGWOY2Xg0Aux3Q/JuT8vicbAEjLQT ES0MG/yIbRThnX2BDCfFj1L5QlAAfnMxBEjuA4uFWQ//8TfGO5miqRduDljtQyjrNUS1 uLWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=KwVol6+NAKSj5claaoAPzFfVv/0b5wE9kH8oSQrsELw=; b=bZn++V7NO6N5SqxofcbezbnMkE5pMAM2HQ8KtiAidAVh+pnUoJP/JE7OzwUl7AZA2u RwsQvc4QcM4CL010olUM9rLCEb/JAhShNhqhaZgm1QSUmC8+xB1h8pgB0IIy3tlDGThZ 8MDehFNUL/ETkkpSNcgMKShXZJZNZ/WdkXJVHy+4B+YB5VrwO2NLMLGV36KKFrEnjLrM joH81QiOEFcTJIbyJFOpu2CaVfmvrAt4ky3gsVLlrzLyI68gwTo1ld7JJKPm6tcQZ0ar WqIFhAX3F+0oQr7tdQLZxMWhr2zsAMLwMozV+mm059j7W98D71DhzsXFdXli+g3r/UXk 5oJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Ae66Y7F/"; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 59sor8532726plb.24.2019.05.02.11.03.52 for (Google Transport Security); Thu, 02 May 2019 11:03:52 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Ae66Y7F/"; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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-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=EKHRl30GE5VpuyFfP7hp4ArQ9FSwdX5BZtgMEMhjTRkYFA0CEF7vEGGLetLeLl9JaR +Ed9vq55uSz5Pd6Hd38Er6XZA4AgyZOxybfeOEDCDw6vOsfUsg/+JfiSeFA1zZByEiLi OakTP0J9D7LGOLVfTMTBYrqIdyb2sVzzBS4zaCVI2dZUTI5cZAonH1kve/OSggCzXShb r34AZYTXevLG4ABjy6NaC5T1zW3OdMcbcbkmmD7yqfXIafve2b4QESQIl7CoeEJ+0+iW o0GaNiJkD3mOJBJFSW4BD7Lw11OQim6YsqGrnYjgGdjmSqFRCqqNkuMgBj3JaVPA48wr LyMw== X-Gm-Message-State: APjAAAVGBreYWvbrG+Qa8oNiNII871OPWfVgWd4RHwnjPJmJT3rBR6Uc 1plAO/4ZLRqsSyBKqi8cNkC685aZ 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) Return-Path: 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 Cc: Alistair Strachan , Rob Clark , Emil Velikov , Amit Pundir , Sumit Semwal , Greg Hartman , =?utf-8?q?Tapani_P=C3=A4lli?= , Jason Ekstrand , John Stultz 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 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(-) -- 2.17.1 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: 163279 Delivered-To: patches@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp6032640ill; Thu, 2 May 2019 11:03:54 -0700 (PDT) X-Received: by 2002:a63:e003:: with SMTP id e3mr5515987pgh.0.1556820233930; Thu, 02 May 2019 11:03:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556820233; cv=none; d=google.com; s=arc-20160816; b=d800lkm6lIOO7imWMxe+19SB7BrIYVGhK0SbCM1kQYVNVpMPmVWGtceFW+PmpZlzxZ ihZJvOLGyxtPyhOCUo41tks0r1ja7HUmzP/qGrOvZo8C83s8dRTiO4K0J1r/nF9EfcVv XGIUrSM7Az4mkKjWMvu/ZI0eSVdL1liyjH68HoIwJxsJvzZGxXNaUpRHNYZNYXyBBh6q vqUhGeZRGB731ecq5YaSbsANCMCiMaFFOUkkZkRl6DOI716FqyssLVvdETUcQkhkjUBc pwYO8LvPtuU4tsbkKavHnOefn61Q+9R4gnvQ1VQKYFjSIzs/mj8mgZJHyRtCIVlTwha+ 81YA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=SB6aYSwKk9czRCGXAkNNVoUj4B5oms2WdE735XnGGbw=; b=EoS15jrhkhMqzkkqn2oKpRLkx2pidAm+q3at+P/j6x15rKsY71rfB+jaf3CMmW+vWk AP6DLhrr+Pl2nVJgVlqWl206CW1CupOVpQgxi1HdKcG63pgh/4ErbM0Sp6lQMJl/Xwgh Q7Q4//rrxwp/YiEEaPx3zz+hFgv73zEp9gJoQXBWkj45XJq9m7QCNy3T49JKtBNhZNF3 Z8zzOIpBaE3hKEwPBK4YV8tFrRlPWQRH5ctOP4yHkM+lsafyKgAgEBBGGjGz/4uTXGCb boISx6ldMZK7Bs0fZalF9ZDweXe5d8N+jR+rhS7245ZMNeQM8ueZe6kuovFI5Ygne0oO fDtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="mrJjbct/"; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id ba9sor8380180plb.63.2019.05.02.11.03.53 for (Google Transport Security); Thu, 02 May 2019 11:03:53 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="mrJjbct/"; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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-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=IakbFHerPRwhfTzqW5estgHfBZQsI2eHiPdfrAdMTFBiKUBWOmspTX+EOslQHPGUPG 3SPKqXQeb0qUTqLA7k8wB+MQnKgb5YS+PRxhD2dq2y/WI+i2oZ78SLm61NtgmYiYuJLt lIT0+A10sqlkyDOaNjYOF+eM9ndKSb+nWv6D4CwRUSUd9APKh2dOW834VkTsE8HQhMyU A/gyWybmXkx3SCNR0Lf2WFU1sRMi8WDlXl4VZ9XE1gUimkxsGIF3f4UpVWDe3/t5rDqT SUbS+Dw/+ZiZor+r2y4q61KrU9zebuDb9kYRCoc4TJyCVfM68Sk5tSPZ1TogmBVdg6N1 aU/A== X-Gm-Message-State: APjAAAVavn3Cvi2qPGKSkhBgQ4fL89kh/LcbK2wojOBCfIyGjy+hxwqx xjpUBBvAZ6NcOTO620hhzL1j9LHY 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) Return-Path: 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 Cc: Amit Pundir , Rob Clark , Emil Velikov , Sumit Semwal , Alistair Strachan , Greg Hartman , =?utf-8?q?Tapani_P=C3=A4lli?= , Jason Ekstrand , John Stultz 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 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 -- 2.17.1 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: 163280 Delivered-To: patches@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp6032672ill; Thu, 2 May 2019 11:03:55 -0700 (PDT) X-Received: by 2002:a62:1d94:: with SMTP id d142mr5632792pfd.83.1556820235604; Thu, 02 May 2019 11:03:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556820235; cv=none; d=google.com; s=arc-20160816; b=N+SPyjAN2mwclREggyIXWoVgBEg//8aqPIEqUsqqx+clzM+GBWYBTdfA7qvsTa9vGF ZP/AKrBedIratqe9lg8fL5IJoSv978Lmub0Yow6wX0xraPUNr5Gi2fhSD7BoKqHeDGdn 9bh5jsGn0W+/H1tptKf2Wt3NMmy/J0IrTAddDa6zlvvgJaphWnc5OhNzVIwcRzvcej07 494k1YuDXUq1pqPasJQ5xRBK26X+KuWrLj4ZgEaRVCWgoKc0kTKW40uZny7CurFQV00A 7WIQEomD1epC7OtvqVWsIv2HGIIDu6xpqLFm2YceNRiNU4GiP0dhAjqvGPg/LxnV31qO QxbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=jpaVbgGhNQN0ZzYUArMcOaCEqRA3aweYtZZ+kl3+Iik=; b=mwDfuhr2m7YKrb3XPcwBnCPYRfuBlJA4a8xmdf8bl6Nn598X7FNbvCCfLqZYb7962b SVomoSYbAzP7FBbuhQP9VmKzjTYsSLZ5Y9TzH3YuOZSBFpQjHMCuli3Dhdl8t2DuzsfM 0TPiuU+sy/Dkt1Z7x2zqHLvpP5oQ/dxsTHn3gSaaP1/YlT6yfOMeRNcdjX/oBcnapmnC C8J39XzpZA/Oual3KehaK3AocyUyN8yMT1LxFq/LFzQY6Ro8wzkwcG1EGjxCZxMWCsje o019T6yeUBDn3M/CVFC+UY57AgHDr3/EgrOQWfIe+7oTSkrUoSHZwtqAh80/VNAhUKbm z9vQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=alkrJWfO; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 126sor45013244pgb.51.2019.05.02.11.03.55 for (Google Transport Security); Thu, 02 May 2019 11:03:55 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=alkrJWfO; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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-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=iJXufHP9tIWmQGchU8jm27XAvD9NzvHoeqix3a+CPxbX/9FqERV+5yuVSkJcAbgqCk rW6rhK2gLfldLkq9ZiX6RDoGMWDRvWJObCu5kkFTf2JRWE9RIkC/2LUfdbjBL3KgwXho BB152sQ0lvKAZJYGstf15RSkb9718SBm2xBufpDqbFNZNu61aKWCN7xJdkJ569bkz1uW KAh8Go5G6LMZ8nD0RTCfR/PsR+KGtPPFylAE98qf4wopG8Ul84JNvelLURRZX66tqTNo BEAlAtZX7V+H5/53JWuqB7j39ktch4g5kDfN22cY1XZRmcCsrDTv6tvqBSc9JosHPpQ8 L9YQ== X-Gm-Message-State: APjAAAXZ9tHIHVZnSCoZZLnbQaIGljXGFjvrotjx5aNIQs+/MGlnX5rR xkHc3LRUV7YIBKA9PNuvqywPkxoq 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) Return-Path: 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 Cc: John Stultz , Rob Clark , Emil Velikov , Amit Pundir , Sumit Semwal , Alistair Strachan , Greg Hartman , =?utf-8?q?Tapani_P=C3=A4lli?= , Jason Ekstrand 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 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(-) -- 2.17.1 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)