From: Mauro Rossi Date: Mon, 10 Aug 2020 13:01:30 +0000 (+0200) Subject: android: panfrost: Rename encoder/ to lib/ X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=de352f58c3817ed5b399d211a1b2603510716e85;p=mesa.git android: panfrost: Rename encoder/ to lib/ Fixes the following building errors: target C: libpanfrost_encoder <= external/mesa/src/panfrost/encoder/pan_attributes.c ... clang: error: no such file or directory: 'external/mesa/src/panfrost/encoder/pan_attributes.c' clang: error: no input files target C: libpanfrost_encoder <= external/mesa/src/panfrost/encoder/pan_afbc.c ... clang: error: no such file or directory: 'external/mesa/src/panfrost/encoder/pan_afbc.c' clang: error: no input files Fixes: 1c62b5528 ("panfrost: Rename encoder/ to lib/") Signed-off-by: Mauro Rossi Reviewed-by: Alyssa Rosenzweig Part-of: --- diff --git a/src/gallium/drivers/panfrost/Android.mk b/src/gallium/drivers/panfrost/Android.mk index c7ad6e1759b..c6d7abfbd30 100644 --- a/src/gallium/drivers/panfrost/Android.mk +++ b/src/gallium/drivers/panfrost/Android.mk @@ -43,7 +43,7 @@ LOCAL_STATIC_LIBRARIES := \ libmesa_winsys_panfrost \ libpanfrost_bifrost \ libpanfrost_decode \ - libpanfrost_encoder \ + libpanfrost_lib \ libpanfrost_midgard \ libpanfrost_shared \ libpanfrost_util \ diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index 7506d8211e6..244f67852f2 100644 --- a/src/gallium/targets/dri/Android.mk +++ b/src/gallium/targets/dri/Android.mk @@ -63,7 +63,7 @@ LOCAL_STATIC_LIBRARIES += \ libmesa_gallium \ libpanfrost_bifrost \ libpanfrost_decode \ - libpanfrost_encoder \ + libpanfrost_lib \ libpanfrost_midgard \ libpanfrost_shared \ libpanfrost_util \ diff --git a/src/panfrost/Android.encoder.mk b/src/panfrost/Android.encoder.mk deleted file mode 100644 index 9e57adc4060..00000000000 --- a/src/panfrost/Android.encoder.mk +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright © 2019 Collabora Ltd. -# -# 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. - -include $(CLEAR_VARS) - -LOCAL_MODULE := libpanfrost_encoder - -LOCAL_SRC_FILES := \ - $(encoder_FILES) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/gallium/auxiliary/ \ - $(MESA_TOP)/src/gallium/include/ \ - $(MESA_TOP)/src/panfrost/encoder/ \ - $(MESA_TOP)/src/panfrost/include/ - -LOCAL_STATIC_LIBRARIES := \ - libmesa_nir - -LOCAL_GENERATED_SOURCES := \ - -LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(MESA_TOP)/src/panfrost/encoder/ \ - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) \ No newline at end of file diff --git a/src/panfrost/Android.lib.mk b/src/panfrost/Android.lib.mk new file mode 100644 index 00000000000..cda70388607 --- /dev/null +++ b/src/panfrost/Android.lib.mk @@ -0,0 +1,43 @@ +# Copyright © 2019 Collabora Ltd. +# +# 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. + +include $(CLEAR_VARS) + +LOCAL_MODULE := libpanfrost_lib + +LOCAL_SRC_FILES := \ + $(lib_FILES) + +LOCAL_C_INCLUDES := \ + $(MESA_TOP)/src/gallium/auxiliary/ \ + $(MESA_TOP)/src/gallium/include/ \ + $(MESA_TOP)/src/panfrost/lib/ \ + $(MESA_TOP)/src/panfrost/include/ + +LOCAL_STATIC_LIBRARIES := \ + libmesa_nir + +LOCAL_GENERATED_SOURCES := \ + +LOCAL_EXPORT_C_INCLUDE_DIRS := \ + $(MESA_TOP)/src/panfrost/lib/ \ + +include $(MESA_COMMON_MK) +include $(BUILD_STATIC_LIBRARY) diff --git a/src/panfrost/Android.mk b/src/panfrost/Android.mk index 670f60f3e32..b76a99a291d 100644 --- a/src/panfrost/Android.mk +++ b/src/panfrost/Android.mk @@ -27,7 +27,7 @@ LOCAL_PATH := $(call my-dir) include $(LOCAL_PATH)/Makefile.sources include $(LOCAL_PATH)/Android.util.mk include $(LOCAL_PATH)/Android.bifrost.mk -include $(LOCAL_PATH)/Android.encoder.mk +include $(LOCAL_PATH)/Android.lib.mk include $(LOCAL_PATH)/Android.midgard.mk include $(LOCAL_PATH)/Android.shared.mk include $(LOCAL_PATH)/Android.pandecode.mk diff --git a/src/panfrost/Android.pandecode.mk b/src/panfrost/Android.pandecode.mk index 76c5ce9a763..6ddb914875b 100644 --- a/src/panfrost/Android.pandecode.mk +++ b/src/panfrost/Android.pandecode.mk @@ -29,11 +29,11 @@ LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/gallium/auxiliary/ \ $(MESA_TOP)/src/gallium/include/ \ $(MESA_TOP)/src/panfrost/include/ \ - $(MESA_TOP)/src/panfrost/encoder/ \ + $(MESA_TOP)/src/panfrost/lib/ \ $(MESA_TOP)/src/panfrost/pandecode/ LOCAL_STATIC_LIBRARIES := \ - libpanfrost_encoder + libpanfrost_lib LOCAL_GENERATED_SOURCES := \ @@ -41,4 +41,4 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \ $(MESA_TOP)/src/panfrost/pandecode/ \ include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) \ No newline at end of file +include $(BUILD_STATIC_LIBRARY) diff --git a/src/panfrost/Makefile.sources b/src/panfrost/Makefile.sources index d34e71dfbca..4c817dc1d58 100644 --- a/src/panfrost/Makefile.sources +++ b/src/panfrost/Makefile.sources @@ -20,26 +20,26 @@ bifrost_FILES := \ bifrost/disassemble.c \ bifrost/disassemble.h -encoder_FILES := \ - encoder/pan_afbc.c \ - encoder/pan_attributes.c \ - encoder/pan_bo.c \ - encoder/pan_bo.h \ - encoder/pan_blit.c \ - encoder/pan_device.h \ - encoder/pan_encoder.h \ - encoder/pan_format.c \ - encoder/pan_invocation.c \ - encoder/pan_pool.c \ - encoder/pan_pool.h \ - encoder/pan_props.c \ - encoder/pan_sampler.c \ - encoder/pan_scoreboard.c \ - encoder/pan_scoreboard.h \ - encoder/pan_tiler.c \ - encoder/pan_texture.c \ - encoder/pan_scratch.c \ - encoder/pan_util.h +lib_FILES := \ + lib/pan_afbc.c \ + lib/pan_attributes.c \ + lib/pan_bo.c \ + lib/pan_bo.h \ + lib/pan_blit.c \ + lib/pan_device.h \ + lib/pan_encoder.h \ + lib/pan_format.c \ + lib/pan_invocation.c \ + lib/pan_pool.c \ + lib/pan_pool.h \ + lib/pan_props.c \ + lib/pan_sampler.c \ + lib/pan_scoreboard.c \ + lib/pan_scoreboard.h \ + lib/pan_tiler.c \ + lib/pan_texture.c \ + lib/pan_scratch.c \ + lib/pan_util.h midgard_FILES := \ midgard/compiler.h \