From d4b482d378e34b3f17005bc6244f24bdd73e94a0 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Mon, 7 Jun 2021 11:40:11 -0500 Subject: [PATCH] android: Drop the Android.mk build system Android.mk files haven't really been supported by Mesa devs for a long time. Most of us have been willing to update Makefile.sources if we remember and sometimes we try to blind code some Android.mk for a new generator. However, the reality is that it breaks regularly and ends up being maintained by the Android community. To address this problem another approach was implemented in !10183 utilizing the maintained meson build system. The old Android.mk files are no longer required. This commit was created with the following commands: git rm **/Android.mk git rm **/Android.*.mk git rm **/Makefile.sources git rm CleanSpec.mk Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4487 Acked-by: Roman Stratiienko Part-of: --- Android.common.mk | 136 ---- Android.mk | 132 ---- CleanSpec.mk | 16 - android/Android.mk | 154 ---- docs/install.rst | 10 +- src/amd/Android.addrlib.mk | 52 -- src/amd/Android.common.mk | 125 --- src/amd/Android.compiler.mk | 92 --- src/amd/Android.mk | 33 - src/amd/Makefile.sources | 129 ---- src/amd/vulkan/Android.mk | 152 ---- src/amd/vulkan/Makefile.sources | 111 --- src/broadcom/Android.cle.mk | 39 - src/broadcom/Android.genxml.mk | 83 -- src/broadcom/Android.mk | 29 - src/broadcom/Makefile.sources | 62 -- src/compiler/Android.glsl.gen.mk | 107 --- src/compiler/Android.glsl.mk | 55 -- src/compiler/Android.mk | 52 -- src/compiler/Android.nir.gen.mk | 124 --- src/compiler/Android.nir.mk | 51 -- src/compiler/Makefile.sources | 406 ---------- src/egl/Android.mk | 95 --- src/egl/Makefile.sources | 32 - src/etnaviv/Android.mk | 28 - src/etnaviv/drm/Android.mk | 46 -- src/etnaviv/drm/Makefile.sources | 10 - src/freedreno/Android.common.mk | 43 -- src/freedreno/Android.drm.mk | 43 -- src/freedreno/Android.ir2.mk | 46 -- src/freedreno/Android.ir3.mk | 102 --- src/freedreno/Android.isa.mk | 123 --- src/freedreno/Android.mk | 34 - src/freedreno/Android.perfcntrs.mk | 43 -- src/freedreno/Android.registers.mk | 100 --- src/freedreno/Makefile.sources | 97 --- src/gallium/Android.common.mk | 36 - src/gallium/Android.mk | 59 -- src/gallium/auxiliary/Android.mk | 109 --- src/gallium/auxiliary/Makefile.sources | 465 ------------ src/gallium/auxiliary/pipe-loader/Android.mk | 45 -- .../auxiliary/pipe-loader/Makefile.sources | 9 - src/gallium/drivers/etnaviv/Android.mk | 44 -- src/gallium/drivers/etnaviv/Makefile.sources | 84 --- src/gallium/drivers/freedreno/Android.mk | 77 -- .../drivers/freedreno/Makefile.sources | 216 ------ src/gallium/drivers/i915/Android.mk | 41 - src/gallium/drivers/i915/Makefile.sources | 42 -- src/gallium/drivers/iris/Android.mk | 183 ----- src/gallium/drivers/iris/Makefile.sources | 58 -- src/gallium/drivers/kmsro/Android.mk | 58 -- src/gallium/drivers/kmsro/Makefile.sources | 2 - src/gallium/drivers/lima/Android.mk | 111 --- src/gallium/drivers/llvmpipe/Makefile.sources | 76 -- src/gallium/drivers/nouveau/Android.mk | 57 -- src/gallium/drivers/nouveau/Makefile.sources | 214 ------ src/gallium/drivers/panfrost/Android.mk | 59 -- src/gallium/drivers/panfrost/Makefile.sources | 19 - src/gallium/drivers/r300/Android.mk | 48 -- src/gallium/drivers/r300/Makefile.sources | 110 --- src/gallium/drivers/r600/Android.mk | 65 -- src/gallium/drivers/r600/Makefile.sources | 170 ----- src/gallium/drivers/radeonsi/Android.mk | 71 -- src/gallium/drivers/radeonsi/Makefile.sources | 75 -- src/gallium/drivers/softpipe/Android.mk | 42 -- src/gallium/drivers/softpipe/Makefile.sources | 56 -- src/gallium/drivers/svga/Android.mk | 45 -- src/gallium/drivers/svga/Makefile.sources | 108 --- src/gallium/drivers/tegra/Makefile.sources | 6 - src/gallium/drivers/v3d/Makefile.sources | 36 - src/gallium/drivers/vc4/Android.mk | 55 -- src/gallium/drivers/vc4/Makefile.sources | 64 -- src/gallium/drivers/virgl/Android.mk | 41 - src/gallium/drivers/virgl/Makefile.sources | 20 - src/gallium/frontends/clover/Makefile.sources | 70 -- src/gallium/frontends/dri/Android.mk | 55 -- src/gallium/frontends/dri/Makefile.sources | 17 - .../frontends/glx/xlib/Makefile.sources | 9 - src/gallium/frontends/nine/Makefile.sources | 82 -- src/gallium/frontends/omx/Makefile.sources | 9 - .../frontends/omx/bellagio/Makefile.sources | 11 - .../frontends/omx/tizonia/Makefile.sources | 22 - src/gallium/frontends/osmesa/Makefile.sources | 2 - src/gallium/frontends/va/Makefile.sources | 20 - src/gallium/frontends/vdpau/Makefile.sources | 13 - src/gallium/frontends/wgl/Makefile.sources | 17 - src/gallium/frontends/xa/Makefile.sources | 8 - src/gallium/frontends/xvmc/Makefile.sources | 7 - src/gallium/targets/dri/Android.mk | 111 --- src/gallium/winsys/amdgpu/drm/Android.mk | 52 -- .../winsys/amdgpu/drm/Makefile.sources | 9 - src/gallium/winsys/etnaviv/drm/Android.mk | 33 - .../winsys/etnaviv/drm/Makefile.sources | 3 - src/gallium/winsys/freedreno/drm/Android.mk | 39 - .../winsys/freedreno/drm/Makefile.sources | 3 - src/gallium/winsys/i915/drm/Android.mk | 41 - src/gallium/winsys/i915/drm/Makefile.sources | 7 - src/gallium/winsys/iris/drm/Android.mk | 40 - src/gallium/winsys/iris/drm/Makefile.sources | 3 - src/gallium/winsys/kmsro/drm/Android.mk | 35 - src/gallium/winsys/kmsro/drm/Makefile.sources | 3 - src/gallium/winsys/lima/drm/Android.mk | 32 - src/gallium/winsys/nouveau/drm/Android.mk | 37 - .../winsys/nouveau/drm/Makefile.sources | 3 - src/gallium/winsys/panfrost/drm/Android.mk | 33 - .../winsys/panfrost/drm/Makefile.sources | 3 - src/gallium/winsys/radeon/drm/Android.mk | 37 - .../winsys/radeon/drm/Makefile.sources | 9 - src/gallium/winsys/svga/drm/Android.mk | 42 -- src/gallium/winsys/svga/drm/Makefile.sources | 24 - src/gallium/winsys/sw/dri/Android.mk | 35 - src/gallium/winsys/sw/dri/Makefile.sources | 3 - src/gallium/winsys/sw/kms-dri/Android.mk | 33 - .../winsys/sw/kms-dri/Makefile.sources | 3 - src/gallium/winsys/sw/null/Makefile.sources | 3 - .../winsys/sw/wrapper/Makefile.sources | 3 - src/gallium/winsys/sw/xlib/Makefile.sources | 3 - src/gallium/winsys/tegra/drm/Makefile.sources | 3 - src/gallium/winsys/v3d/drm/Android.mk | 33 - src/gallium/winsys/v3d/drm/Makefile.sources | 3 - src/gallium/winsys/vc4/drm/Android.mk | 33 - src/gallium/winsys/vc4/drm/Makefile.sources | 3 - src/gallium/winsys/virgl/common/Android.mk | 35 - .../winsys/virgl/common/Makefile.sources | 3 - src/gallium/winsys/virgl/drm/Android.mk | 37 - src/gallium/winsys/virgl/drm/Makefile.sources | 5 - src/gallium/winsys/virgl/vtest/Android.mk | 37 - .../winsys/virgl/vtest/Makefile.sources | 5 - src/gbm/Android.mk | 46 -- src/gbm/Makefile.sources | 10 - src/intel/Android.blorp.mk | 45 -- src/intel/Android.common.mk | 57 -- src/intel/Android.compiler.mk | 67 -- src/intel/Android.dev.mk | 42 -- src/intel/Android.genxml.mk | 124 --- src/intel/Android.isl.mk | 326 -------- src/intel/Android.mk | 35 - src/intel/Android.perf.mk | 52 -- src/intel/Android.vulkan.mk | 318 -------- src/intel/Makefile.sources | 384 ---------- src/loader/Android.mk | 45 -- src/loader/Makefile.sources | 7 - src/mapi/Android.mk | 81 -- src/mapi/Makefile.sources | 38 - src/mesa/Android.gen.mk | 177 ----- src/mesa/Android.libmesa_dricore.mk | 74 -- src/mesa/Android.libmesa_git_sha1.mk | 54 -- src/mesa/Android.libmesa_glsl_utils.mk | 74 -- src/mesa/Android.libmesa_sse41.mk | 47 -- src/mesa/Android.libmesa_st_mesa.mk | 71 -- src/mesa/Android.mk | 29 - src/mesa/Makefile.sources | 709 ------------------ src/mesa/drivers/dri/Android.mk | 70 -- src/mesa/drivers/dri/common/Android.mk | 69 -- src/mesa/drivers/dri/common/Makefile.sources | 18 - src/mesa/drivers/dri/i915/Android.mk | 57 -- src/mesa/drivers/dri/i915/Makefile.sources | 64 -- src/mesa/drivers/dri/i965/Android.mk | 306 -------- src/mesa/drivers/dri/i965/Makefile.sources | 164 ---- src/mesa/drivers/dri/nouveau/Makefile.sources | 62 -- src/mesa/drivers/dri/r200/Makefile.sources | 60 -- src/mesa/drivers/dri/radeon/Makefile.sources | 58 -- src/mesa/program/Android.mk | 88 --- src/panfrost/Android.bifrost.mk | 140 ---- src/panfrost/Android.lib.mk | 56 -- src/panfrost/Android.midgard.mk | 88 --- src/panfrost/Android.mk | 32 - src/panfrost/Android.shared.mk | 48 -- src/panfrost/Android.util.mk | 50 -- src/panfrost/Makefile.sources | 123 --- src/util/Android.mk | 101 --- src/util/Makefile.sources | 159 ---- src/vulkan/Android.mk | 119 --- src/vulkan/Makefile.sources | 58 -- 174 files changed, 1 insertion(+), 12190 deletions(-) delete mode 100644 Android.common.mk delete mode 100644 Android.mk delete mode 100644 CleanSpec.mk delete mode 100644 android/Android.mk delete mode 100644 src/amd/Android.addrlib.mk delete mode 100644 src/amd/Android.common.mk delete mode 100644 src/amd/Android.compiler.mk delete mode 100644 src/amd/Android.mk delete mode 100644 src/amd/Makefile.sources delete mode 100644 src/amd/vulkan/Android.mk delete mode 100644 src/amd/vulkan/Makefile.sources delete mode 100644 src/broadcom/Android.cle.mk delete mode 100644 src/broadcom/Android.genxml.mk delete mode 100644 src/broadcom/Android.mk delete mode 100644 src/broadcom/Makefile.sources delete mode 100644 src/compiler/Android.glsl.gen.mk delete mode 100644 src/compiler/Android.glsl.mk delete mode 100644 src/compiler/Android.mk delete mode 100644 src/compiler/Android.nir.gen.mk delete mode 100644 src/compiler/Android.nir.mk delete mode 100644 src/compiler/Makefile.sources delete mode 100644 src/egl/Android.mk delete mode 100644 src/egl/Makefile.sources delete mode 100644 src/etnaviv/Android.mk delete mode 100644 src/etnaviv/drm/Android.mk delete mode 100644 src/etnaviv/drm/Makefile.sources delete mode 100644 src/freedreno/Android.common.mk delete mode 100644 src/freedreno/Android.drm.mk delete mode 100644 src/freedreno/Android.ir2.mk delete mode 100644 src/freedreno/Android.ir3.mk delete mode 100644 src/freedreno/Android.isa.mk delete mode 100644 src/freedreno/Android.mk delete mode 100644 src/freedreno/Android.perfcntrs.mk delete mode 100644 src/freedreno/Android.registers.mk delete mode 100644 src/freedreno/Makefile.sources delete mode 100644 src/gallium/Android.common.mk delete mode 100644 src/gallium/Android.mk delete mode 100644 src/gallium/auxiliary/Android.mk delete mode 100644 src/gallium/auxiliary/Makefile.sources delete mode 100644 src/gallium/auxiliary/pipe-loader/Android.mk delete mode 100644 src/gallium/auxiliary/pipe-loader/Makefile.sources delete mode 100644 src/gallium/drivers/etnaviv/Android.mk delete mode 100644 src/gallium/drivers/etnaviv/Makefile.sources delete mode 100644 src/gallium/drivers/freedreno/Android.mk delete mode 100644 src/gallium/drivers/freedreno/Makefile.sources delete mode 100644 src/gallium/drivers/i915/Android.mk delete mode 100644 src/gallium/drivers/i915/Makefile.sources delete mode 100644 src/gallium/drivers/iris/Android.mk delete mode 100644 src/gallium/drivers/iris/Makefile.sources delete mode 100644 src/gallium/drivers/kmsro/Android.mk delete mode 100644 src/gallium/drivers/kmsro/Makefile.sources delete mode 100644 src/gallium/drivers/lima/Android.mk delete mode 100644 src/gallium/drivers/llvmpipe/Makefile.sources delete mode 100644 src/gallium/drivers/nouveau/Android.mk delete mode 100644 src/gallium/drivers/nouveau/Makefile.sources delete mode 100644 src/gallium/drivers/panfrost/Android.mk delete mode 100644 src/gallium/drivers/panfrost/Makefile.sources delete mode 100644 src/gallium/drivers/r300/Android.mk delete mode 100644 src/gallium/drivers/r300/Makefile.sources delete mode 100644 src/gallium/drivers/r600/Android.mk delete mode 100644 src/gallium/drivers/r600/Makefile.sources delete mode 100644 src/gallium/drivers/radeonsi/Android.mk delete mode 100644 src/gallium/drivers/radeonsi/Makefile.sources delete mode 100644 src/gallium/drivers/softpipe/Android.mk delete mode 100644 src/gallium/drivers/softpipe/Makefile.sources delete mode 100644 src/gallium/drivers/svga/Android.mk delete mode 100644 src/gallium/drivers/svga/Makefile.sources delete mode 100644 src/gallium/drivers/tegra/Makefile.sources delete mode 100644 src/gallium/drivers/v3d/Makefile.sources delete mode 100644 src/gallium/drivers/vc4/Android.mk delete mode 100644 src/gallium/drivers/vc4/Makefile.sources delete mode 100644 src/gallium/drivers/virgl/Android.mk delete mode 100644 src/gallium/drivers/virgl/Makefile.sources delete mode 100644 src/gallium/frontends/clover/Makefile.sources delete mode 100644 src/gallium/frontends/dri/Android.mk delete mode 100644 src/gallium/frontends/dri/Makefile.sources delete mode 100644 src/gallium/frontends/glx/xlib/Makefile.sources delete mode 100644 src/gallium/frontends/nine/Makefile.sources delete mode 100644 src/gallium/frontends/omx/Makefile.sources delete mode 100644 src/gallium/frontends/omx/bellagio/Makefile.sources delete mode 100644 src/gallium/frontends/omx/tizonia/Makefile.sources delete mode 100644 src/gallium/frontends/osmesa/Makefile.sources delete mode 100644 src/gallium/frontends/va/Makefile.sources delete mode 100644 src/gallium/frontends/vdpau/Makefile.sources delete mode 100644 src/gallium/frontends/wgl/Makefile.sources delete mode 100644 src/gallium/frontends/xa/Makefile.sources delete mode 100644 src/gallium/frontends/xvmc/Makefile.sources delete mode 100644 src/gallium/targets/dri/Android.mk delete mode 100644 src/gallium/winsys/amdgpu/drm/Android.mk delete mode 100644 src/gallium/winsys/amdgpu/drm/Makefile.sources delete mode 100644 src/gallium/winsys/etnaviv/drm/Android.mk delete mode 100644 src/gallium/winsys/etnaviv/drm/Makefile.sources delete mode 100644 src/gallium/winsys/freedreno/drm/Android.mk delete mode 100644 src/gallium/winsys/freedreno/drm/Makefile.sources delete mode 100644 src/gallium/winsys/i915/drm/Android.mk delete mode 100644 src/gallium/winsys/i915/drm/Makefile.sources delete mode 100644 src/gallium/winsys/iris/drm/Android.mk delete mode 100644 src/gallium/winsys/iris/drm/Makefile.sources delete mode 100644 src/gallium/winsys/kmsro/drm/Android.mk delete mode 100644 src/gallium/winsys/kmsro/drm/Makefile.sources delete mode 100644 src/gallium/winsys/lima/drm/Android.mk delete mode 100644 src/gallium/winsys/nouveau/drm/Android.mk delete mode 100644 src/gallium/winsys/nouveau/drm/Makefile.sources delete mode 100644 src/gallium/winsys/panfrost/drm/Android.mk delete mode 100644 src/gallium/winsys/panfrost/drm/Makefile.sources delete mode 100644 src/gallium/winsys/radeon/drm/Android.mk delete mode 100644 src/gallium/winsys/radeon/drm/Makefile.sources delete mode 100644 src/gallium/winsys/svga/drm/Android.mk delete mode 100644 src/gallium/winsys/svga/drm/Makefile.sources delete mode 100644 src/gallium/winsys/sw/dri/Android.mk delete mode 100644 src/gallium/winsys/sw/dri/Makefile.sources delete mode 100644 src/gallium/winsys/sw/kms-dri/Android.mk delete mode 100644 src/gallium/winsys/sw/kms-dri/Makefile.sources delete mode 100644 src/gallium/winsys/sw/null/Makefile.sources delete mode 100644 src/gallium/winsys/sw/wrapper/Makefile.sources delete mode 100644 src/gallium/winsys/sw/xlib/Makefile.sources delete mode 100644 src/gallium/winsys/tegra/drm/Makefile.sources delete mode 100644 src/gallium/winsys/v3d/drm/Android.mk delete mode 100644 src/gallium/winsys/v3d/drm/Makefile.sources delete mode 100644 src/gallium/winsys/vc4/drm/Android.mk delete mode 100644 src/gallium/winsys/vc4/drm/Makefile.sources delete mode 100644 src/gallium/winsys/virgl/common/Android.mk delete mode 100644 src/gallium/winsys/virgl/common/Makefile.sources delete mode 100644 src/gallium/winsys/virgl/drm/Android.mk delete mode 100644 src/gallium/winsys/virgl/drm/Makefile.sources delete mode 100644 src/gallium/winsys/virgl/vtest/Android.mk delete mode 100644 src/gallium/winsys/virgl/vtest/Makefile.sources delete mode 100644 src/gbm/Android.mk delete mode 100644 src/gbm/Makefile.sources delete mode 100644 src/intel/Android.blorp.mk delete mode 100644 src/intel/Android.common.mk delete mode 100644 src/intel/Android.compiler.mk delete mode 100644 src/intel/Android.dev.mk delete mode 100644 src/intel/Android.genxml.mk delete mode 100644 src/intel/Android.isl.mk delete mode 100644 src/intel/Android.mk delete mode 100644 src/intel/Android.perf.mk delete mode 100644 src/intel/Android.vulkan.mk delete mode 100644 src/intel/Makefile.sources delete mode 100644 src/loader/Android.mk delete mode 100644 src/loader/Makefile.sources delete mode 100644 src/mapi/Android.mk delete mode 100644 src/mapi/Makefile.sources delete mode 100644 src/mesa/Android.gen.mk delete mode 100644 src/mesa/Android.libmesa_dricore.mk delete mode 100644 src/mesa/Android.libmesa_git_sha1.mk delete mode 100644 src/mesa/Android.libmesa_glsl_utils.mk delete mode 100644 src/mesa/Android.libmesa_sse41.mk delete mode 100644 src/mesa/Android.libmesa_st_mesa.mk delete mode 100644 src/mesa/Android.mk delete mode 100644 src/mesa/Makefile.sources delete mode 100644 src/mesa/drivers/dri/Android.mk delete mode 100644 src/mesa/drivers/dri/common/Android.mk delete mode 100644 src/mesa/drivers/dri/common/Makefile.sources delete mode 100644 src/mesa/drivers/dri/i915/Android.mk delete mode 100644 src/mesa/drivers/dri/i915/Makefile.sources delete mode 100644 src/mesa/drivers/dri/i965/Android.mk delete mode 100644 src/mesa/drivers/dri/i965/Makefile.sources delete mode 100644 src/mesa/drivers/dri/nouveau/Makefile.sources delete mode 100644 src/mesa/drivers/dri/r200/Makefile.sources delete mode 100644 src/mesa/drivers/dri/radeon/Makefile.sources delete mode 100644 src/mesa/program/Android.mk delete mode 100644 src/panfrost/Android.bifrost.mk delete mode 100644 src/panfrost/Android.lib.mk delete mode 100644 src/panfrost/Android.midgard.mk delete mode 100644 src/panfrost/Android.mk delete mode 100644 src/panfrost/Android.shared.mk delete mode 100644 src/panfrost/Android.util.mk delete mode 100644 src/panfrost/Makefile.sources delete mode 100644 src/util/Android.mk delete mode 100644 src/util/Makefile.sources delete mode 100644 src/vulkan/Android.mk delete mode 100644 src/vulkan/Makefile.sources diff --git a/Android.common.mk b/Android.common.mk deleted file mode 100644 index 124df640899..00000000000 --- a/Android.common.mk +++ /dev/null @@ -1,136 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2010-2011 Chia-I Wu -# Copyright (C) 2010-2011 LunarG Inc. -# -# 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. - -ifeq ($(LOCAL_IS_HOST_MODULE),true) -LOCAL_CFLAGS += -D_GNU_SOURCE -endif - -LOCAL_C_INCLUDES += \ - $(MESA_TOP)/src \ - $(MESA_TOP)/include - -MESA_VERSION := $(shell cat $(MESA_TOP)/VERSION) -LOCAL_CFLAGS += \ - -Wno-error \ - -Werror=incompatible-pointer-types \ - -Wno-unused-parameter \ - -Wno-pointer-arith \ - -Wno-missing-field-initializers \ - -Wno-initializer-overrides \ - -Wno-mismatched-tags \ - -DPACKAGE_VERSION=\"$(MESA_VERSION)\" \ - -DPACKAGE_BUGREPORT=\"https://gitlab.freedesktop.org/mesa/mesa/-/issues\" - -# XXX: The following __STDC_*_MACROS defines should not be needed. -# It's likely due to a bug elsewhere, but let's temporarily add them -# here to fix the radeonsi build. -LOCAL_CFLAGS += \ - -DANDROID_API_LEVEL=$(PLATFORM_SDK_VERSION) \ - -DENABLE_SHADER_CACHE \ - -D__STDC_CONSTANT_MACROS \ - -D__STDC_LIMIT_MACROS \ - -DHAVE___BUILTIN_EXPECT \ - -DHAVE___BUILTIN_FFS \ - -DHAVE___BUILTIN_FFSLL \ - -DHAVE_DLFCN_H \ - -DHAVE_FUNC_ATTRIBUTE_FLATTEN \ - -DHAVE_FUNC_ATTRIBUTE_UNUSED \ - -DHAVE_FUNC_ATTRIBUTE_FORMAT \ - -DHAVE_FUNC_ATTRIBUTE_PACKED \ - -DHAVE_FUNC_ATTRIBUTE_ALIAS \ - -DHAVE_FUNC_ATTRIBUTE_NORETURN \ - -DHAVE_FUNC_ATTRIBUTE_RETURNS_NONNULL \ - -DHAVE_FUNC_ATTRIBUTE_WARN_UNUSED_RESULT \ - -DHAVE___BUILTIN_CTZ \ - -DHAVE___BUILTIN_POPCOUNT \ - -DHAVE___BUILTIN_POPCOUNTLL \ - -DHAVE___BUILTIN_CLZ \ - -DHAVE___BUILTIN_CLZLL \ - -DHAVE___BUILTIN_UNREACHABLE \ - -DHAVE_PTHREAD=1 \ - -DHAVE_DLADDR \ - -DHAVE_DL_ITERATE_PHDR \ - -DHAVE_LINUX_FUTEX_H \ - -DHAVE_ENDIAN_H \ - -DHAVE_ZLIB \ - -DHAVE_COMPRESSION \ - -DMAJOR_IN_SYSMACROS \ - -DVK_USE_PLATFORM_ANDROID_KHR \ - -fvisibility=hidden \ - -fno-math-errno \ - -fno-trapping-math \ - -Wno-sign-compare - -LOCAL_CPPFLAGS += \ - -D__STDC_CONSTANT_MACROS \ - -D__STDC_FORMAT_MACROS \ - -D__STDC_LIMIT_MACROS \ - -Wno-error=non-virtual-dtor \ - -Wno-non-virtual-dtor - -# mesa requires at least c99 compiler -LOCAL_CONLYFLAGS += \ - -std=c99 - -# c11 timespec_get is part of bionic as well -# https://android-review.googlesource.com/c/718518 -# This means releases from P and earlier won't need this -ifeq ($(filter 5 6 7 8 9, $(MESA_ANDROID_MAJOR_VERSION)),) -LOCAL_CFLAGS += -DHAVE_TIMESPEC_GET -endif - -# Android's libc began supporting shm in Oreo -ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo true),true) -LOCAL_CFLAGS += -DHAVE_SYS_SHM_H -endif - -ifeq ($(TARGET_ARCH),x86) -LOCAL_CFLAGS += \ - -DUSE_X86_ASM -endif -ifeq ($(ARCH_ARM_HAVE_NEON),true) -LOCAL_CFLAGS_arm += -DUSE_ARM_ASM -endif -LOCAL_CFLAGS_arm64 += -DUSE_AARCH64_ASM - -ifneq ($(LOCAL_IS_HOST_MODULE),true) -LOCAL_CFLAGS += -DHAVE_LIBDRM -LOCAL_SHARED_LIBRARIES += libdrm -endif - -LOCAL_CFLAGS_32 += -DDEFAULT_BACKENDS_PATH=\"/vendor/lib/gbm\" -LOCAL_CFLAGS_64 += -DDEFAULT_BACKENDS_PATH=\"/vendor/lib64/gbm\" - -LOCAL_CFLAGS_32 += -DDEFAULT_DRIVER_DIR=\"/vendor/lib/$(MESA_DRI_MODULE_REL_PATH)\" -LOCAL_CFLAGS_64 += -DDEFAULT_DRIVER_DIR=\"/vendor/lib64/$(MESA_DRI_MODULE_REL_PATH)\" -LOCAL_PROPRIETARY_MODULE := true - -# uncomment to keep the debug symbols -#LOCAL_STRIP_MODULE := false - -ifeq ($(strip $(LOCAL_MODULE_TAGS)),) -LOCAL_MODULE_TAGS := optional -endif - -# Quiet down the build system and remove any .h files from the sources -LOCAL_SRC_FILES := $(patsubst %.h, , $(LOCAL_SRC_FILES)) diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 3b5d029f804..00000000000 --- a/Android.mk +++ /dev/null @@ -1,132 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2010-2011 Chia-I Wu -# Copyright (C) 2010-2011 LunarG Inc. -# -# 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. - -ifneq ($(filter true, $(BOARD_MESA3D_USES_MESON_BUILD)),) - -include $(call my-dir)/android/Android.mk - -else - -# BOARD_GPU_DRIVERS should be defined. The valid values are -# -# classic drivers: i915 i965 -# gallium drivers: swrast freedreno i915g nouveau kmsro r300g r600g radeonsi vc4 virgl vmwgfx etnaviv iris lima panfrost -# -# The main target is libGLES_mesa. For each classic driver enabled, a DRI -# module will also be built. DRI modules will be loaded by libGLES_mesa. - -MESA_TOP := $(call my-dir) - -MESA_ANDROID_MAJOR_VERSION := $(word 1, $(subst ., , $(PLATFORM_VERSION))) -ifneq ($(filter 2 4, $(MESA_ANDROID_MAJOR_VERSION)),) -$(error "Android 4.4 and earlier not supported") -endif - -MESA_DRI_MODULE_REL_PATH := dri -MESA_DRI_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/$(MESA_DRI_MODULE_REL_PATH) -MESA_DRI_MODULE_UNSTRIPPED_PATH := $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/$(MESA_DRI_MODULE_REL_PATH) -MESA_DRI_LDFLAGS := -Wl,--build-id=sha1 - -MESA_COMMON_MK := $(MESA_TOP)/Android.common.mk -MESA_PYTHON2 := python -MESA_PYTHON3 := python3 -ifeq ($(filter 5 6 7 8 9 10, $(MESA_ANDROID_MAJOR_VERSION)),) -MESA_LEX := M4=$(M4) $(LEX) -else -MESA_LEX := $(LEX) -endif - -# Lists to convert driver names to boolean variables -# in form of . -classic_drivers := i915.HAVE_I915_DRI i965.HAVE_I965_DRI -gallium_drivers := \ - swrast.HAVE_GALLIUM_SOFTPIPE \ - freedreno.HAVE_GALLIUM_FREEDRENO \ - i915g.HAVE_GALLIUM_I915 \ - nouveau.HAVE_GALLIUM_NOUVEAU \ - kmsro.HAVE_GALLIUM_KMSRO \ - r300g.HAVE_GALLIUM_R300 \ - r600g.HAVE_GALLIUM_R600 \ - radeonsi.HAVE_GALLIUM_RADEONSI \ - vmwgfx.HAVE_GALLIUM_VMWGFX \ - vc4.HAVE_GALLIUM_VC4 \ - virgl.HAVE_GALLIUM_VIRGL \ - etnaviv.HAVE_GALLIUM_ETNAVIV \ - iris.HAVE_GALLIUM_IRIS \ - lima.HAVE_GALLIUM_LIMA \ - panfrost.HAVE_GALLIUM_PANFROST - -ifeq ($(BOARD_GPU_DRIVERS),all) -MESA_BUILD_CLASSIC := $(filter HAVE_%, $(subst ., , $(classic_drivers))) -MESA_BUILD_GALLIUM := $(filter HAVE_%, $(subst ., , $(gallium_drivers))) -else -# Warn if we have any invalid driver names -$(foreach d, $(BOARD_GPU_DRIVERS), \ - $(if $(findstring $(d).,$(classic_drivers) $(gallium_drivers)), \ - , \ - $(warning invalid GPU driver: $(d)) \ - ) \ -) -MESA_BUILD_CLASSIC := $(strip $(foreach d, $(BOARD_GPU_DRIVERS), $(patsubst $(d).%,%, $(filter $(d).%, $(classic_drivers))))) -MESA_BUILD_GALLIUM := $(strip $(foreach d, $(BOARD_GPU_DRIVERS), $(patsubst $(d).%,%, $(filter $(d).%, $(gallium_drivers))))) -endif -ifeq ($(filter x86%,$(TARGET_ARCH)),) - MESA_BUILD_CLASSIC := -endif - -$(foreach d, $(MESA_BUILD_CLASSIC) $(MESA_BUILD_GALLIUM), $(eval $(d) := true)) - -ifneq ($(filter true, $(HAVE_GALLIUM_RADEONSI)),) -MESA_ENABLE_LLVM := true -endif - -define mesa-build-with-llvm - $(if $(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7), \ - $(warning Unsupported LLVM version in Android $(MESA_ANDROID_MAJOR_VERSION)),) \ - $(eval LOCAL_CFLAGS += -DLLVM_AVAILABLE -DDRAW_LLVM_AVAILABLE -DLLVM_IS_SHARED=1 -DMESA_LLVM_VERSION_STRING=\"3.9\") \ - $(eval LOCAL_SHARED_LIBRARIES += libLLVM) -endef - -# add subdirectories -SUBDIRS := \ - src/etnaviv \ - src/freedreno \ - src/gbm \ - src/loader \ - src/mapi \ - src/compiler \ - src/mesa \ - src/util \ - src/egl \ - src/amd \ - src/broadcom \ - src/intel \ - src/mesa/drivers/dri \ - src/vulkan \ - src/panfrost \ - -INC_DIRS := $(call all-named-subdir-makefiles,$(SUBDIRS)) -INC_DIRS += $(call all-named-subdir-makefiles,src/gallium) -include $(INC_DIRS) - -endif diff --git a/CleanSpec.mk b/CleanSpec.mk deleted file mode 100644 index e5030ceefb0..00000000000 --- a/CleanSpec.mk +++ /dev/null @@ -1,16 +0,0 @@ -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libmesa_*_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/i9*5_dri_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libglapi_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libGLES_mesa_intermediates) -$(call add-clean-step, rm -rf $(OUT_DIR)/host/$(HOST_OS)-$(HOST_ARCH)/obj/EXECUTABLES/mesa_*_intermediates) -$(call add-clean-step, rm -rf $(OUT_DIR)/host/$(HOST_OS)-$(HOST_ARCH)/obj/EXECUTABLES/glsl_compiler_intermediates) -$(call add-clean-step, rm -rf $(OUT_DIR)/host/$(HOST_OS)-$(HOST_ARCH)/obj/STATIC_LIBRARIES/libmesa_glsl_utils_intermediates) - -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/STATIC_LIBRARIES/libmesa_*_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/SHARED_LIBRARIES/i9?5_dri_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/SHARED_LIBRARIES/libglapi_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/SHARED_LIBRARIES/libGLES_mesa_intermediates) -$(call add-clean-step, rm -rf $(HOST_OUT)/*/EXECUTABLES/mesa_*_intermediates) -$(call add-clean-step, rm -rf $(HOST_OUT)/*/EXECUTABLES/glsl_compiler_intermediates) -$(call add-clean-step, rm -rf $(HOST_OUT)/*/STATIC_LIBRARIES/libmesa_*_intermediates) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/SHARED_LIBRARIES/*_dri_intermediates) diff --git a/android/Android.mk b/android/Android.mk deleted file mode 100644 index 243da8493af..00000000000 --- a/android/Android.mk +++ /dev/null @@ -1,154 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2021 GlobalLogic Ukraine -# Copyright (C) 2021 Roman Stratiienko (r.stratiienko@gmail.com) -# -# 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. - -ifneq ($(filter true, $(BOARD_MESA3D_USES_MESON_BUILD)),) - -LOCAL_PATH := $(call my-dir) -MESA3D_TOP := $(dir $(LOCAL_PATH)) - -MESA_VK_LIB_SUFFIX_amd := radeon -MESA_VK_LIB_SUFFIX_intel := intel -MESA_VK_LIB_SUFFIX_freedreno := freedreno -MESA_VK_LIB_SUFFIX_broadcom := broadcom -MESA_VK_LIB_SUFFIX_virtio-experimental := virtio -MESA_VK_LIB_SUFFIX_swrast := lvp - -include $(CLEAR_VARS) - -LOCAL_SHARED_LIBRARIES := libc libdl libdrm libm liblog libcutils libz libc++ libnativewindow libsync libhardware -LOCAL_STATIC_LIBRARIES := libexpat libarect libelf -LOCAL_HEADER_LIBRARIES := libnativebase_headers hwvulkan_headers libbacktrace_headers -MESON_GEN_PKGCONFIGS := backtrace cutils expat hardware libdrm:2.4.105 nativewindow sync zlib:1.2.11 libelf - -ifneq ($(filter swr swrast,$(BOARD_MESA3D_GALLIUM_DRIVERS) $(BOARD_MESA3D_VULKAN_DRIVERS)),) -MESON_GEN_LLVM_STUB := true -endif - -ifneq ($(filter zink,$(BOARD_MESA3D_GALLIUM_DRIVERS)),) -LOCAL_SHARED_LIBRARIES += libvulkan -MESON_GEN_PKGCONFIGS += vulkan -endif - -ifneq ($(filter iris,$(BOARD_MESA3D_GALLIUM_DRIVERS)),) -LOCAL_SHARED_LIBRARIES += libdrm_intel -MESON_GEN_PKGCONFIGS += libdrm_intel:2.4.105 -endif - -ifneq ($(filter radeonsi amd,$(BOARD_MESA3D_GALLIUM_DRIVERS) $(BOARD_MESA3D_VULKAN_DRIVERS)),) -MESON_GEN_LLVM_STUB := true -LOCAL_CFLAGS += -DFORCE_BUILD_AMDGPU # instructs LLVM to declare LLVMInitializeAMDGPU* functions -LOCAL_SHARED_LIBRARIES += libdrm_amdgpu -MESON_GEN_PKGCONFIGS += libdrm_amdgpu:2.4.105 -endif - -ifneq ($(filter radeonsi r300 r600,$(BOARD_MESA3D_GALLIUM_DRIVERS)),) -LOCAL_SHARED_LIBRARIES += libdrm_radeon -MESON_GEN_PKGCONFIGS += libdrm_radeon:2.4.105 -endif - -ifneq ($(filter nouveau,$(BOARD_MESA3D_GALLIUM_DRIVERS)),) -LOCAL_SHARED_LIBRARIES += libdrm_nouveau -MESON_GEN_PKGCONFIGS += libdrm_nouveau:2.4.105 -endif - -ifneq ($(MESON_GEN_LLVM_STUB),) -MESON_LLVM_VERSION := 11.0.0 -# Required for swr gallium target -MESON_LLVM_IRBUILDER_PATH := external/llvm-project/llvm/include/llvm/IR/IRBuilder.h -LOCAL_SHARED_LIBRARIES += libLLVM11 -endif - -ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 30; echo $$?), 0) -LOCAL_SHARED_LIBRARIES += \ - android.hardware.graphics.mapper@4.0 \ - libgralloctypes \ - libhidlbase \ - libutils - -MESON_GEN_PKGCONFIGS += android.hardware.graphics.mapper:4.0 -endif - -ifeq ($(TARGET_IS_64_BIT),true) -LOCAL_MULTILIB := 64 -else -LOCAL_MULTILIB := 32 -endif -include $(LOCAL_PATH)/mesa3d_cross.mk - -ifdef TARGET_2ND_ARCH -LOCAL_MULTILIB := 32 -include $(LOCAL_PATH)/mesa3d_cross.mk -endif - -#------------------------------------------------------------------------------- - -define mesa3d-lib -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE := $1 -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_RELATIVE_PATH := $3 -ifdef TARGET_2ND_ARCH -LOCAL_SRC_FILES_$(TARGET_ARCH) := $(call relative_top_path,$(LOCAL_PATH))$($4) -LOCAL_SRC_FILES_$(TARGET_2ND_ARCH) := $(call relative_top_path,$(LOCAL_PATH))$(2ND_$4) -LOCAL_MULTILIB := both -else -LOCAL_SRC_FILES := $(call relative_top_path,$(LOCAL_PATH))$($4) -endif -LOCAL_CHECK_ELF_FILES := false -LOCAL_MODULE_SUFFIX := .so -LOCAL_MODULE_SYMLINKS := $1$2 -include $(BUILD_PREBUILT) -include $(CLEAR_VARS) -endef - -__MY_SHARED_LIBRARIES := $(LOCAL_SHARED_LIBRARIES) -include $(CLEAR_VARS) -LOCAL_SHARED_LIBRARIES := $(__MY_SHARED_LIBRARIES) - -# Module 'libgallium_dri', produces '/vendor/lib{64}/dri/libgallium_dri.so' -# This module also trigger DRI symlinks creation process -$(eval $(call mesa3d-lib,libgallium_dri,.so.0,dri,MESA3D_GALLIUM_DRI_BIN)) -# Module 'libglapi', produces '/vendor/lib{64}/libglapi.so' -$(eval $(call mesa3d-lib,libglapi,.so.0,,MESA3D_LIBGLAPI_BIN)) - -# Module 'libEGL_mesa', produces '/vendor/lib{64}/egl/libEGL_mesa.so' -$(eval $(call mesa3d-lib,libEGL_mesa,.so.1,egl,MESA3D_LIBEGL_BIN)) -# Module 'libGLESv1_CM_mesa', produces '/vendor/lib{64}/egl/libGLESv1_CM_mesa.so' -$(eval $(call mesa3d-lib,libGLESv1_CM_mesa,.so.1,egl,MESA3D_LIBGLESV1_BIN)) -# Module 'libGLESv2_mesa', produces '/vendor/lib{64}/egl/libGLESv2_mesa.so' -$(eval $(call mesa3d-lib,libGLESv2_mesa,.so.2,egl,MESA3D_LIBGLESV2_BIN)) - -# Modules 'vulkan.{driver_name}', produces '/vendor/lib{64}/hw/vulkan.{driver_name}.so' HAL -$(foreach driver,$(BOARD_MESA3D_VULKAN_DRIVERS), \ - $(eval $(call mesa3d-lib,vulkan.$(MESA_VK_LIB_SUFFIX_$(driver)),.so.0,hw,MESA3D_VULKAN_$(driver)_BIN))) - -ifneq ($(filter true, $(BOARD_MESA3D_BUILD_LIBGBM)),) -LOCAL_EXPORT_C_INCLUDE_DIRS := $(MESA3D_TOP)/src/gbm/main - -# Modules 'libgbm', produces '/vendor/lib{64}/libgbm.so' -$(eval $(call mesa3d-lib,libgbm,.so.1,,MESA3D_LIBGBM_BIN)) -endif - -#------------------------------------------------------------------------------- - -endif diff --git a/docs/install.rst b/docs/install.rst index cd7764c08a1..69f1dea2bca 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -104,15 +104,7 @@ information 3. Building with AOSP (Android) ------------------------------- -Currently one can build Mesa for Android as part of the AOSP project, -yet your experience might vary. - -In order to achieve that one should update their local manifest to point -to the upstream repo, set the appropriate BOARD_GPU_DRIVERS and build -the libGLES_mesa library. - -FINISHME: Improve on the instructions add references to Rob H -repos/Jenkins, Android-x86 and/or other resources. + 4. Library Information ---------------------- diff --git a/src/amd/Android.addrlib.mk b/src/amd/Android.addrlib.mk deleted file mode 100644 index 4e13ae1fda3..00000000000 --- a/src/amd/Android.addrlib.mk +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright © 2016 Red Hat. -# Copyright © 2016 Mauro Rossi -# -# 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 (including the next -# paragraph) 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. - -# --------------------------------------- -# Build libmesa_amdgpu_addrlib -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_amdgpu_addrlib - -LOCAL_SRC_FILES := $(ADDRLIB_FILES) - -LOCAL_CPPFLAGS += -DLITTLEENDIAN_CPU - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src \ - $(MESA_TOP)/src/amd/common \ - $(MESA_TOP)/src/amd/addrlib/inc \ - $(MESA_TOP)/src/amd/addrlib/src \ - $(MESA_TOP)/src/amd/addrlib/src/core \ - $(MESA_TOP)/src/amd/addrlib/src/chip/gfx9 \ - $(MESA_TOP)/src/amd/addrlib/src/chip/gfx10 \ - $(MESA_TOP)/src/amd/addrlib/src/chip/r800 - -LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/addrlib/core \ - $(LOCAL_PATH)/addrlib/inc/chip/r800 \ - $(LOCAL_PATH)/addrlib/r800/chip - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk deleted file mode 100644 index 83c44d7225b..00000000000 --- a/src/amd/Android.common.mk +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright © 2016 Red Hat. -# Copyright © 2016 Mauro Rossi -# -# 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 (including the next -# paragraph) 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. - -ifeq ($(MESA_ENABLE_LLVM),true) - -# --------------------------------------- -# Build libmesa_amd_common -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_amd_common - -LOCAL_SRC_FILES := \ - $(AMD_COMMON_FILES) \ - $(AMD_COMMON_LLVM_FILES) \ - $(AMD_DEBUG_FILES) - -LOCAL_CFLAGS += -DFORCE_BUILD_AMDGPU # instructs LLVM to declare LLVMInitializeAMDGPU* functions - -# generate sources -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -intermediates := $(call local-generated-sources-dir) -LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/, $(AMD_GENERATED_FILES)) - -AMD_JSON_FILES := \ - $(LOCAL_PATH)/registers/gfx6.json \ - $(LOCAL_PATH)/registers/gfx7.json \ - $(LOCAL_PATH)/registers/gfx8.json \ - $(LOCAL_PATH)/registers/gfx81.json \ - $(LOCAL_PATH)/registers/gfx9.json \ - $(LOCAL_PATH)/registers/gfx10.json \ - $(LOCAL_PATH)/registers/gfx103.json \ - $(LOCAL_PATH)/registers/pkt3.json \ - $(LOCAL_PATH)/registers/gfx10-rsrc.json \ - $(LOCAL_PATH)/registers/registers-manually-defined.json - -SID_TABLES := $(LOCAL_PATH)/common/sid_tables.py - -SID_TABLES_INPUTS := \ - $(LOCAL_PATH)/common/sid.h \ - $(AMD_JSON_FILES) - -$(intermediates)/common/sid_tables.h: $(SID_TABLES) $(SID_TABLES_INPUTS) - @mkdir -p $(dir $@) - @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(MESA_PYTHON2) $(SID_TABLES) $(SID_TABLES_INPUTS) > $@ || ($(RM) $@; false) - -AMDGFXREGS := $(LOCAL_PATH)/registers/makeregheader.py - -AMDGFXREGS_INPUTS := \ - $(AMD_JSON_FILES) - -$(intermediates)/common/amdgfxregs.h: $(AMDGFXREGS) $(AMDGFXREGS_INPUTS) - @mkdir -p $(dir $@) - @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(MESA_PYTHON2) $(AMDGFXREGS) $(AMDGFXREGS_INPUTS) --sort address --guard AMDGFXREGS_H > $@ || ($(RM) $@; false) - -GEN10_FORMAT_TABLE_INPUTS := \ - $(MESA_TOP)/src/util/format/u_format.csv \ - $(MESA_TOP)/src/amd/registers/gfx10-rsrc.json - -GEN10_FORMAT_TABLE_DEP := \ - $(MESA_TOP)/src/amd/registers/regdb.py - -GEN10_FORMAT_TABLE := $(LOCAL_PATH)/common/gfx10_format_table.py - -$(intermediates)/common/gfx10_format_table.c: $(GEN10_FORMAT_TABLE) $(GEN10_FORMAT_TABLE_INPUTS) $(GEN10_FORMAT_TABLE_DEP) - @mkdir -p $(dir $@) - @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(MESA_PYTHON2) $(GEN10_FORMAT_TABLE) $(GEN10_FORMAT_TABLE_INPUTS) > $@ || ($(RM) $@; false) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/include \ - $(MESA_TOP)/src \ - $(MESA_TOP)/src/amd/common \ - $(MESA_TOP)/src/amd/llvm \ - $(MESA_TOP)/src/compiler \ - $(MESA_TOP)/src/compiler/nir \ - $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \ - $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src/gallium/auxiliary \ - $(MESA_TOP)/src/mesa \ - $(MESA_TOP)/src/util \ - $(intermediates)/common - -LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(LOCAL_PATH)/common \ - $(LOCAL_PATH)/llvm \ - $(intermediates)/common - -LOCAL_SHARED_LIBRARIES := \ - libdrm_amdgpu - -LOCAL_STATIC_LIBRARIES := \ - libmesa_nir - -LOCAL_WHOLE_STATIC_LIBRARIES := \ - libelf - -$(call mesa-build-with-llvm) - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -endif # MESA_ENABLE_LLVM == true diff --git a/src/amd/Android.compiler.mk b/src/amd/Android.compiler.mk deleted file mode 100644 index 7d4a1ea4381..00000000000 --- a/src/amd/Android.compiler.mk +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright © 2018 Valve Corporation -# Copyright © 2019 Mauro Rossi issor.oruam@gmail.com - -# 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 (including the next -# paragraph) 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. - -LOCAL_PATH := $(call my-dir) - -include $(LOCAL_PATH)/Makefile.sources - -# --------------------------------------- -# Build libmesa_aco -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_aco - -LOCAL_SRC_FILES := \ - $(ACO_FILES) - -LOCAL_CFLAGS += -DFORCE_BUILD_AMDGPU # instructs LLVM to declare LLVMInitializeAMDGPU* functions - -LOCAL_CPPFLAGS += -Wall -std=c++14 - -# generate sources -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -intermediates := $(call local-generated-sources-dir) -LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, $(ACO_GENERATED_FILES)) - -ACO_OPCODES_H_SCRIPT := $(MESA_TOP)/src/amd/compiler/aco_opcodes_h.py -ACO_OPCODES_CPP_SCRIPT := $(MESA_TOP)/src/amd/compiler/aco_opcodes_cpp.py -ACO_BUILDER_H_SCRIPT := $(MESA_TOP)/src/amd/compiler/aco_builder_h.py - -ACO_DEPS := $(MESA_TOP)/src/amd/compiler/aco_opcodes.py - -$(intermediates)/compiler/aco_opcodes.h: $(ACO_OPCODES_H_SCRIPT) $(ACO_DEPS) - @mkdir -p $(dir $@) - @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(MESA_PYTHON2) $(ACO_OPCODES_H_SCRIPT) > $@ || ($(RM) $@; false) - -$(intermediates)/compiler/aco_opcodes.cpp: $(ACO_OPCODES_CPP_SCRIPT) $(ACO_DEPS) - @mkdir -p $(dir $@) - @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(MESA_PYTHON2) $(ACO_OPCODES_CPP_SCRIPT) > $@ || ($(RM) $@; false) - -$(intermediates)/compiler/aco_builder.h: $(ACO_BUILDER_H_SCRIPT) $(ACO_DEPS) - @mkdir -p $(dir $@) - @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(MESA_PYTHON2) $(ACO_BUILDER_H_SCRIPT) > $@ || ($(RM) $@; false) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/amd \ - $(MESA_TOP)/src/amd/common \ - $(MESA_TOP)/src/amd/compiler \ - $(MESA_TOP)/src/compiler/nir \ - $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/mesa \ - $(intermediates)/compiler - -LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(MESA_TOP)/src/amd/compiler \ - $(intermediates)/compiler - -LOCAL_SHARED_LIBRARIES := \ - libdrm_amdgpu - -LOCAL_STATIC_LIBRARIES := \ - libmesa_amd_common \ - libmesa_nir - -$(call mesa-build-with-llvm) - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/amd/Android.mk b/src/amd/Android.mk deleted file mode 100644 index c9dbeafde10..00000000000 --- a/src/amd/Android.mk +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright © 2016 Red Hat. -# Copyright © 2016 Mauro Rossi -# -# 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 (including the next -# paragraph) 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. - -LOCAL_PATH := $(call my-dir) - -# Import variables -include $(LOCAL_PATH)/Makefile.sources - -include $(LOCAL_PATH)/Android.addrlib.mk -include $(LOCAL_PATH)/Android.common.mk -ifneq ($(filter radeonsi,$(BOARD_GPU_DRIVERS)),) -include $(LOCAL_PATH)/Android.compiler.mk -include $(LOCAL_PATH)/vulkan/Android.mk -endif diff --git a/src/amd/Makefile.sources b/src/amd/Makefile.sources deleted file mode 100644 index 701b131eb5b..00000000000 --- a/src/amd/Makefile.sources +++ /dev/null @@ -1,129 +0,0 @@ -COMMON_HEADER_FILES = \ - common/sid.h \ - common/amd_family.h \ - common/amd_kernel_code_t.h - -ADDRLIB_FILES = \ - addrlib/inc/addrinterface.h \ - addrlib/inc/addrtypes.h \ - addrlib/src/addrinterface.cpp \ - addrlib/src/amdgpu_asic_addr.h \ - addrlib/src/core/addrcommon.h \ - addrlib/src/core/addrelemlib.cpp \ - addrlib/src/core/addrelemlib.h \ - addrlib/src/core/addrlib.cpp \ - addrlib/src/core/addrlib.h \ - addrlib/src/core/addrlib1.cpp \ - addrlib/src/core/addrlib1.h \ - addrlib/src/core/addrlib2.cpp \ - addrlib/src/core/addrlib2.h \ - addrlib/src/core/addrobject.cpp \ - addrlib/src/core/addrobject.h \ - addrlib/src/core/coord.cpp \ - addrlib/src/core/coord.h \ - addrlib/src/gfx9/gfx9addrlib.cpp \ - addrlib/src/gfx9/gfx9addrlib.h \ - addrlib/src/gfx10/gfx10addrlib.cpp \ - addrlib/src/gfx10/gfx10addrlib.h \ - addrlib/src/gfx10/gfx10SwizzlePattern.h \ - addrlib/src/chip/gfx10/gfx10_gb_reg.h \ - addrlib/src/chip/gfx9/gfx9_gb_reg.h \ - addrlib/src/chip/r800/si_gb_reg.h \ - addrlib/src/r800/ciaddrlib.cpp \ - addrlib/src/r800/ciaddrlib.h \ - addrlib/src/r800/egbaddrlib.cpp \ - addrlib/src/r800/egbaddrlib.h \ - addrlib/src/r800/siaddrlib.cpp \ - addrlib/src/r800/siaddrlib.h - -AMD_COMMON_FILES = \ - common/ac_binary.c \ - common/ac_binary.h \ - common/ac_exp_param.h \ - common/ac_gpu_info.c \ - common/ac_gpu_info.h \ - common/ac_msgpack.c \ - common/ac_msgpack.h \ - common/ac_nir.c \ - common/ac_nir.h \ - common/ac_nir_lower_esgs_io_to_mem.c \ - common/ac_nir_lower_tess_io_to_mem.c \ - common/ac_nir_lower_ngg.c \ - common/ac_perfcounter.c \ - common/ac_perfcounter.h \ - common/ac_surface.c \ - common/ac_surface.h \ - common/ac_rgp.c \ - common/ac_rgp.h \ - common/ac_rgp_elf_object_pack.c \ - common/ac_rtld.c \ - common/ac_rtld.h \ - common/ac_shader_args.c \ - common/ac_shader_args.h \ - common/ac_shader_util.c \ - common/ac_shader_util.h \ - common/ac_shadowed_regs.c \ - common/ac_shadowed_regs.h \ - common/ac_sqtt.c \ - common/ac_sqtt.h \ - common/amd_family.c - -AMD_COMMON_LLVM_FILES = \ - llvm/ac_llvm_build.c \ - llvm/ac_llvm_build.h \ - llvm/ac_llvm_cull.c \ - llvm/ac_llvm_cull.h \ - llvm/ac_llvm_helper.cpp \ - llvm/ac_llvm_util.c \ - llvm/ac_llvm_util.h \ - llvm/ac_shader_abi.h \ - llvm/ac_nir_to_llvm.c \ - llvm/ac_nir_to_llvm.h - -AMD_DEBUG_FILES = \ - common/ac_debug.c \ - common/ac_debug.h - -AMD_GENERATED_FILES = \ - common/amdgfxregs.h \ - common/gfx10_format_table.c \ - common/sid_tables.h - -ACO_FILES = \ - compiler/aco_dead_code_analysis.cpp \ - compiler/aco_dominance.cpp \ - compiler/aco_instruction_selection.cpp \ - compiler/aco_instruction_selection.h \ - compiler/aco_instruction_selection_setup.cpp \ - compiler/aco_interface.cpp \ - compiler/aco_interface.h \ - compiler/aco_ir.cpp \ - compiler/aco_ir.h \ - compiler/aco_assembler.cpp \ - compiler/aco_form_hard_clauses.cpp \ - compiler/aco_insert_exec_mask.cpp \ - compiler/aco_insert_NOPs.cpp \ - compiler/aco_insert_waitcnt.cpp \ - compiler/aco_reduce_assign.cpp \ - compiler/aco_register_allocation.cpp \ - compiler/aco_live_var_analysis.cpp \ - compiler/aco_lower_phis.cpp \ - compiler/aco_lower_to_cssa.cpp \ - compiler/aco_lower_to_hw_instr.cpp \ - compiler/aco_optimizer.cpp \ - compiler/aco_optimizer_postRA.cpp \ - compiler/aco_opt_value_numbering.cpp \ - compiler/aco_print_asm.cpp \ - compiler/aco_print_ir.cpp \ - compiler/aco_reindex_ssa.cpp \ - compiler/aco_scheduler.cpp \ - compiler/aco_ssa_elimination.cpp \ - compiler/aco_spill.cpp \ - compiler/aco_statistics.cpp \ - compiler/aco_util.h \ - compiler/aco_validate.cpp - -ACO_GENERATED_FILES = \ - compiler/aco_builder.h \ - compiler/aco_opcodes.cpp \ - compiler/aco_opcodes.h diff --git a/src/amd/vulkan/Android.mk b/src/amd/vulkan/Android.mk deleted file mode 100644 index f0eb5119a85..00000000000 --- a/src/amd/vulkan/Android.mk +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright © 2018 Advanced Micro Devices, Inc. -# Copyright © 2018 Mauro Rossi issor.oruam@gmail.com - -# 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 (including the next -# paragraph) 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. - -LOCAL_PATH := $(call my-dir) - -# get VULKAN_FILES and VULKAN_GENERATED_FILES -include $(LOCAL_PATH)/Makefile.sources - -# The gallium includes are for the util/u_math.h include from main/macros.h - -RADV_COMMON_INCLUDES := \ - $(MESA_TOP)/include \ - $(MESA_TOP)/src/ \ - $(MESA_TOP)/src/amd/vulkan \ - $(MESA_TOP)/src/vulkan/wsi \ - $(MESA_TOP)/src/vulkan/util \ - $(MESA_TOP)/src/amd \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/mesa \ - $(MESA_TOP)/src/mesa/drivers/dri/common \ - $(MESA_TOP)/src/gallium/auxiliary \ - $(MESA_TOP)/src/gallium/include \ - frameworks/native/vulkan/include - -RADV_SHARED_LIBRARIES := libdrm_amdgpu - -ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),) -RADV_SHARED_LIBRARIES += libnativewindow -endif - -# -# libmesa_radv_common -# - -include $(CLEAR_VARS) -LOCAL_MODULE := libmesa_radv_common -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -intermediates := $(call local-generated-sources-dir) - -LOCAL_SRC_FILES := \ - $(VULKAN_FILES) - -LOCAL_CFLAGS += -DFORCE_BUILD_AMDGPU # instructs LLVM to declare LLVMInitializeAMDGPU* functions -LOCAL_CFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR - -$(call mesa-build-with-llvm) - -LOCAL_C_INCLUDES := $(RADV_COMMON_INCLUDES) - -LOCAL_STATIC_LIBRARIES := \ - libmesa_aco \ - libmesa_amd_common \ - libmesa_nir \ - libmesa_util \ - libmesa_vulkan_util \ - libmesa_git_sha1 - -LOCAL_GENERATED_SOURCES += $(intermediates)/radv_entrypoints.c -LOCAL_GENERATED_SOURCES += $(intermediates)/radv_entrypoints.h - -RADV_ENTRYPOINTS_SCRIPT := $(MESA_TOP)/src/vulkan/util/vk_entrypoints_gen.py - -vulkan_api_xml = $(MESA_TOP)/src/vulkan/registry/vk.xml - -$(intermediates)/radv_entrypoints.c: $(RADV_ENTRYPOINTS_SCRIPT) \ - $(vulkan_api_xml) - @mkdir -p $(dir $@) - $(MESA_PYTHON2) $(RADV_ENTRYPOINTS_SCRIPT) \ - --xml $(vulkan_api_xml) \ - --proto --weak \ - --out-c $@ \ - --out-h $(addsuffix .h,$(basename $@)) \ - --prefix radv --device-prefix sqtt - -$(intermediates)/radv_entrypoints.h: $(intermediates)/radv_entrypoints.c - -LOCAL_SHARED_LIBRARIES += $(RADV_SHARED_LIBRARIES) - -LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(MESA_TOP)/src/amd/vulkan \ - $(intermediates) - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# -# libvulkan_radeon -# - -include $(CLEAR_VARS) - -LOCAL_MODULE := vulkan.radv -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_PROPRIETARY_MODULE := true -LOCAL_MODULE_RELATIVE_PATH := hw - -LOCAL_LDFLAGS += -Wl,--build-id=sha1 - -LOCAL_SRC_FILES := \ - $(VULKAN_ANDROID_FILES) - -LOCAL_CFLAGS += -DFORCE_BUILD_AMDGPU # instructs LLVM to declare LLVMInitializeAMDGPU* functions -LOCAL_CFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR - -$(call mesa-build-with-llvm) - -LOCAL_C_INCLUDES := $(RADV_COMMON_INCLUDES) - -LOCAL_WHOLE_STATIC_LIBRARIES := \ - libmesa_util \ - libmesa_nir \ - libmesa_glsl \ - libmesa_compiler \ - libmesa_amdgpu_addrlib \ - libmesa_amd_common \ - libmesa_radv_common \ - libmesa_vulkan_util \ - libmesa_aco - -LOCAL_SHARED_LIBRARIES += $(RADV_SHARED_LIBRARIES) libz libsync liblog libcutils - -# If Android version >=8 MESA should static link libexpat else should dynamic link -ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0) -LOCAL_STATIC_LIBRARIES := \ - libexpat -else -LOCAL_SHARED_LIBRARIES += \ - libexpat -endif - -include $(MESA_COMMON_MK) -include $(BUILD_SHARED_LIBRARY) diff --git a/src/amd/vulkan/Makefile.sources b/src/amd/vulkan/Makefile.sources deleted file mode 100644 index 2912ce46397..00000000000 --- a/src/amd/vulkan/Makefile.sources +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright © 2016 Red Hat -# -# 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 (including the next -# paragraph) 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. - -RADV_WS_AMDGPU_FILES := \ - winsys/amdgpu/radv_amdgpu_bo.c \ - winsys/amdgpu/radv_amdgpu_bo.h \ - winsys/amdgpu/radv_amdgpu_cs.c \ - winsys/amdgpu/radv_amdgpu_cs.h \ - winsys/amdgpu/radv_amdgpu_surface.c \ - winsys/amdgpu/radv_amdgpu_surface.h \ - winsys/amdgpu/radv_amdgpu_winsys.c \ - winsys/amdgpu/radv_amdgpu_winsys.h \ - winsys/amdgpu/radv_amdgpu_winsys_public.h - -RADV_WS_NULL_FILES := \ - winsys/null/radv_null_bo.c \ - winsys/null/radv_null_bo.h \ - winsys/null/radv_null_cs.c \ - winsys/null/radv_null_cs.h \ - winsys/null/radv_null_winsys.c \ - winsys/null/radv_null_winsys.h \ - winsys/null/radv_null_winsys_public.h - -RADV_LAYER_SQTT_FILES := \ - layers/radv_sqtt_layer.c - -VULKAN_FILES := \ - radv_acceleration_structure.c \ - radv_cmd_buffer.c \ - radv_cs.h \ - radv_debug.c \ - radv_debug.h \ - radv_device.c \ - radv_descriptor_set.c \ - radv_descriptor_set.h \ - radv_formats.c \ - radv_image.c \ - radv_meta.c \ - radv_meta.h \ - radv_meta_blit.c \ - radv_meta_blit2d.c \ - radv_meta_buffer.c \ - radv_meta_bufimage.c \ - radv_meta_clear.c \ - radv_meta_copy.c \ - radv_meta_copy_vrs_htile.c \ - radv_meta_dcc_retile.c \ - radv_meta_decompress.c \ - radv_meta_fast_clear.c \ - radv_meta_fmask_expand.c \ - radv_meta_resolve.c \ - radv_meta_resolve_cs.c \ - radv_meta_resolve_fs.c \ - radv_nir_lower_ycbcr_textures.c \ - radv_nir_to_llvm.c \ - radv_llvm_helper.cpp \ - radv_pass.c \ - radv_pipeline.c \ - radv_pipeline_cache.c \ - radv_private.h \ - radv_radeon_winsys.h \ - radv_shader.c \ - radv_shader_args.c \ - radv_shader_args.h \ - radv_shader_info.c \ - radv_shader.h \ - radv_shader_helper.h \ - radv_sqtt.c \ - radv_query.c \ - radv_util.c \ - radv_wsi.c \ - si_cmd_buffer.c \ - vk_format.h \ - $(RADV_LAYER_SQTT_FILES) \ - $(RADV_WS_AMDGPU_FILES) \ - $(RADV_WS_NULL_FILES) - -VULKAN_ANDROID_FILES := \ - radv_android.c - -VULKAN_WSI_WAYLAND_FILES := \ - radv_wsi_wayland.c - -VULKAN_WSI_X11_FILES := \ - radv_wsi_x11.c - -VULKAN_WSI_DISPLAY_FILES := \ - radv_wsi_display.c - -VULKAN_GENERATED_FILES := \ - radv_entrypoints.c \ - radv_entrypoints.h - diff --git a/src/broadcom/Android.cle.mk b/src/broadcom/Android.cle.mk deleted file mode 100644 index 5634a8d4ad3..00000000000 --- a/src/broadcom/Android.cle.mk +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright © 2016 Intel Corporation -# Copyright © 2016 Mauro Rossi -# -# 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 := libmesa_broadcom_cle - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -LOCAL_SRC_FILES := $(BROADCOM_DECODER_FILES) - -LOCAL_STATIC_LIBRARIES := libmesa_broadcom_genxml - -LOCAL_C_INCLUDES += $(MESA_TOP)/src/gallium/include - -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) - -LOCAL_SHARED_LIBRARIES := libexpat libz - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/broadcom/Android.genxml.mk b/src/broadcom/Android.genxml.mk deleted file mode 100644 index 91e0de05d98..00000000000 --- a/src/broadcom/Android.genxml.mk +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright © 2016 Intel Corporation -# Copyright © 2016 Mauro Rossi -# -# 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 := libmesa_broadcom_genxml - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -intermediates := $(call local-generated-sources-dir) - -# dummy.c source file is generated to meet the build system's rules. -LOCAL_GENERATED_SOURCES += $(intermediates)/dummy.c - -$(intermediates)/dummy.c: - @mkdir -p $(dir $@) - @echo "Gen Dummy: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) touch $@ - -# This is the list of auto-generated files headers -LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/broadcom/, $(BROADCOM_GENXML_GENERATED_FILES)) - -define pack-header-gen - @mkdir -p $(dir $@) - @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(PRIVATE_SCRIPT) $(PRIVATE_SCRIPT_FLAGS) $(PRIVATE_XML) $(PRIVATE_VER) > $@ -endef - -$(intermediates)/broadcom/cle/v3d_packet_v21_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/cle/gen_pack_header.py -$(intermediates)/broadcom/cle/v3d_packet_v21_pack.h: PRIVATE_XML := $(LOCAL_PATH)/cle/v3d_packet_v21.xml -$(intermediates)/broadcom/cle/v3d_packet_v21_pack.h: PRIVATE_VER := 21 -$(intermediates)/broadcom/cle/v3d_packet_v21_pack.h: $(LOCAL_PATH)/cle/v3d_packet_v21.xml $(LOCAL_PATH)/cle/gen_pack_header.py - $(call pack-header-gen) - -$(intermediates)/broadcom/cle/v3d_packet_v33_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/cle/gen_pack_header.py -$(intermediates)/broadcom/cle/v3d_packet_v33_pack.h: PRIVATE_XML := $(LOCAL_PATH)/cle/v3d_packet_v33.xml -$(intermediates)/broadcom/cle/v3d_packet_v33_pack.h: PRIVATE_VER := 33 -$(intermediates)/broadcom/cle/v3d_packet_v33_pack.h: $(LOCAL_PATH)/cle/v3d_packet_v33.xml $(LOCAL_PATH)/cle/gen_pack_header.py - $(call pack-header-gen) - -$(intermediates)/broadcom/cle/v3d_packet_v41_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/cle/gen_pack_header.py -$(intermediates)/broadcom/cle/v3d_packet_v41_pack.h: PRIVATE_XML := $(LOCAL_PATH)/cle/v3d_packet_v33.xml -$(intermediates)/broadcom/cle/v3d_packet_v41_pack.h: PRIVATE_VER := 41 -$(intermediates)/broadcom/cle/v3d_packet_v41_pack.h: $(LOCAL_PATH)/cle/v3d_packet_v33.xml $(LOCAL_PATH)/cle/gen_pack_header.py - $(call pack-header-gen) - -$(intermediates)/broadcom/cle/v3d_packet_v42_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/cle/gen_pack_header.py -$(intermediates)/broadcom/cle/v3d_packet_v42_pack.h: PRIVATE_XML := $(LOCAL_PATH)/cle/v3d_packet_v33.xml -$(intermediates)/broadcom/cle/v3d_packet_v42_pack.h: PRIVATE_VER := 42 -$(intermediates)/broadcom/cle/v3d_packet_v42_pack.h: $(LOCAL_PATH)/cle/v3d_packet_v33.xml $(LOCAL_PATH)/cle/gen_pack_header.py - $(call pack-header-gen) - -$(intermediates)/broadcom/cle/v3d_xml.h: $(addprefix $(MESA_TOP)/src/broadcom/,$(BROADCOM_GENXML_XML_FILES)) $(MESA_TOP)/src/intel/genxml/gen_zipped_file.py - @mkdir -p $(dir $@) - @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(MESA_PYTHON2) $(MESA_TOP)/src/intel/genxml/gen_zipped_file.py $(addprefix $(MESA_TOP)/src/broadcom/,$(BROADCOM_GENXML_XML_FILES)) > $@ || (rm -f $@; false) - -LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(MESA_TOP)/src/broadcom/cle \ - $(intermediates)/broadcom/cle \ - $(intermediates) - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/broadcom/Android.mk b/src/broadcom/Android.mk deleted file mode 100644 index b3bf4051041..00000000000 --- a/src/broadcom/Android.mk +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright © 2016 Intel Corporation -# Copyright © 2016 Mauro Rossi -# -# 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. -# - -LOCAL_PATH := $(call my-dir) - -# Import variables -include $(LOCAL_PATH)/Makefile.sources - -include $(LOCAL_PATH)/Android.genxml.mk -include $(LOCAL_PATH)/Android.cle.mk diff --git a/src/broadcom/Makefile.sources b/src/broadcom/Makefile.sources deleted file mode 100644 index e3ed63d6330..00000000000 --- a/src/broadcom/Makefile.sources +++ /dev/null @@ -1,62 +0,0 @@ -BROADCOM_GENXML_GENERATED_FILES = \ - cle/v3d_packet_v21_pack.h \ - cle/v3d_packet_v33_pack.h \ - cle/v3d_packet_v41_pack.h \ - cle/v3d_packet_v42_pack.h \ - cle/v3d_xml.h \ - $() - -BROADCOM_GENXML_XML_FILES = \ - cle/v3d_packet_v21.xml \ - cle/v3d_packet_v33.xml \ - $() - -BROADCOM_FILES = \ - cle/v3d_packet_helpers.h \ - cle/v3dx_pack.h\ - clif/clif_dump.c \ - clif/clif_dump.h \ - clif/clif_private.h \ - common/v3d_cpu_tiling.h \ - common/v3d_debug.c \ - common/v3d_debug.h \ - common/v3d_device_info.h \ - common/v3d_limits.h \ - common/v3d_macros.h \ - compiler/nir_to_vir.c \ - compiler/vir.c \ - compiler/vir_dump.c \ - compiler/vir_live_variables.c \ - compiler/vir_opt_copy_propagate.c \ - compiler/vir_opt_dead_code.c \ - compiler/vir_opt_redundant_flags.c \ - compiler/vir_opt_small_immediates.c \ - compiler/vir_register_allocate.c \ - compiler/vir_to_qpu.c \ - compiler/qpu_schedule.c \ - compiler/qpu_validate.c \ - compiler/v3d33_tex.c \ - compiler/v3d33_vpm_setup.c \ - compiler/v3d40_tex.c \ - compiler/v3d_compiler.h \ - compiler/v3d_nir_lower_image_load_store.c \ - compiler/v3d_nir_lower_io.c \ - compiler/v3d_nir_lower_line_smooth.c \ - compiler/v3d_nir_lower_scratch.c \ - compiler/v3d_nir_lower_txf_ms.c \ - qpu/qpu_disasm.c \ - qpu/qpu_disasm.h \ - qpu/qpu_instr.c \ - qpu/qpu_instr.h \ - qpu/qpu_pack.c \ - $() - -BROADCOM_PER_VERSION_SOURCES = \ - clif/v3dx_dump.c \ - $() - -BROADCOM_DECODER_FILES = \ - cle/v3d_decoder.c \ - cle/v3d_decoder.h \ - $() - diff --git a/src/compiler/Android.glsl.gen.mk b/src/compiler/Android.glsl.gen.mk deleted file mode 100644 index f654c869f83..00000000000 --- a/src/compiler/Android.glsl.gen.mk +++ /dev/null @@ -1,107 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2010-2011 Chia-I Wu -# Copyright (C) 2010-2011 LunarG Inc. -# -# 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. - -# included by glsl Android.mk for source generation - -ifeq ($(LOCAL_MODULE_CLASS),) -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -endif - -intermediates := $(call local-generated-sources-dir) - -LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) - -LOCAL_C_INCLUDES += \ - $(intermediates)/glsl \ - $(intermediates)/glsl/glcpp \ - $(LOCAL_PATH)/glsl \ - $(LOCAL_PATH)/glsl/glcpp - -LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ - $(LIBGLCPP_GENERATED_FILES) \ - $(LIBGLSL_GENERATED_FILES)) - -LOCAL_EXPORT_C_INCLUDE_DIRS += \ - $(intermediates)/glsl - -# Modules using libmesa_nir must set LOCAL_GENERATED_SOURCES to this -MESA_GEN_GLSL_H := $(addprefix $(call local-generated-sources-dir)/, \ - glsl/ir_expression_operation.h \ - glsl/ir_expression_operation_constant.h \ - glsl/ir_expression_operation_strings.h) - -define local-l-or-ll-to-c-or-cpp - @mkdir -p $(dir $@) - @echo "Mesa Lex: $(PRIVATE_MODULE) <= $<" - $(hide) $(MESA_LEX) --nounistd -o$@ $< -endef - -define glsl_local-y-to-c-and-h - @mkdir -p $(dir $@) - @echo "Mesa Yacc: $(PRIVATE_MODULE) <= $<" - $(hide) $(YACC) -o $@ -p "glcpp_parser_" $< -endef - -YACC_HEADER_SUFFIX := .hpp - -define local-yy-to-cpp-and-h - @mkdir -p $(dir $@) - @echo "Mesa Yacc: $(PRIVATE_MODULE) <= $<" - $(hide) $(YACC) -p "_mesa_glsl_" -o $@ $< - touch $(@:$1=$(YACC_HEADER_SUFFIX)) - echo '#ifndef '$(@F:$1=_h) > $(@:$1=.h) - echo '#define '$(@F:$1=_h) >> $(@:$1=.h) - cat $(@:$1=$(YACC_HEADER_SUFFIX)) >> $(@:$1=.h) - echo '#endif' >> $(@:$1=.h) - rm -f $(@:$1=$(YACC_HEADER_SUFFIX)) -endef - -$(intermediates)/glsl/glsl_lexer.cpp: $(LOCAL_PATH)/glsl/glsl_lexer.ll - $(call local-l-or-ll-to-c-or-cpp) - -$(intermediates)/glsl/glsl_parser.cpp: $(LOCAL_PATH)/glsl/glsl_parser.yy - $(call local-yy-to-cpp-and-h,.cpp) - -$(intermediates)/glsl/glsl_parser.h: $(intermediates)/glsl/glsl_parser.cpp - -$(intermediates)/glsl/glcpp/glcpp-lex.c: $(LOCAL_PATH)/glsl/glcpp/glcpp-lex.l - $(call local-l-or-ll-to-c-or-cpp) - -$(intermediates)/glsl/glcpp/glcpp-parse.c: $(LOCAL_PATH)/glsl/glcpp/glcpp-parse.y - $(call glsl_local-y-to-c-and-h) - -$(intermediates)/glsl/ir_expression_operation.h: $(LOCAL_PATH)/glsl/ir_expression_operation.py - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $< enum > $@ - -$(intermediates)/glsl/ir_expression_operation_constant.h: $(LOCAL_PATH)/glsl/ir_expression_operation.py - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $< constant > $@ - -$(intermediates)/glsl/ir_expression_operation_strings.h: $(LOCAL_PATH)/glsl/ir_expression_operation.py - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $< strings > $@ - -$(intermediates)/glsl/float64_glsl.h: $(MESA_TOP)/src/util/xxd.py - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $< $(MESA_TOP)/src/compiler/glsl/float64.glsl $@ -n float64_source > $@ diff --git a/src/compiler/Android.glsl.mk b/src/compiler/Android.glsl.mk deleted file mode 100644 index 0aabafa2673..00000000000 --- a/src/compiler/Android.glsl.mk +++ /dev/null @@ -1,55 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2010-2011 Chia-I Wu -# Copyright (C) 2010-2011 LunarG Inc. -# -# 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 glsl - -LOCAL_PATH := $(call my-dir) - -include $(LOCAL_PATH)/Makefile.sources - -# --------------------------------------- -# Build libmesa_glsl -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(LIBGLCPP_FILES) \ - $(LIBGLSL_FILES) \ - $(LIBGLSL_SHADER_CACHE_FILES) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/mesa \ - $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src/gallium/auxiliary - -LOCAL_STATIC_LIBRARIES := \ - libmesa_nir - -LOCAL_MODULE := libmesa_glsl - -include $(LOCAL_PATH)/Android.glsl.gen.mk -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - diff --git a/src/compiler/Android.mk b/src/compiler/Android.mk deleted file mode 100644 index 1e81ca54642..00000000000 --- a/src/compiler/Android.mk +++ /dev/null @@ -1,52 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2015 Intel Corporation -# -# 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. - -LOCAL_PATH := $(call my-dir) - -include $(LOCAL_PATH)/Android.glsl.mk -include $(LOCAL_PATH)/Android.nir.mk - -# --------------------------------------- -# Build libmesa_compiler -# --------------------------------------- - -include $(CLEAR_VARS) - -include $(LOCAL_PATH)/Makefile.sources -LOCAL_SRC_FILES := $(LIBCOMPILER_FILES) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/mesa \ - $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src/gallium/auxiliary \ - $(dir $(MESA_GEN_GLSL_H)) - -LOCAL_GENERATED_SOURCES += \ - $(MESA_GEN_GLSL_H) - -LOCAL_MODULE := libmesa_compiler - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - - diff --git a/src/compiler/Android.nir.gen.mk b/src/compiler/Android.nir.gen.mk deleted file mode 100644 index ad640dd0425..00000000000 --- a/src/compiler/Android.nir.gen.mk +++ /dev/null @@ -1,124 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2010-2011 Chia-I Wu -# Copyright (C) 2010-2011 LunarG Inc. -# -# 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. - -# included by glsl Android.mk for source generation - -ifeq ($(LOCAL_MODULE_CLASS),) -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -endif - -intermediates := $(call local-generated-sources-dir) - -LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) - -LOCAL_C_INCLUDES += \ - $(intermediates)/nir \ - $(intermediates)/spirv \ - $(MESA_TOP)/src/compiler/nir - -LOCAL_EXPORT_C_INCLUDE_DIRS += \ - $(intermediates)/nir \ - $(MESA_TOP)/src/compiler \ - $(MESA_TOP)/src/compiler/nir - -LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ - $(NIR_GENERATED_FILES) $(SPIRV_GENERATED_FILES)) - -# Modules using libmesa_nir must set LOCAL_GENERATED_SOURCES to this -MESA_GEN_NIR_H := $(addprefix $(call local-generated-sources-dir)/, \ - nir/nir_opcodes.h \ - nir/nir_intrinsics.h \ - nir/nir_builder_opcodes.h) - -nir_builder_opcodes_gen := $(LOCAL_PATH)/nir/nir_builder_opcodes_h.py -nir_builder_opcodes_deps := \ - $(LOCAL_PATH)/nir/nir_opcodes.py \ - $(LOCAL_PATH)/nir/nir_intrinsics.py \ - $(LOCAL_PATH)/nir/nir_builder_opcodes_h.py - -$(intermediates)/nir/nir_builder_opcodes.h: $(nir_builder_opcodes_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $(nir_builder_opcodes_gen) $< > $@ - -nir_constant_expressions_gen := $(LOCAL_PATH)/nir/nir_constant_expressions.py -nir_constant_expressions_deps := \ - $(LOCAL_PATH)/nir/nir_opcodes.py \ - $(LOCAL_PATH)/nir/nir_constant_expressions.py - -$(intermediates)/nir/nir_constant_expressions.c: $(nir_constant_expressions_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $(nir_constant_expressions_gen) $< > $@ - -nir_opcodes_h_gen := $(LOCAL_PATH)/nir/nir_opcodes_h.py -nir_opcodes_h_deps := \ - $(LOCAL_PATH)/nir/nir_opcodes.py \ - $(LOCAL_PATH)/nir/nir_opcodes_h.py - -$(intermediates)/nir/nir_opcodes.h: $(nir_opcodes_h_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $(nir_opcodes_h_gen) $< > $@ - -nir_opcodes_c_gen := $(LOCAL_PATH)/nir/nir_opcodes_c.py -nir_opcodes_c_deps := \ - $(LOCAL_PATH)/nir/nir_opcodes.py \ - $(LOCAL_PATH)/nir/nir_opcodes_c.py - -$(intermediates)/nir/nir_opcodes.c: $(nir_opcodes_c_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $(nir_opcodes_c_gen) $< > $@ - -nir_opt_algebraic_gen := $(LOCAL_PATH)/nir/nir_opt_algebraic.py -nir_opt_algebraic_deps := \ - $(LOCAL_PATH)/nir/nir_opt_algebraic.py \ - $(LOCAL_PATH)/nir/nir_algebraic.py - -$(intermediates)/nir/nir_opt_algebraic.c: $(nir_opt_algebraic_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $(nir_opt_algebraic_gen) $< > $@ - -$(intermediates)/spirv/spirv_info.c: $(LOCAL_PATH)/spirv/spirv_info_c.py $(LOCAL_PATH)/spirv/spirv.core.grammar.json - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $^ $@ || ($(RM) $@; false) - -$(intermediates)/spirv/vtn_gather_types.c: $(LOCAL_PATH)/spirv/vtn_gather_types_c.py $(LOCAL_PATH)/spirv/spirv.core.grammar.json - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $^ $@ || ($(RM) $@; false) - -$(intermediates)/spirv/vtn_generator_ids.h: $(LOCAL_PATH)/spirv/vtn_generator_ids_h.py $(LOCAL_PATH)/spirv/spir-v.xml - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $^ $@ || ($(RM) $@; false) - -nir_intrinsics_h_gen := $(LOCAL_PATH)/nir/nir_intrinsics_h.py -$(intermediates)/nir/nir_intrinsics.h: $(LOCAL_PATH)/nir/nir_intrinsics.py $(nir_intrinsics_h_gen) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $(nir_intrinsics_h_gen) --outdir $(dir $@) || ($(RM) $@; false) - -nir_intrinsics_c_gen := $(LOCAL_PATH)/nir/nir_intrinsics_c.py -$(intermediates)/nir/nir_intrinsics.c: $(LOCAL_PATH)/nir/nir_intrinsics.py $(nir_intrinsics_c_gen) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $(nir_intrinsics_c_gen) --outdir $(dir $@) || ($(RM) $@; false) - -nir_intrinsics_indices_h_gen := $(LOCAL_PATH)/nir/nir_intrinsics_indices_h.py -$(intermediates)/nir/nir_intrinsics_indices.h: $(LOCAL_PATH)/nir/nir_intrinsics.py $(nir_intrinsics_indices_h_gen) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $(nir_intrinsics_indices_h_gen) --outdir $(dir $@) || ($(RM) $@; false) diff --git a/src/compiler/Android.nir.mk b/src/compiler/Android.nir.mk deleted file mode 100644 index 75a247a245d..00000000000 --- a/src/compiler/Android.nir.mk +++ /dev/null @@ -1,51 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2015 Intel Corporation -# -# 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. - -LOCAL_PATH := $(call my-dir) - -include $(LOCAL_PATH)/Makefile.sources - -# --------------------------------------- -# Build libmesa_nir -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(NIR_FILES) \ - $(SPIRV_FILES) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/mesa \ - $(MESA_TOP)/src/compiler/spirv \ - $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src/gallium/auxiliary - -LOCAL_STATIC_LIBRARIES := libmesa_compiler - -LOCAL_MODULE := libmesa_nir - -include $(LOCAL_PATH)/Android.nir.gen.mk -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources deleted file mode 100644 index 69561c99c14..00000000000 --- a/src/compiler/Makefile.sources +++ /dev/null @@ -1,406 +0,0 @@ -LIBCOMPILER_FILES = \ - builtin_type_macros.h \ - glsl_types.cpp \ - glsl_types.h \ - nir_types.cpp \ - nir_types.h \ - shader_enums.c \ - shader_enums.h \ - shader_info.h - -# libglsl - -LIBGLSL_FILES = \ - glsl/ast.h \ - glsl/ast_array_index.cpp \ - glsl/ast_expr.cpp \ - glsl/ast_function.cpp \ - glsl/ast_to_hir.cpp \ - glsl/ast_type.cpp \ - glsl/builtin_functions.cpp \ - glsl/builtin_functions.h \ - glsl/builtin_int64.h \ - glsl/builtin_types.cpp \ - glsl/builtin_variables.cpp \ - glsl/generate_ir.cpp \ - glsl/gl_nir_lower_atomics.c \ - glsl/gl_nir_lower_images.c \ - glsl/gl_nir_lower_buffers.c \ - glsl/gl_nir_lower_samplers.c \ - glsl/gl_nir_lower_samplers_as_deref.c \ - glsl/gl_nir_link_atomics.c \ - glsl/gl_nir_link_uniform_blocks.c \ - glsl/gl_nir_link_uniform_initializers.c \ - glsl/gl_nir_link_uniforms.c \ - glsl/gl_nir_link_xfb.c \ - glsl/gl_nir_linker.c \ - glsl/gl_nir_linker.h \ - glsl/gl_nir.h \ - glsl/glsl_parser_extras.cpp \ - glsl/glsl_parser_extras.h \ - glsl/glsl_symbol_table.cpp \ - glsl/glsl_symbol_table.h \ - glsl/glsl_to_nir.cpp \ - glsl/glsl_to_nir.h \ - glsl/hir_field_selection.cpp \ - glsl/ir_array_refcount.cpp \ - glsl/ir_array_refcount.h \ - glsl/ir_basic_block.cpp \ - glsl/ir_basic_block.h \ - glsl/ir_builder.cpp \ - glsl/ir_builder.h \ - glsl/ir_clone.cpp \ - glsl/ir_constant_expression.cpp \ - glsl/ir.cpp \ - glsl/ir.h \ - glsl/ir_equals.cpp \ - glsl/ir_expression_flattening.cpp \ - glsl/ir_expression_flattening.h \ - glsl/ir_function_can_inline.cpp \ - glsl/ir_function_detect_recursion.cpp \ - glsl/ir_function_inlining.h \ - glsl/ir_function.cpp \ - glsl/ir_hierarchical_visitor.cpp \ - glsl/ir_hierarchical_visitor.h \ - glsl/ir_hv_accept.cpp \ - glsl/ir_optimization.h \ - glsl/ir_print_visitor.cpp \ - glsl/ir_print_visitor.h \ - glsl/ir_reader.cpp \ - glsl/ir_reader.h \ - glsl/ir_rvalue_visitor.cpp \ - glsl/ir_rvalue_visitor.h \ - glsl/ir_set_program_inouts.cpp \ - glsl/ir_uniform.h \ - glsl/ir_validate.cpp \ - glsl/ir_variable_refcount.cpp \ - glsl/ir_variable_refcount.h \ - glsl/ir_visitor.h \ - glsl/linker.cpp \ - glsl/linker.h \ - glsl/linker_util.h \ - glsl/linker_util.cpp \ - glsl/link_atomics.cpp \ - glsl/link_functions.cpp \ - glsl/link_interface_blocks.cpp \ - glsl/link_uniforms.cpp \ - glsl/link_uniform_initializers.cpp \ - glsl/link_uniform_block_active_visitor.cpp \ - glsl/link_uniform_block_active_visitor.h \ - glsl/link_uniform_blocks.cpp \ - glsl/link_varyings.cpp \ - glsl/link_varyings.h \ - glsl/list.h \ - glsl/loop_analysis.cpp \ - glsl/loop_analysis.h \ - glsl/loop_unroll.cpp \ - glsl/lower_blend_equation_advanced.cpp \ - glsl/lower_builtins.cpp \ - glsl/lower_buffer_access.cpp \ - glsl/lower_buffer_access.h \ - glsl/lower_const_arrays_to_uniforms.cpp \ - glsl/lower_cs_derived.cpp \ - glsl/lower_discard.cpp \ - glsl/lower_discard_flow.cpp \ - glsl/lower_distance.cpp \ - glsl/lower_if_to_cond_assign.cpp \ - glsl/lower_instructions.cpp \ - glsl/lower_int64.cpp \ - glsl/lower_jumps.cpp \ - glsl/lower_mat_op_to_vec.cpp \ - glsl/lower_offset_array.cpp \ - glsl/lower_packed_varyings.cpp \ - glsl/lower_named_interface_blocks.cpp \ - glsl/lower_packing_builtins.cpp \ - glsl/lower_precision.cpp \ - glsl/lower_subroutine.cpp \ - glsl/lower_tess_level.cpp \ - glsl/lower_texture_projection.cpp \ - glsl/lower_variable_index_to_cond_assign.cpp \ - glsl/lower_vec_index_to_cond_assign.cpp \ - glsl/lower_vec_index_to_swizzle.cpp \ - glsl/lower_vector.cpp \ - glsl/lower_vector_derefs.cpp \ - glsl/lower_vector_insert.cpp \ - glsl/lower_vertex_id.cpp \ - glsl/lower_output_reads.cpp \ - glsl/lower_shared_reference.cpp \ - glsl/lower_ubo_reference.cpp \ - glsl/lower_xfb_varying.cpp \ - glsl/opt_algebraic.cpp \ - glsl/opt_array_splitting.cpp \ - glsl/opt_conditional_discard.cpp \ - glsl/opt_constant_folding.cpp \ - glsl/opt_constant_propagation.cpp \ - glsl/opt_constant_variable.cpp \ - glsl/opt_copy_propagation_elements.cpp \ - glsl/opt_dead_builtin_variables.cpp \ - glsl/opt_dead_builtin_varyings.cpp \ - glsl/opt_dead_code.cpp \ - glsl/opt_dead_code_local.cpp \ - glsl/opt_dead_functions.cpp \ - glsl/opt_flatten_nested_if_blocks.cpp \ - glsl/opt_flip_matrices.cpp \ - glsl/opt_function_inlining.cpp \ - glsl/opt_if_simplification.cpp \ - glsl/opt_minmax.cpp \ - glsl/opt_rebalance_tree.cpp \ - glsl/opt_redundant_jumps.cpp \ - glsl/opt_structure_splitting.cpp \ - glsl/opt_swizzle.cpp \ - glsl/opt_tree_grafting.cpp \ - glsl/opt_vectorize.cpp \ - glsl/program.h \ - glsl/propagate_invariance.cpp \ - glsl/s_expression.cpp \ - glsl/s_expression.h \ - glsl/serialize.cpp \ - glsl/serialize.h \ - glsl/string_to_uint_map.cpp \ - glsl/string_to_uint_map.h - -LIBGLSL_SHADER_CACHE_FILES = \ - glsl/shader_cache.cpp \ - glsl/shader_cache.h - -# glsl_compiler - -GLSL_COMPILER_CXX_FILES = \ - glsl/ir_builder_print_visitor.cpp \ - glsl/ir_builder_print_visitor.h \ - glsl/opt_add_neg_to_sub.h \ - glsl/standalone_scaffolding.cpp \ - glsl/standalone_scaffolding.h \ - glsl/standalone.cpp \ - glsl/standalone.h - -# libglsl generated sources -LIBGLSL_GENERATED_FILES = \ - glsl/ir_expression_operation.h \ - glsl/ir_expression_operation_constant.h \ - glsl/ir_expression_operation_strings.h \ - glsl/glsl_lexer.cpp \ - glsl/glsl_parser.cpp \ - glsl/glsl_parser.h \ - glsl/float64_glsl.h - -# libglcpp - -LIBGLCPP_FILES = \ - glsl/glcpp/glcpp.h \ - glsl/glcpp/pp.c - -LIBGLCPP_GENERATED_FILES = \ - glsl/glcpp/glcpp-lex.c \ - glsl/glcpp/glcpp-parse.c - -NIR_GENERATED_FILES = \ - nir/nir_builder_opcodes.h \ - nir/nir_constant_expressions.c \ - nir/nir_intrinsics.c \ - nir/nir_intrinsics.h \ - nir/nir_intrinsics_indices.h \ - nir/nir_opcodes.c \ - nir/nir_opcodes.h \ - nir/nir_opt_algebraic.c - -NIR_FILES = \ - nir/nir.c \ - nir/nir.h \ - nir/nir_builder.h \ - nir/nir_builtin_builder.c \ - nir/nir_builtin_builder.h \ - nir/nir_conversion_builder.h \ - nir/nir_clone.c \ - nir/nir_constant_expressions.h \ - nir/nir_control_flow.c \ - nir/nir_control_flow.h \ - nir/nir_control_flow_private.h \ - nir/nir_convert_ycbcr.c \ - nir/nir_deref.c \ - nir/nir_deref.h \ - nir/nir_divergence_analysis.c \ - nir/nir_dominance.c \ - nir/nir_format_convert.h \ - nir/nir_from_ssa.c \ - nir/nir_gather_info.c \ - nir/nir_gather_ssa_types.c \ - nir/nir_gather_xfb_info.c \ - nir/nir_gs_count_vertices.c \ - nir/nir_inline_functions.c \ - nir/nir_inline_uniforms.c \ - nir/nir_instr_set.c \ - nir/nir_instr_set.h \ - nir/nir_linking_helpers.c \ - nir/nir_liveness.c \ - nir/nir_loop_analyze.c \ - nir/nir_loop_analyze.h \ - nir/nir_lower_alpha_test.c \ - nir/nir_lower_alu.c \ - nir/nir_lower_alu_to_scalar.c \ - nir/nir_lower_amul.c \ - nir/nir_lower_array_deref_of_vec.c \ - nir/nir_lower_atomics_to_ssbo.c \ - nir/nir_lower_bitmap.c \ - nir/nir_lower_blend.c \ - nir/nir_lower_bit_size.c \ - nir/nir_lower_bool_to_bitsize.c \ - nir/nir_lower_bool_to_float.c \ - nir/nir_lower_bool_to_int32.c \ - nir/nir_lower_clamp_color_outputs.c \ - nir/nir_lower_clip.c \ - nir/nir_lower_clip_cull_distance_arrays.c \ - nir/nir_lower_clip_disable.c \ - nir/nir_lower_clip_halfz.c \ - nir/nir_lower_convert_alu_types.c \ - nir/nir_lower_variable_initializers.c \ - nir/nir_lower_discard_or_demote.c \ - nir/nir_lower_double_ops.c \ - nir/nir_lower_drawpixels.c \ - nir/nir_lower_fb_read.c \ - nir/nir_lower_flatshade.c \ - nir/nir_lower_flrp.c \ - nir/nir_lower_fragcolor.c \ - nir/nir_lower_fragcoord_wtrans.c \ - nir/nir_lower_frexp.c \ - nir/nir_lower_global_vars_to_local.c \ - nir/nir_lower_goto_ifs.c \ - nir/nir_lower_gs_intrinsics.c \ - nir/nir_lower_load_const_to_scalar.c \ - nir/nir_lower_locals_to_regs.c \ - nir/nir_lower_idiv.c \ - nir/nir_lower_indirect_derefs.c \ - nir/nir_lower_input_attachments.c \ - nir/nir_lower_int64.c \ - nir/nir_lower_interpolation.c \ - nir/nir_lower_int_to_float.c \ - nir/nir_lower_io.c \ - nir/nir_lower_io_arrays_to_elements.c \ - nir/nir_lower_io_to_temporaries.c \ - nir/nir_lower_io_to_scalar.c \ - nir/nir_lower_io_to_vector.c \ - nir/nir_lower_is_helper_invocation.c \ - nir/nir_lower_multiview.c \ - nir/nir_lower_mediump.c \ - nir/nir_lower_memcpy.c \ - nir/nir_lower_memory_model.c \ - nir/nir_lower_non_uniform_access.c \ - nir/nir_lower_packing.c \ - nir/nir_lower_passthrough_edgeflags.c \ - nir/nir_lower_patch_vertices.c \ - nir/nir_lower_phis_to_scalar.c \ - nir/nir_lower_pntc_ytransform.c \ - nir/nir_lower_point_size.c \ - nir/nir_lower_point_size_mov.c \ - nir/nir_lower_printf.c \ - nir/nir_lower_regs_to_ssa.c \ - nir/nir_lower_readonly_images_to_tex.c \ - nir/nir_lower_returns.c \ - nir/nir_lower_samplers.c \ - nir/nir_lower_scratch.c \ - nir/nir_lower_shader_calls.c \ - nir/nir_lower_ssbo.c \ - nir/nir_lower_subgroups.c \ - nir/nir_lower_system_values.c \ - nir/nir_lower_tex.c \ - nir/nir_lower_texcoord_replace.c \ - nir/nir_lower_to_source_mods.c \ - nir/nir_lower_two_sided_color.c \ - nir/nir_lower_ubo_vec4.c \ - nir/nir_lower_uniforms_to_ubo.c \ - nir/nir_lower_undef_to_zero.c \ - nir/nir_lower_vars_to_ssa.c \ - nir/nir_lower_var_copies.c \ - nir/nir_lower_vec_to_movs.c \ - nir/nir_lower_vec3_to_vec4.c \ - nir/nir_lower_viewport_transform.c \ - nir/nir_lower_wpos_center.c \ - nir/nir_lower_wpos_ytransform.c \ - nir/nir_lower_wrmasks.c \ - nir/nir_metadata.c \ - nir/nir_move_vec_src_uses_to_dest.c \ - nir/nir_normalize_cubemap_coords.c \ - nir/nir_opt_access.c \ - nir/nir_opt_barriers.c \ - nir/nir_opt_combine_stores.c \ - nir/nir_opt_comparison_pre.c \ - nir/nir_opt_conditional_discard.c \ - nir/nir_opt_constant_folding.c \ - nir/nir_opt_copy_prop_vars.c \ - nir/nir_opt_copy_propagate.c \ - nir/nir_opt_cse.c \ - nir/nir_opt_dce.c \ - nir/nir_opt_dead_cf.c \ - nir/nir_opt_dead_write_vars.c \ - nir/nir_opt_find_array_copies.c \ - nir/nir_opt_gcm.c \ - nir/nir_opt_idiv_const.c \ - nir/nir_opt_if.c \ - nir/nir_opt_intrinsics.c \ - nir/nir_opt_loop_unroll.c \ - nir/nir_opt_large_constants.c \ - nir/nir_opt_load_store_vectorize.c \ - nir/nir_opt_memcpy.c \ - nir/nir_opt_move.c \ - nir/nir_opt_move_discards_to_top.c \ - nir/nir_opt_offsets.c \ - nir/nir_opt_peephole_select.c \ - nir/nir_opt_rematerialize_compares.c \ - nir/nir_opt_remove_phis.c \ - nir/nir_opt_shrink_vectors.c \ - nir/nir_opt_sink.c \ - nir/nir_opt_trivial_continues.c \ - nir/nir_opt_undef.c \ - nir/nir_opt_uniform_atomics.c \ - nir/nir_opt_vectorize.c \ - nir/nir_phi_builder.c \ - nir/nir_phi_builder.h \ - nir/nir_print.c \ - nir/nir_propagate_invariant.c \ - nir/nir_range_analysis.c \ - nir/nir_range_analysis.h \ - nir/nir_remove_dead_variables.c \ - nir/nir_repair_ssa.c \ - nir/nir_schedule.c \ - nir/nir_schedule.h \ - nir/nir_search.c \ - nir/nir_search.h \ - nir/nir_search_helpers.h \ - nir/nir_serialize.c \ - nir/nir_serialize.h \ - nir/nir_split_per_member_structs.c \ - nir/nir_split_var_copies.c \ - nir/nir_split_vars.c \ - nir/nir_sweep.c \ - nir/nir_to_lcssa.c \ - nir/nir_validate.c \ - nir/nir_vla.h \ - nir/nir_vulkan.h \ - nir/nir_worklist.c \ - nir/nir_worklist.h \ - nir/nir_xfb_info.h - -SPIRV_GENERATED_FILES = \ - spirv/spirv_info.c \ - spirv/vtn_gather_types.c \ - spirv/vtn_generator_ids.h - -SPIRV_FILES = \ - spirv/GLSL.ext.AMD.h \ - spirv/GLSL.std.450.h \ - spirv/gl_spirv.c \ - spirv/nir_load_libclc.c \ - spirv/nir_lower_libclc.c \ - spirv/nir_spirv.h \ - spirv/OpenCL.std.h \ - spirv/spirv.h \ - spirv/spirv_info.h \ - spirv/spirv_to_nir.c \ - spirv/vtn_alu.c \ - spirv/vtn_amd.c \ - spirv/vtn_cfg.c \ - spirv/vtn_glsl450.c \ - spirv/vtn_opencl.c \ - spirv/vtn_private.h \ - spirv/vtn_subgroup.c \ - spirv/vtn_variables.c diff --git a/src/egl/Android.mk b/src/egl/Android.mk deleted file mode 100644 index 83bd442dea1..00000000000 --- a/src/egl/Android.mk +++ /dev/null @@ -1,95 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2010-2011 Chia-I Wu -# Copyright (C) 2010-2011 LunarG Inc. -# -# 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 libGLES_mesa - -LOCAL_PATH := $(call my-dir) - -include $(LOCAL_PATH)/Makefile.sources - -# --------------------------------------- -# Build libGLES_mesa -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(LIBEGL_C_FILES) \ - $(dri2_backend_core_FILES) \ - drivers/dri2/platform_device.c \ - drivers/dri2/platform_android.c \ - drivers/dri2/platform_surfaceless.c \ - -LOCAL_CFLAGS := \ - -D_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_ANDROID \ - -DHAVE_ANDROID_PLATFORM - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/include \ - $(MESA_TOP)/src/egl/main \ - $(MESA_TOP)/src/egl/drivers/dri2 - -LOCAL_STATIC_LIBRARIES := \ - libmesa_util \ - libmesa_loader - -LOCAL_SHARED_LIBRARIES := \ - libdl \ - libglapi \ - libhardware \ - liblog \ - libcutils \ - libsync - -ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0) -LOCAL_C_INCLUDES += \ - frameworks/native/libs/nativewindow/include \ - frameworks/native/libs/arect/include -LOCAL_HEADER_LIBRARIES += libnativebase_headers -endif - -ifeq ($(BOARD_USES_DRM_GRALLOC),true) - LOCAL_CFLAGS += -DHAVE_DRM_GRALLOC - LOCAL_SHARED_LIBRARIES += libgralloc_drm -endif - -ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),) -LOCAL_SHARED_LIBRARIES += libnativewindow -endif - -# This controls enabling building of driver libraries -ifneq ($(HAVE_I915_DRI),) -LOCAL_REQUIRED_MODULES += i915_dri -endif -ifneq ($(HAVE_I965_DRI),) -LOCAL_REQUIRED_MODULES += i965_dri -endif -ifneq ($(MESA_BUILD_GALLIUM),) -LOCAL_REQUIRED_MODULES += gallium_dri -endif - -LOCAL_MODULE := libGLES_mesa -LOCAL_MODULE_RELATIVE_PATH := egl - -include $(MESA_COMMON_MK) -include $(BUILD_SHARED_LIBRARY) diff --git a/src/egl/Makefile.sources b/src/egl/Makefile.sources deleted file mode 100644 index 5f5b6d27e64..00000000000 --- a/src/egl/Makefile.sources +++ /dev/null @@ -1,32 +0,0 @@ -LIBEGL_C_FILES := \ - main/eglapi.c \ - main/eglarray.c \ - main/eglarray.h \ - main/eglconfig.c \ - main/eglconfig.h \ - main/eglcontext.c \ - main/eglcontext.h \ - main/eglcurrent.c \ - main/eglcurrent.h \ - main/egldefines.h \ - main/egldevice.c \ - main/egldevice.h \ - main/egldisplay.c \ - main/egldisplay.h \ - main/egldriver.h \ - main/eglglobals.c \ - main/eglglobals.h \ - main/eglimage.c \ - main/eglimage.h \ - main/egllog.c \ - main/egllog.h \ - main/eglsurface.c \ - main/eglsurface.h \ - main/eglsync.c \ - main/eglsync.h \ - main/eglentrypoint.h \ - main/egltypedefs.h - -dri2_backend_core_FILES := \ - drivers/dri2/egl_dri2.c \ - drivers/dri2/egl_dri2.h diff --git a/src/etnaviv/Android.mk b/src/etnaviv/Android.mk deleted file mode 100644 index 9b949c3622d..00000000000 --- a/src/etnaviv/Android.mk +++ /dev/null @@ -1,28 +0,0 @@ -# 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 libetnaviv_* - -SUBDIRS := drm - -INC_DIRS := $(call all-named-subdir-makefiles,$(sort $(SUBDIRS))) -include $(INC_DIRS) diff --git a/src/etnaviv/drm/Android.mk b/src/etnaviv/drm/Android.mk deleted file mode 100644 index a1f55ca0582..00000000000 --- a/src/etnaviv/drm/Android.mk +++ /dev/null @@ -1,46 +0,0 @@ -# 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 libetnaviv_drm.a - -# --------------------------------------- -# Build libetnaviv_drm -# --------------------------------------- - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -LOCAL_SRC_FILES := \ - $(C_SOURCES) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src/gallium/auxiliary - -LOCAL_MODULE := libetnaviv_drm - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/etnaviv/drm/Makefile.sources b/src/etnaviv/drm/Makefile.sources deleted file mode 100644 index 21d7f4a6cad..00000000000 --- a/src/etnaviv/drm/Makefile.sources +++ /dev/null @@ -1,10 +0,0 @@ -C_SOURCES := \ - etnaviv_device.c \ - etnaviv_gpu.c \ - etnaviv_bo.c \ - etnaviv_bo_cache.c \ - etnaviv_perfmon.c \ - etnaviv_pipe.c \ - etnaviv_cmd_stream.c \ - etnaviv_drmif.h \ - etnaviv_priv.h diff --git a/src/freedreno/Android.common.mk b/src/freedreno/Android.common.mk deleted file mode 100644 index 6859f36730b..00000000000 --- a/src/freedreno/Android.common.mk +++ /dev/null @@ -1,43 +0,0 @@ -# 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_common.a - -# --------------------------------------- -# Build libfreedreno_common -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(common_SOURCES) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src/gallium/auxiliary - -LOCAL_MODULE := libfreedreno_common - -LOCAL_STATIC_LIBRARIES := libmesa_git_sha1 - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/freedreno/Android.drm.mk b/src/freedreno/Android.drm.mk deleted file mode 100644 index 0a79fcf9a60..00000000000 --- a/src/freedreno/Android.drm.mk +++ /dev/null @@ -1,43 +0,0 @@ -# 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 - -LOCAL_STATIC_LIBRARIES := libfreedreno_registers - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/freedreno/Android.ir2.mk b/src/freedreno/Android.ir2.mk deleted file mode 100644 index 2d0c3483a47..00000000000 --- a/src/freedreno/Android.ir2.mk +++ /dev/null @@ -1,46 +0,0 @@ -# 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_ir2.a - -# --------------------------------------- -# Build libfreedreno_ir2 -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(ir2_SOURCES) - -LOCAL_MODULE := libfreedreno_ir2 - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src/gallium/auxiliary \ - $(MESA_TOP)/src/freedreno/common - -# We need libfreedreno_registers to get xml generated headers -LOCAL_STATIC_LIBRARIES := \ - libfreedreno_registers - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/freedreno/Android.ir3.mk b/src/freedreno/Android.ir3.mk deleted file mode 100644 index 0fbb8c50ca6..00000000000 --- a/src/freedreno/Android.ir3.mk +++ /dev/null @@ -1,102 +0,0 @@ -# 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_MODULE := libfreedreno_ir3 - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -intermediates := $(call local-generated-sources-dir) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/compiler/nir \ - $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src/gallium/auxiliary \ - $(MESA_TOP)/prebuilt-intermediates/nir \ - $(MESA_TOP)/src/freedreno/common \ - $(MESA_TOP)/src/freedreno/ir3 \ - $(intermediates)/ir3 - -LOCAL_WHOLE_STATIC_LIBRARIES := \ - libir3decode \ - libir3encode - -# We need libmesa_nir to get NIR's generated include directories. -LOCAL_STATIC_LIBRARIES := \ - libmesa_nir - -LOCAL_GENERATED_SOURCES := \ - $(MESA_GEN_GLSL_H) \ - $(MESA_GEN_NIR_H) - -LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ - $(ir3_GENERATED_FILES)) - -ir3_lexer_deps := \ - $(MESA_TOP)/src/freedreno/ir3/ir3_lexer.l - -ir3_nir_imul_deps := \ - $(MESA_TOP)/src/freedreno/ir3/ir3_nir_imul.py \ - $(MESA_TOP)/src/compiler/nir/nir_algebraic.py - -ir3_nir_trig_deps := \ - $(MESA_TOP)/src/freedreno/ir3/ir3_nir_trig.py \ - $(MESA_TOP)/src/compiler/nir/nir_algebraic.py - -ir3_parser_deps := \ - $(MESA_TOP)/src/freedreno/ir3/ir3_parser.y - -$(intermediates)/ir3/ir3_lexer.c: $(ir3_lexer_deps) - @mkdir -p $(dir $@) - @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(MESA_LEX) -o $@ $< - -$(intermediates)/ir3/ir3_nir_imul.c: $(ir3_nir_imul_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON3) $< -p $(MESA_TOP)/src/compiler/nir > $@ - -$(intermediates)/ir3/ir3_nir_trig.c: $(ir3_nir_trig_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON3) $< -p $(MESA_TOP)/src/compiler/nir > $@ - -$(intermediates)/ir3/ir3_parser.c: $(ir3_parser_deps) - @mkdir -p $(dir $@) - @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(BISON) $< --name-prefix=ir3_yy --output=$@ - -$(intermediates)/ir3/ir3_parser.h: $(ir3_parser_deps) - @mkdir -p $(dir $@) - @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(BISON) $< --name-prefix=ir3_yy --defines=$@ - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/freedreno/Android.isa.mk b/src/freedreno/Android.isa.mk deleted file mode 100644 index 97ed0f4a2d3..00000000000 --- a/src/freedreno/Android.isa.mk +++ /dev/null @@ -1,123 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2021 Mauro Rossi issor.oruam@gmail.com -# -# 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 libir3decode.a and libir3encode.a - -# --------------------------------------- -# Build libir3decode -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(decode_SOURCES) - -LOCAL_MODULE := libir3decode - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -intermediates := $(call local-generated-sources-dir) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src/gallium/auxiliary \ - $(MESA_TOP)/src/freedreno/isa \ - $(intermediates)/isa - -LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/isa/, ir3-isa.c) - -ir3-isa_c_gen := \ - $(MESA_TOP)/src/freedreno/isa/decode.py - -ir3-isa_c_deps := \ - $(MESA_TOP)/src/freedreno/isa/ir3.xml \ - $(MESA_TOP)/src/freedreno/isa/ir3-common.xml \ - $(MESA_TOP)/src/freedreno/isa/ir3-cat0.xml \ - $(MESA_TOP)/src/freedreno/isa/ir3-cat1.xml \ - $(MESA_TOP)/src/freedreno/isa/ir3-cat2.xml \ - $(MESA_TOP)/src/freedreno/isa/ir3-cat3.xml \ - $(MESA_TOP)/src/freedreno/isa/ir3-cat4.xml \ - $(MESA_TOP)/src/freedreno/isa/ir3-cat5.xml \ - $(MESA_TOP)/src/freedreno/isa/ir3-cat6.xml \ - $(MESA_TOP)/src/freedreno/isa/ir3-cat7.xml \ - $(MESA_TOP)/src/freedreno/isa/isa.py - -$(intermediates)/isa/ir3-isa.c: $(ir3-isa_c_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON3) $(ir3-isa_c_gen) $< $@ - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# --------------------------------------- -# Build libir3encode -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(encode_SOURCES) - -LOCAL_MODULE := libir3encode - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -intermediates := $(call local-generated-sources-dir) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/compiler/nir \ - $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src/gallium/auxiliary \ - $(MESA_TOP)/src/freedreno/isa \ - $(intermediates)/isa - -# We need libmesa_nir to get NIR's generated include directories. -LOCAL_STATIC_LIBRARIES := \ - libmesa_nir - -LOCAL_GENERATED_SOURCES := \ - $(MESA_GEN_NIR_H) - -LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/isa/, encode.h) - -encode_h_gen := \ - $(MESA_TOP)/src/freedreno/isa/encode.py - -encode_h_deps := \ - $(MESA_TOP)/src/freedreno/isa/ir3.xml \ - $(MESA_TOP)/src/freedreno/isa/ir3-common.xml \ - $(MESA_TOP)/src/freedreno/isa/ir3-cat0.xml \ - $(MESA_TOP)/src/freedreno/isa/ir3-cat1.xml \ - $(MESA_TOP)/src/freedreno/isa/ir3-cat2.xml \ - $(MESA_TOP)/src/freedreno/isa/ir3-cat3.xml \ - $(MESA_TOP)/src/freedreno/isa/ir3-cat4.xml \ - $(MESA_TOP)/src/freedreno/isa/ir3-cat5.xml \ - $(MESA_TOP)/src/freedreno/isa/ir3-cat6.xml \ - $(MESA_TOP)/src/freedreno/isa/ir3-cat7.xml \ - $(MESA_TOP)/src/freedreno/isa/isa.py - -$(intermediates)/isa/encode.h: $(encode_h_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON3) $(encode_h_gen) $< $@ - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/freedreno/Android.mk b/src/freedreno/Android.mk deleted file mode 100644 index a488803f98c..00000000000 --- a/src/freedreno/Android.mk +++ /dev/null @@ -1,34 +0,0 @@ -# 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 $(LOCAL_PATH)/Android.common.mk -include $(LOCAL_PATH)/Android.drm.mk -include $(LOCAL_PATH)/Android.ir2.mk -include $(LOCAL_PATH)/Android.ir3.mk -include $(LOCAL_PATH)/Android.isa.mk -include $(LOCAL_PATH)/Android.perfcntrs.mk -include $(LOCAL_PATH)/Android.registers.mk diff --git a/src/freedreno/Android.perfcntrs.mk b/src/freedreno/Android.perfcntrs.mk deleted file mode 100644 index 8525cecfb79..00000000000 --- a/src/freedreno/Android.perfcntrs.mk +++ /dev/null @@ -1,43 +0,0 @@ -# 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_perfcntrs.a - -# --------------------------------------- -# Build libfreedreno_perfcntrs -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(perfcntrs_SOURCES) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src/gallium/auxiliary - -LOCAL_MODULE := libfreedreno_perfcntrs - -LOCAL_STATIC_LIBRARIES := libfreedreno_registers - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/freedreno/Android.registers.mk b/src/freedreno/Android.registers.mk deleted file mode 100644 index f66e5779497..00000000000 --- a/src/freedreno/Android.registers.mk +++ /dev/null @@ -1,100 +0,0 @@ -# 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_registers.a - -# --------------------------------------- -# Build libfreedreno_registers -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libfreedreno_registers - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -intermediates := $(call local-generated-sources-dir) - -# dummy.c source file is generated to meet the build system's rules. -LOCAL_GENERATED_SOURCES += $(intermediates)/dummy.c - -$(intermediates)/dummy.c: - @mkdir -p $(dir $@) - @echo "Gen Dummy: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) touch $@ - -RNN_SRC_PATH := $(MESA_TOP)/src/freedreno/registers/ - -# This is the list of auto-generated files headers -LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/registers/adreno/, \ - a2xx.xml.h a3xx.xml.h a4xx.xml.h a5xx.xml.h a6xx.xml.h a6xx-pack.xml.h adreno_common.xml.h adreno_pm4.xml.h adreno-pm4-pack.xml.h) - -$(intermediates)/registers/adreno/a2xx.xml.h: $(LOCAL_PATH)/registers/adreno/a2xx.xml $(MESA_TOP)/src/freedreno/registers/gen_header.py - @mkdir -p $(dir $@) - @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(MESA_PYTHON3) $(MESA_TOP)/src/freedreno/registers/gen_header.py $(RNN_SRC_PATH) $< > $@ - -$(intermediates)/registers/adreno/a3xx.xml.h: $(LOCAL_PATH)/registers/adreno/a3xx.xml $(MESA_TOP)/src/freedreno/registers/gen_header.py - @mkdir -p $(dir $@) - @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(MESA_PYTHON3) $(MESA_TOP)/src/freedreno/registers/gen_header.py $(RNN_SRC_PATH) $< > $@ - -$(intermediates)/registers/adreno/a4xx.xml.h: $(LOCAL_PATH)/registers/adreno/a4xx.xml $(MESA_TOP)/src/freedreno/registers/gen_header.py - @mkdir -p $(dir $@) - @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(MESA_PYTHON3) $(MESA_TOP)/src/freedreno/registers/gen_header.py $(RNN_SRC_PATH) $< > $@ - -$(intermediates)/registers/adreno/a5xx.xml.h: $(LOCAL_PATH)/registers/adreno/a5xx.xml $(MESA_TOP)/src/freedreno/registers/gen_header.py - @mkdir -p $(dir $@) - @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(MESA_PYTHON3) $(MESA_TOP)/src/freedreno/registers/gen_header.py $(RNN_SRC_PATH) $< > $@ - -$(intermediates)/registers/adreno/a6xx.xml.h: $(LOCAL_PATH)/registers/adreno/a6xx.xml $(MESA_TOP)/src/freedreno/registers/gen_header.py - @mkdir -p $(dir $@) - @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(MESA_PYTHON3) $(MESA_TOP)/src/freedreno/registers/gen_header.py $(RNN_SRC_PATH) $< > $@ - -$(intermediates)/registers/adreno/a6xx-pack.xml.h: $(LOCAL_PATH)/registers/adreno/a6xx.xml $(MESA_TOP)/src/freedreno/registers/gen_header.py - @mkdir -p $(dir $@) - @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(MESA_PYTHON3) $(MESA_TOP)/src/freedreno/registers/gen_header.py $(RNN_SRC_PATH) $< --pack-structs > $@ - -$(intermediates)/registers/adreno/adreno_common.xml.h: $(LOCAL_PATH)/registers/adreno/adreno_common.xml $(MESA_TOP)/src/freedreno/registers/gen_header.py - @mkdir -p $(dir $@) - @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(MESA_PYTHON3) $(MESA_TOP)/src/freedreno/registers/gen_header.py $(RNN_SRC_PATH) $< > $@ - -$(intermediates)/registers/adreno/adreno_pm4.xml.h: $(LOCAL_PATH)/registers/adreno/adreno_pm4.xml $(MESA_TOP)/src/freedreno/registers/gen_header.py - @mkdir -p $(dir $@) - @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(MESA_PYTHON3) $(MESA_TOP)/src/freedreno/registers/gen_header.py $(RNN_SRC_PATH) $< > $@ - -$(intermediates)/registers/adreno/adreno-pm4-pack.xml.h: $(LOCAL_PATH)/registers/adreno/adreno_pm4.xml $(MESA_TOP)/src/freedreno/registers/gen_header.py - @mkdir -p $(dir $@) - @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(MESA_PYTHON3) $(MESA_TOP)/src/freedreno/registers/gen_header.py $(RNN_SRC_PATH) $< --pack-structs > $@ - -LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(intermediates)/registers/adreno/ - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/freedreno/Makefile.sources b/src/freedreno/Makefile.sources deleted file mode 100644 index 2d17e66f7b0..00000000000 --- a/src/freedreno/Makefile.sources +++ /dev/null @@ -1,97 +0,0 @@ -common_SOURCES := \ - common/disasm.h \ - common/freedreno_dev_info.c \ - common/freedreno_dev_info.h \ - common/freedreno_guardband.h \ - common/freedreno_uuid.c \ - common/freedreno_uuid.h - -decode_SOURCES := \ - isa/decode.c \ - isa/decode.h \ - isa/isa.h - -drm_SOURCES := \ - drm/freedreno_bo.c \ - drm/freedreno_drmif.h \ - drm/freedreno_ringbuffer.c \ - drm/msm_bo.c \ - drm/msm_pipe.c \ - drm/msm_ringbuffer_sp.c \ - drm/freedreno_bo_cache.c \ - drm/freedreno_pipe.c \ - drm/freedreno_ringbuffer.h \ - drm/msm_device.c \ - drm/msm_priv.h \ - drm/freedreno_device.c \ - drm/freedreno_priv.h \ - drm/msm_ringbuffer.c - -encode_SOURCES := \ - isa/encode.c \ - isa/isa.h - -ir2_SOURCES := \ - ir2/disasm-a2xx.c \ - ir2/instr-a2xx.h - -ir3_SOURCES := \ - fdl/fd5_layout.c \ - fdl/fd6_layout.c \ - fdl/freedreno_layout.c \ - ir3/disasm-a3xx.c \ - ir3/instr-a3xx.h \ - ir3/ir3.c \ - ir3/ir3_a4xx.c \ - ir3/ir3_a6xx.c \ - ir3/ir3_assembler.c \ - ir3/ir3_assembler.h \ - ir3/ir3_compiler.c \ - ir3/ir3_compiler.h \ - ir3/ir3_compiler_nir.c \ - ir3/ir3_context.c \ - ir3/ir3_context.h \ - ir3/ir3_cp.c \ - ir3/ir3_cp_postsched.c \ - ir3/ir3_cf.c \ - ir3/ir3_dce.c \ - ir3/ir3_delay.c \ - ir3/ir3_disk_cache.c \ - ir3/ir3_group.c \ - ir3/ir3_image.c \ - ir3/ir3_image.h \ - ir3/ir3.h \ - ir3/ir3_legalize.c \ - 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_tess.c \ - ir3/ir3_nir_lower_tex_prefetch.c \ - ir3/ir3_nir_lower_tg4_to_tex.c \ - ir3/ir3_nir_move_varying_inputs.c \ - ir3/ir3_postsched.c \ - ir3/ir3_print.c \ - ir3/ir3_ra.c \ - ir3/ir3_ra.h \ - ir3/ir3_ra_regset.c \ - ir3/ir3_sched.c \ - ir3/ir3_shader.c \ - ir3/ir3_shader.h \ - ir3/ir3_validate.c - -ir3_GENERATED_FILES := \ - ir3/ir3_lexer.c \ - ir3/ir3_nir_trig.c \ - ir3/ir3_nir_imul.c \ - ir3/ir3_parser.c \ - ir3/ir3_parser.h - -perfcntrs_SOURCES := \ - perfcntrs/fd2_perfcntr.c \ - perfcntrs/fd5_perfcntr.c \ - perfcntrs/fd6_perfcntr.c \ - perfcntrs/freedreno_perfcntr.c \ - perfcntrs/freedreno_perfcntr.h diff --git a/src/gallium/Android.common.mk b/src/gallium/Android.common.mk deleted file mode 100644 index 3f7779892df..00000000000 --- a/src/gallium/Android.common.mk +++ /dev/null @@ -1,36 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2010-2011 Chia-I Wu -# Copyright (C) 2010-2011 LunarG Inc. -# -# 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. - -# src/gallium/Android.common.mk - -LOCAL_C_INCLUDES += \ - $(GALLIUM_TOP)/include \ - $(GALLIUM_TOP)/auxiliary \ - $(GALLIUM_TOP)/winsys \ - $(GALLIUM_TOP)/drivers \ - $(MESA_TOP)/src/etnaviv \ - $(MESA_TOP)/src/freedreno \ - $(MESA_TOP)/src/freedreno/ir3 \ - $(MESA_TOP)/src/freedreno/registers - -include $(MESA_COMMON_MK) diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk deleted file mode 100644 index 78e821581b9..00000000000 --- a/src/gallium/Android.mk +++ /dev/null @@ -1,59 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2010-2011 Chia-I Wu -# Copyright (C) 2010-2011 LunarG Inc. -# -# 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. - -# src/gallium/Android.mk - -GALLIUM_TOP := $(call my-dir) -GALLIUM_COMMON_MK := $(GALLIUM_TOP)/Android.common.mk -GALLIUM_TARGET_DRIVERS := - -SUBDIRS := auxiliary -SUBDIRS += auxiliary/pipe-loader - -# -# Gallium drivers and their respective winsys -# - -SUBDIRS += winsys/sw/kms-dri winsys/sw/dri drivers/softpipe -SUBDIRS += winsys/freedreno/drm drivers/freedreno -SUBDIRS += winsys/i915/drm drivers/i915 -SUBDIRS += winsys/nouveau/drm drivers/nouveau -SUBDIRS += winsys/kmsro/drm drivers/kmsro -SUBDIRS += winsys/radeon/drm drivers/r300 -SUBDIRS += winsys/radeon/drm drivers/r600 -SUBDIRS += winsys/radeon/drm winsys/amdgpu/drm drivers/radeonsi -SUBDIRS += winsys/vc4/drm drivers/vc4 -SUBDIRS += winsys/virgl/common winsys/virgl/drm winsys/virgl/vtest drivers/virgl -SUBDIRS += winsys/svga/drm drivers/svga -SUBDIRS += winsys/etnaviv/drm drivers/etnaviv drivers/renderonly -SUBDIRS += frontends/dri -SUBDIRS += winsys/iris/drm drivers/iris -SUBDIRS += winsys/lima/drm drivers/lima -SUBDIRS += winsys/panfrost/drm drivers/panfrost - -# sort to eliminate any duplicates -INC_DIRS := $(call all-named-subdir-makefiles,$(sort $(SUBDIRS))) -# targets/dri must be included last -INC_DIRS += $(call all-named-subdir-makefiles,targets/dri) - -include $(INC_DIRS) diff --git a/src/gallium/auxiliary/Android.mk b/src/gallium/auxiliary/Android.mk deleted file mode 100644 index f668e5237d8..00000000000 --- a/src/gallium/auxiliary/Android.mk +++ /dev/null @@ -1,109 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2010-2011 Chia-I Wu -# Copyright (C) 2010-2011 LunarG Inc. -# -# 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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES and GENERATED_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -# filter-out tessellator/tessellator.hpp to avoid "Unused source files" error -LOCAL_SRC_FILES := \ - $(filter-out tessellator/tessellator.hpp, $(C_SOURCES)) \ - $(NIR_SOURCES) \ - $(RENDERONLY_SOURCES) \ - $(VL_STUB_SOURCES) - -ifeq ($(USE_LIBBACKTRACE),true) - LOCAL_CFLAGS += -DHAVE_ANDROID_PLATFORM - LOCAL_SHARED_LIBRARIES += libbacktrace - LOCAL_SRC_FILES += ../../util/u_debug_stack_android.cpp -endif - -LOCAL_C_INCLUDES := \ - $(GALLIUM_TOP)/auxiliary/util \ - $(MESA_TOP)/src/util - -ifeq ($(MESA_ENABLE_LLVM),true) -LOCAL_SRC_FILES += \ - $(GALLIVM_SOURCES) -$(call mesa-build-with-llvm) -endif - -LOCAL_CPPFLAGS += -std=c++14 - -# We need libmesa_nir to get NIR's generated include directories. -LOCAL_MODULE := libmesa_gallium -LOCAL_SHARED_LIBRARIES += libsync -LOCAL_STATIC_LIBRARIES += libmesa_nir - -LOCAL_WHOLE_STATIC_LIBRARIES += cpufeatures -LOCAL_CFLAGS += -DHAS_ANDROID_CPUFEATURES - -# generate sources -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -intermediates := $(call local-generated-sources-dir) -LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/, $(GENERATED_SOURCES)) - -u_indices_gen_deps := \ - $(MESA_TOP)/src/gallium/auxiliary/indices/u_indices_gen.py - -$(intermediates)/indices/u_indices_gen.c: $(u_indices_gen_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON3) $< > $@ - -u_unfilled_gen_deps := \ - $(MESA_TOP)/src/gallium/auxiliary/indices/u_unfilled_gen.py - -$(intermediates)/indices/u_unfilled_gen.c: $(u_unfilled_gen_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON3) $< > $@ - -u_tracepoints_deps := \ - $(MESA_TOP)/src/gallium/auxiliary/util/u_tracepoints.py \ - $(MESA_TOP)/src/gallium/auxiliary/util/u_trace.py - -u_tracepoints_c := $(intermediates)/util/u_tracepoints.c -u_tracepoints_h := $(intermediates)/util/u_tracepoints.h - -$(intermediates)/util/u_tracepoints.c \ -$(intermediates)/util/u_tracepoints.h: $(u_tracepoints_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON3) $< -p $(MESA_TOP)/src/gallium/auxiliary/util -C $(u_tracepoints_c) -H $(u_tracepoints_h) - -LOCAL_GENERATED_SOURCES += $(MESA_GEN_NIR_H) - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# Build libmesa_galliumvl used by radeonsi -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(VL_SOURCES) - -LOCAL_MODULE := libmesa_galliumvl - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources deleted file mode 100644 index cf7c5398912..00000000000 --- a/src/gallium/auxiliary/Makefile.sources +++ /dev/null @@ -1,465 +0,0 @@ -C_SOURCES := \ - cso_cache/cso_cache.c \ - cso_cache/cso_cache.h \ - cso_cache/cso_context.c \ - cso_cache/cso_context.h \ - cso_cache/cso_hash.c \ - cso_cache/cso_hash.h \ - draw/draw_cliptest_tmp.h \ - draw/draw_context.c \ - draw/draw_context.h \ - draw/draw_decompose_tmp.h \ - draw/draw_fs.c \ - draw/draw_fs.h \ - draw/draw_gs.c \ - draw/draw_gs.h \ - draw/draw_gs_tmp.h \ - draw/draw_pipe_aaline.c \ - draw/draw_pipe_aapoint.c \ - draw/draw_pipe.c \ - draw/draw_pipe.h \ - draw/draw_pipe_clip.c \ - draw/draw_pipe_cull.c \ - draw/draw_pipe_flatshade.c \ - draw/draw_pipe_offset.c \ - draw/draw_pipe_pstipple.c \ - draw/draw_pipe_stipple.c \ - draw/draw_pipe_twoside.c \ - draw/draw_pipe_unfilled.c \ - draw/draw_pipe_user_cull.c \ - draw/draw_pipe_util.c \ - draw/draw_pipe_validate.c \ - draw/draw_pipe_vbuf.c \ - draw/draw_pipe_wide_line.c \ - draw/draw_pipe_wide_point.c \ - draw/draw_prim_assembler.c \ - draw/draw_prim_assembler.h \ - draw/draw_prim_assembler_tmp.h \ - draw/draw_private.h \ - draw/draw_pt.c \ - draw/draw_pt_decompose.h \ - draw/draw_pt_emit.c \ - draw/draw_pt_fetch.c \ - draw/draw_pt_fetch_shade_emit.c \ - draw/draw_pt_fetch_shade_pipeline.c \ - draw/draw_pt.h \ - draw/draw_pt_post_vs.c \ - draw/draw_pt_so_emit.c \ - draw/draw_pt_util.c \ - draw/draw_pt_vsplit.c \ - draw/draw_pt_vsplit_tmp.h \ - draw/draw_so_emit_tmp.h \ - draw/draw_split_tmp.h \ - draw/draw_tess.c \ - draw/draw_tess.h \ - draw/draw_vbuf.h \ - draw/draw_vertex.c \ - draw/draw_vertex.h \ - draw/draw_vs.c \ - draw/draw_vs_exec.c \ - draw/draw_vs.h \ - draw/draw_vs_variant.c \ - driver_ddebug/dd_context.c \ - driver_ddebug/dd_draw.c \ - driver_ddebug/dd_pipe.h \ - driver_ddebug/dd_public.h \ - driver_ddebug/dd_screen.c \ - driver_ddebug/dd_util.h \ - driver_noop/noop_pipe.c \ - driver_noop/noop_public.h \ - driver_noop/noop_state.c \ - driver_rbug/rbug_context.c \ - driver_rbug/rbug_context.h \ - driver_rbug/rbug_core.c \ - driver_rbug/rbug_objects.c \ - driver_rbug/rbug_objects.h \ - driver_rbug/rbug_public.h \ - driver_rbug/rbug_screen.c \ - driver_rbug/rbug_screen.h \ - driver_trace/tr_context.c \ - driver_trace/tr_context.h \ - driver_trace/tr_dump.c \ - driver_trace/tr_dump_defines.h \ - driver_trace/tr_dump.h \ - driver_trace/tr_dump_state.c \ - driver_trace/tr_dump_state.h \ - driver_trace/tr_public.h \ - driver_trace/tr_screen.c \ - driver_trace/tr_screen.h \ - driver_trace/tr_texture.c \ - driver_trace/tr_texture.h \ - hud/font.c \ - hud/font.h \ - hud/hud_context.c \ - hud/hud_context.h \ - hud/hud_cpu.c \ - hud/hud_nic.c \ - hud/hud_cpufreq.c \ - hud/hud_diskstat.c \ - hud/hud_sensors_temp.c \ - hud/hud_driver_query.c \ - hud/hud_fps.c \ - hud/hud_private.h \ - indices/u_indices.h \ - indices/u_indices_priv.h \ - indices/u_primconvert.c \ - indices/u_primconvert.h \ - os/os_mman.h \ - os/os_process.c \ - os/os_process.h \ - os/os_thread.h \ - pipebuffer/pb_buffer_fenced.c \ - pipebuffer/pb_buffer_fenced.h \ - pipebuffer/pb_buffer.h \ - pipebuffer/pb_bufmgr_cache.c \ - pipebuffer/pb_bufmgr_debug.c \ - pipebuffer/pb_bufmgr.h \ - pipebuffer/pb_bufmgr_mm.c \ - pipebuffer/pb_bufmgr_slab.c \ - pipebuffer/pb_cache.c \ - pipebuffer/pb_cache.h \ - pipebuffer/pb_slab.c \ - pipebuffer/pb_slab.h \ - pipebuffer/pb_validate.c \ - pipebuffer/pb_validate.h \ - postprocess/filters.h \ - postprocess/postprocess.h \ - postprocess/pp_celshade.c \ - postprocess/pp_celshade.h \ - postprocess/pp_colors.c \ - postprocess/pp_colors.h \ - postprocess/pp_filters.h \ - postprocess/pp_init.c \ - postprocess/pp_mlaa_areamap.h \ - postprocess/pp_mlaa.c \ - postprocess/pp_mlaa.h \ - postprocess/pp_private.h \ - postprocess/pp_program.c \ - postprocess/pp_run.c \ - rbug/rbug_connection.c \ - rbug/rbug_connection.h \ - rbug/rbug_context.c \ - rbug/rbug_context.h \ - rbug/rbug_core.c \ - rbug/rbug_core.h \ - rbug/rbug_demarshal.c \ - rbug/rbug.h \ - rbug/rbug_internal.h \ - rbug/rbug_proto.h \ - rbug/rbug_shader.c \ - rbug/rbug_shader.h \ - rbug/rbug_texture.c \ - rbug/rbug_texture.h \ - rtasm/rtasm_cpu.c \ - rtasm/rtasm_cpu.h \ - rtasm/rtasm_execmem.c \ - rtasm/rtasm_execmem.h \ - rtasm/rtasm_x86sse.c \ - rtasm/rtasm_x86sse.h \ - tessellator/p_tessellator.cpp \ - tessellator/p_tessellator.h \ - tessellator/tessellator.cpp \ - tessellator/tessellator.hpp \ - tgsi/tgsi_aa_point.c \ - tgsi/tgsi_aa_point.h \ - tgsi/tgsi_build.c \ - tgsi/tgsi_build.h \ - tgsi/tgsi_dump.c \ - tgsi/tgsi_dump.h \ - tgsi/tgsi_dynamic_indexing.c \ - tgsi/tgsi_exec.c \ - tgsi/tgsi_exec.h \ - tgsi/tgsi_emulate.c \ - tgsi/tgsi_emulate.h \ - tgsi/tgsi_from_mesa.c \ - tgsi/tgsi_from_mesa.h \ - tgsi/tgsi_info.c \ - tgsi/tgsi_info.h \ - tgsi/tgsi_info_opcodes.h \ - tgsi/tgsi_iterate.c \ - tgsi/tgsi_iterate.h \ - tgsi/tgsi_lowering.c \ - tgsi/tgsi_lowering.h \ - tgsi/tgsi_opcode_tmp.h \ - tgsi/tgsi_parse.c \ - tgsi/tgsi_parse.h \ - tgsi/tgsi_point_sprite.c \ - tgsi/tgsi_point_sprite.h \ - tgsi/tgsi_sanity.c \ - tgsi/tgsi_sanity.h \ - tgsi/tgsi_scan.c \ - tgsi/tgsi_scan.h \ - tgsi/tgsi_strings.c \ - tgsi/tgsi_strings.h \ - tgsi/tgsi_text.c \ - tgsi/tgsi_text.h \ - tgsi/tgsi_transform.c \ - tgsi/tgsi_transform.h \ - tgsi/tgsi_two_side.c \ - tgsi/tgsi_two_side.h \ - tgsi/tgsi_ureg.c \ - tgsi/tgsi_ureg.h \ - tgsi/tgsi_util.c \ - tgsi/tgsi_util.h \ - tgsi/tgsi_vpos.c \ - translate/translate.c \ - translate/translate.h \ - translate/translate_cache.c \ - translate/translate_cache.h \ - translate/translate_generic.c \ - translate/translate_sse.c \ - util/dbghelp.h \ - util/u_async_debug.h \ - util/u_async_debug.c \ - util/u_bitcast.h \ - util/u_bitmask.c \ - util/u_bitmask.h \ - util/u_blend.h \ - util/u_blitter.c \ - util/u_blitter.h \ - util/u_box.h \ - util/u_cache.c \ - util/u_cache.h \ - util/u_compute.c \ - util/u_compute.h \ - util/u_debug_describe.c \ - util/u_debug_describe.h \ - util/u_debug_flush.c \ - util/u_debug_flush.h \ - util/u_debug_image.c \ - util/u_debug_image.h \ - util/u_debug_refcnt.c \ - util/u_debug_refcnt.h \ - util/u_dirty_flags.h \ - util/u_dirty_surfaces.h \ - util/u_dl.c \ - util/u_dl.h \ - util/u_draw.c \ - util/u_draw.h \ - util/u_draw_quad.c \ - util/u_draw_quad.h \ - util/u_dual_blend.h \ - util/u_dump_defines.c \ - util/u_dump.h \ - util/u_dump_state.c \ - util/u_fifo.h \ - util/u_framebuffer.c \ - util/u_framebuffer.h \ - util/u_gen_mipmap.c \ - util/u_gen_mipmap.h \ - util/u_handle_table.c \ - util/u_handle_table.h \ - util/u_hash_table.c \ - util/u_hash_table.h \ - util/u_helpers.c \ - util/u_helpers.h \ - util/u_index_modify.c \ - util/u_index_modify.h \ - util/u_inlines.h \ - util/u_linear.c \ - util/u_linear.h \ - util/u_live_shader_cache.c \ - util/u_live_shader_cache.h \ - util/u_log.c \ - util/u_log.h \ - util/u_network.c \ - util/u_network.h \ - util/u_pack_color.h \ - util/u_pointer.h \ - util/u_prim.h \ - util/u_prim.c \ - util/u_prim_restart.c \ - util/u_prim_restart.h \ - util/u_pstipple.c \ - util/u_pstipple.h \ - util/u_pwr8.h \ - util/u_range.h \ - util/u_rect.h \ - util/u_resource.c \ - util/u_resource.h \ - util/u_sampler.c \ - util/u_sampler.h \ - util/u_screen.c \ - util/u_screen.h \ - util/u_simple_shaders.c \ - util/u_simple_shaders.h \ - util/u_split_draw.c \ - util/u_split_draw.h \ - util/u_split_prim.h \ - util/u_sse.h \ - util/u_suballoc.c \ - util/u_suballoc.h \ - util/u_surface.c \ - util/u_surface.h \ - util/u_tests.c \ - util/u_tests.h \ - util/u_texture.c \ - util/u_texture.h \ - util/u_tile.c \ - util/u_tile.h \ - util/u_trace.c \ - util/u_trace.h \ - util/u_trace_priv.h \ - util/u_transfer.c \ - util/u_transfer.h \ - util/u_transfer_helper.c \ - util/u_transfer_helper.h \ - util/u_threaded_context.c \ - util/u_threaded_context.h \ - util/u_threaded_context_calls.h \ - util/u_upload_mgr.c \ - util/u_upload_mgr.h \ - util/u_vbuf.c \ - util/u_vbuf.h \ - util/u_video.h \ - util/u_viewport.h - -NIR_SOURCES := \ - nir/tgsi_to_nir.c \ - nir/tgsi_to_nir.h \ - nir/nir_to_tgsi.c \ - nir/nir_to_tgsi.h \ - nir/nir_draw_helpers.c \ - nir/nir_draw_helpers.h - -VL_SOURCES := \ - vl/vl_bicubic_filter.c \ - vl/vl_bicubic_filter.h \ - vl/vl_compositor.c \ - vl/vl_compositor.h \ - vl/vl_compositor_gfx.c \ - vl/vl_compositor_gfx.h \ - vl/vl_compositor_cs.c \ - vl/vl_compositor_cs.h \ - vl/vl_csc.c \ - vl/vl_csc.h \ - vl/vl_decoder.c \ - vl/vl_decoder.h \ - vl/vl_defines.h \ - vl/vl_deint_filter.c \ - vl/vl_deint_filter.h \ - vl/vl_idct.c \ - vl/vl_idct.h \ - vl/vl_matrix_filter.c \ - vl/vl_matrix_filter.h \ - vl/vl_mc.c \ - vl/vl_mc.h \ - vl/vl_median_filter.c \ - vl/vl_median_filter.h \ - vl/vl_mpeg12_bitstream.c \ - vl/vl_mpeg12_bitstream.h \ - vl/vl_mpeg12_decoder.c \ - vl/vl_mpeg12_decoder.h \ - vl/vl_rbsp.h \ - vl/vl_types.h \ - vl/vl_vertex_buffers.c \ - vl/vl_vertex_buffers.h \ - vl/vl_video_buffer.c \ - vl/vl_video_buffer.h \ - vl/vl_vlc.h \ - vl/vl_zscan.c \ - vl/vl_zscan.h \ - vl/vl_probs_table.h - -# XXX: Nuke this as our dri targets no longer depend on VL. -VL_WINSYS_SOURCES := \ - vl/vl_winsys.h - -VL_WINSYS_DRI2_SOURCES := \ - vl/vl_winsys_dri.c - -VL_WINSYS_DRI3_SOURCES := \ - vl/vl_winsys_dri3.c - -VL_WINSYS_DRM_SOURCES := \ - vl/vl_winsys_drm.c - -VL_STUB_SOURCES := \ - vl/vl_stubs.c - -GENERATED_SOURCES := \ - indices/u_indices_gen.c \ - indices/u_unfilled_gen.c \ - util/u_tracepoints.c \ - util/u_tracepoints.h - -GALLIVM_SOURCES := \ - gallivm/lp_bld_arit.c \ - gallivm/lp_bld_arit.h \ - gallivm/lp_bld_arit_overflow.c \ - gallivm/lp_bld_arit_overflow.h \ - gallivm/lp_bld_assert.c \ - gallivm/lp_bld_assert.h \ - gallivm/lp_bld_bitarit.c \ - gallivm/lp_bld_bitarit.h \ - gallivm/lp_bld_const.c \ - gallivm/lp_bld_const.h \ - gallivm/lp_bld_conv.c \ - gallivm/lp_bld_conv.h \ - gallivm/lp_bld_coro.c \ - gallivm/lp_bld_coro.h \ - gallivm/lp_bld_debug.cpp \ - gallivm/lp_bld_debug.h \ - gallivm/lp_bld_flow.c \ - gallivm/lp_bld_flow.h \ - gallivm/lp_bld_format_aos_array.c \ - gallivm/lp_bld_format_aos.c \ - gallivm/lp_bld_format_float.c \ - gallivm/lp_bld_format.c \ - gallivm/lp_bld_format.h \ - gallivm/lp_bld_format_soa.c \ - gallivm/lp_bld_format_s3tc.c \ - gallivm/lp_bld_format_srgb.c \ - gallivm/lp_bld_format_yuv.c \ - gallivm/lp_bld_gather.c \ - gallivm/lp_bld_gather.h \ - gallivm/lp_bld.h \ - gallivm/lp_bld_init.c \ - gallivm/lp_bld_init.h \ - gallivm/lp_bld_intr.c \ - gallivm/lp_bld_intr.h \ - gallivm/lp_bld_ir_common.c \ - gallivm/lp_bld_ir_common.h \ - gallivm/lp_bld_limits.h \ - gallivm/lp_bld_logic.c \ - gallivm/lp_bld_logic.h \ - gallivm/lp_bld_misc.cpp \ - gallivm/lp_bld_misc.h \ - gallivm/lp_bld_nir.c \ - gallivm/lp_bld_nir.h \ - gallivm/lp_bld_nir_soa.c \ - gallivm/lp_bld_pack.c \ - gallivm/lp_bld_pack.h \ - gallivm/lp_bld_printf.c \ - gallivm/lp_bld_printf.h \ - gallivm/lp_bld_quad.c \ - gallivm/lp_bld_quad.h \ - gallivm/lp_bld_sample_aos.c \ - gallivm/lp_bld_sample_aos.h \ - gallivm/lp_bld_sample.c \ - gallivm/lp_bld_sample.h \ - gallivm/lp_bld_sample_soa.c \ - gallivm/lp_bld_struct.c \ - gallivm/lp_bld_struct.h \ - gallivm/lp_bld_swizzle.c \ - gallivm/lp_bld_swizzle.h \ - gallivm/lp_bld_tgsi_action.c \ - gallivm/lp_bld_tgsi_action.h \ - gallivm/lp_bld_tgsi_aos.c \ - gallivm/lp_bld_tgsi.c \ - gallivm/lp_bld_tgsi.h \ - gallivm/lp_bld_tgsi_info.c \ - gallivm/lp_bld_tgsi_soa.c \ - gallivm/lp_bld_type.c \ - gallivm/lp_bld_type.h \ - nir/nir_to_tgsi_info.c \ - nir/nir_to_tgsi_info.h \ - draw/draw_llvm.c \ - draw/draw_llvm.h \ - draw/draw_llvm_sample.c \ - draw/draw_pt_fetch_shade_pipeline_llvm.c \ - draw/draw_vs_llvm.c - -RENDERONLY_SOURCES := \ - renderonly/renderonly.c \ - renderonly/renderonly.h diff --git a/src/gallium/auxiliary/pipe-loader/Android.mk b/src/gallium/auxiliary/pipe-loader/Android.mk deleted file mode 100644 index de07a03ce67..00000000000 --- a/src/gallium/auxiliary/pipe-loader/Android.mk +++ /dev/null @@ -1,45 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2015 Emil Velikov -# -# 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. - -# NOTE: Currently we build only a 'static' pipe-loader -LOCAL_PATH := $(call my-dir) - -# get COMMON_SOURCES and DRM_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_CFLAGS := \ - -DHAVE_PIPE_LOADER_DRI \ - -DHAVE_PIPE_LOADER_KMS \ - -DGALLIUM_STATIC_TARGETS - -LOCAL_SRC_FILES := \ - $(COMMON_SOURCES) \ - $(DRM_SOURCES) - -LOCAL_MODULE := libmesa_pipe_loader - -LOCAL_STATIC_LIBRARIES := libmesa_loader libmesa_util - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/auxiliary/pipe-loader/Makefile.sources b/src/gallium/auxiliary/pipe-loader/Makefile.sources deleted file mode 100644 index 66dd22ccc3c..00000000000 --- a/src/gallium/auxiliary/pipe-loader/Makefile.sources +++ /dev/null @@ -1,9 +0,0 @@ -COMMON_SOURCES := \ - pipe_loader.c \ - pipe_loader.h \ - pipe_loader_priv.h \ - pipe_loader_sw.c \ - driinfo_gallium.h - -DRM_SOURCES := \ - pipe_loader_drm.c diff --git a/src/gallium/drivers/etnaviv/Android.mk b/src/gallium/drivers/etnaviv/Android.mk deleted file mode 100644 index 3ba6b819f89..00000000000 --- a/src/gallium/drivers/etnaviv/Android.mk +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright (C) 2016 Linaro, Ltd, Rob Herring -# -# 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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(C_SOURCES) - -LOCAL_GENERATED_SOURCES := $(MESA_GEN_NIR_H) - -LOCAL_SHARED_LIBRARIES := libdrm -LOCAL_STATIC_LIBRARIES := libmesa_nir libetnaviv_drm -LOCAL_MODULE := libmesa_pipe_etnaviv - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -ifneq ($(HAVE_GALLIUM_ETNAVIV),) -GALLIUM_TARGET_DRIVERS += etnaviv -$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_etnaviv) -$(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES)) -endif diff --git a/src/gallium/drivers/etnaviv/Makefile.sources b/src/gallium/drivers/etnaviv/Makefile.sources deleted file mode 100644 index 2fc3150cfcd..00000000000 --- a/src/gallium/drivers/etnaviv/Makefile.sources +++ /dev/null @@ -1,84 +0,0 @@ -C_SOURCES := \ - hw/cmdstream.xml.h \ - hw/common.xml.h \ - hw/common_3d.xml.h \ - hw/isa.xml.h \ - hw/state_3d.xml.h \ - hw/state_blt.xml.h \ - hw/state.xml.h \ - hw/texdesc_3d.xml.h \ - \ - etnaviv_asm.c \ - etnaviv_asm.h \ - etnaviv_blend.c \ - etnaviv_blend.h \ - etnaviv_blt.c \ - etnaviv_blt.h \ - etnaviv_clear_blit.c \ - etnaviv_clear_blit.h \ - etnaviv_compiler.c \ - etnaviv_compiler.h \ - etnaviv_compiler_nir.c \ - etnaviv_compiler_nir_emit.c \ - etnaviv_compiler_nir_liveness.c \ - etnaviv_compiler_nir_ra.c \ - etnaviv_compiler_tgsi.c \ - etnaviv_context.c \ - etnaviv_context.h \ - etnaviv_debug.h \ - etnaviv_disasm.c \ - etnaviv_disasm.h \ - etnaviv_disk_cache.c \ - etnaviv_disk_cache.h \ - etnaviv_emit.c \ - etnaviv_emit.h \ - etnaviv_etc2.c \ - etnaviv_etc2.h \ - etnaviv_fence.c \ - etnaviv_fence.h \ - etnaviv_format.c \ - etnaviv_format.h \ - etnaviv_internal.h \ - etnaviv_nir_lower_ubo_to_uniform.c \ - etnaviv_nir.c \ - etnaviv_nir.h \ - etnaviv_perfmon.c \ - etnaviv_perfmon.h \ - etnaviv_query.c \ - etnaviv_query.h \ - etnaviv_query_acc_occlusion.c \ - etnaviv_query_acc_perfmon.c \ - etnaviv_query_acc.c \ - etnaviv_query_acc.h \ - etnaviv_query_sw.c \ - etnaviv_query_sw.h \ - etnaviv_rasterizer.c \ - etnaviv_rasterizer.h \ - etnaviv_resource.c \ - etnaviv_resource.h \ - etnaviv_rs.c \ - etnaviv_rs.h \ - etnaviv_screen.c \ - etnaviv_screen.h \ - etnaviv_shader.c \ - etnaviv_shader.h \ - etnaviv_state.c \ - etnaviv_state.h \ - etnaviv_surface.c \ - etnaviv_surface.h \ - etnaviv_texture.c \ - etnaviv_texture.h \ - etnaviv_texture_desc.c \ - etnaviv_texture_desc.h \ - etnaviv_texture_state.c \ - etnaviv_texture_state.h \ - etnaviv_tiling.c \ - etnaviv_tiling.h \ - etnaviv_transfer.c \ - etnaviv_transfer.h \ - etnaviv_translate.h \ - etnaviv_uniforms.c \ - etnaviv_uniforms.h \ - etnaviv_util.h \ - etnaviv_zsa.c \ - etnaviv_zsa.h diff --git a/src/gallium/drivers/freedreno/Android.mk b/src/gallium/drivers/freedreno/Android.mk deleted file mode 100644 index 86db01a5959..00000000000 --- a/src/gallium/drivers/freedreno/Android.mk +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright (C) 2014 Emil Velikov -# -# 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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(C_SOURCES) \ - $(a2xx_SOURCES) \ - $(a3xx_SOURCES) \ - $(a4xx_SOURCES) \ - $(a5xx_SOURCES) \ - $(a6xx_SOURCES) \ - $(ir3_SOURCES) - -#LOCAL_CFLAGS := \ -# -Wno-packed-bitfield-compat - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/ir3 \ - $(MESA_TOP)/include \ - $(MESA_TOP)/src/freedreno/common \ - $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_gallium,,)/util - -LOCAL_GENERATED_SOURCES := $(MESA_GEN_NIR_H) - -LOCAL_SHARED_LIBRARIES := libdrm libsync -LOCAL_STATIC_LIBRARIES := libmesa_glsl libmesa_nir libfreedreno_drm libfreedreno_ir3 libfreedreno_perfcntrs libfreedreno_registers -LOCAL_MODULE := libmesa_pipe_freedreno - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -intermediates := $(call local-generated-sources-dir) - -LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, $(GENERATED_SOURCES)) - -freedreno_tracepoints_deps := \ - $(MESA_TOP)/src/gallium/drivers/freedreno/freedreno_tracepoints.py \ - $(MESA_TOP)/src/gallium/auxiliary/util/u_trace.py - -freedreno_tracepoints_c := $(intermediates)/freedreno_tracepoints.c -freedreno_tracepoints_h := $(intermediates)/freedreno_tracepoints.h - -$(intermediates)/freedreno_tracepoints.c \ -$(intermediates)/freedreno_tracepoints.h: $(freedreno_tracepoints_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON3) $< -p $(MESA_TOP)/src/gallium/auxiliary/util -C $(freedreno_tracepoints_c) -H $(freedreno_tracepoints_h) - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -ifneq ($(HAVE_GALLIUM_FREEDRENO),) -GALLIUM_TARGET_DRIVERS += msm -$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_freedreno) -$(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES)) -endif diff --git a/src/gallium/drivers/freedreno/Makefile.sources b/src/gallium/drivers/freedreno/Makefile.sources deleted file mode 100644 index dd36a0a5375..00000000000 --- a/src/gallium/drivers/freedreno/Makefile.sources +++ /dev/null @@ -1,216 +0,0 @@ -C_SOURCES := \ - disasm.h \ - freedreno_autotune.c \ - freedreno_autotune.h \ - freedreno_batch.c \ - freedreno_batch.h \ - freedreno_batch_cache.c \ - freedreno_batch_cache.h \ - freedreno_blitter.c \ - freedreno_blitter.h \ - freedreno_context.c \ - freedreno_context.h \ - freedreno_draw.c \ - freedreno_draw.h \ - freedreno_fence.c \ - freedreno_fence.h \ - freedreno_gmem.c \ - freedreno_gmem.h \ - freedreno_program.c \ - freedreno_program.h \ - freedreno_query.c \ - freedreno_query.h \ - freedreno_query_acc.c \ - freedreno_query_acc.h \ - freedreno_query_hw.c \ - freedreno_query_hw.h \ - freedreno_query_sw.c \ - freedreno_query_sw.h \ - freedreno_resource.c \ - freedreno_resource.h \ - freedreno_screen.c \ - freedreno_screen.h \ - freedreno_state.c \ - freedreno_state.h \ - freedreno_surface.c \ - freedreno_surface.h \ - freedreno_texture.c \ - freedreno_texture.h \ - freedreno_util.c \ - freedreno_util.h - -GENERATED_SOURCES := \ - freedreno_tracepoints.c \ - freedreno_tracepoints.h - -a2xx_SOURCES := \ - a2xx/fd2_blend.c \ - a2xx/fd2_blend.h \ - a2xx/fd2_context.c \ - a2xx/fd2_context.h \ - a2xx/fd2_draw.c \ - a2xx/fd2_draw.h \ - a2xx/fd2_emit.c \ - a2xx/fd2_emit.h \ - a2xx/fd2_gmem.c \ - a2xx/fd2_gmem.h \ - a2xx/fd2_program.c \ - a2xx/fd2_program.h \ - a2xx/fd2_query.c \ - a2xx/fd2_query.h \ - a2xx/fd2_rasterizer.c \ - a2xx/fd2_rasterizer.h \ - a2xx/fd2_resource.c \ - a2xx/fd2_resource.h \ - a2xx/fd2_screen.c \ - a2xx/fd2_screen.h \ - a2xx/fd2_texture.c \ - a2xx/fd2_texture.h \ - a2xx/fd2_util.c \ - a2xx/fd2_util.h \ - a2xx/fd2_zsa.c \ - a2xx/fd2_zsa.h \ - a2xx/instr-a2xx.h \ - a2xx/ir2.c \ - a2xx/ir2.h \ - a2xx/ir2_assemble.c \ - a2xx/ir2_cp.c \ - a2xx/ir2_nir.c \ - a2xx/ir2_private.h \ - a2xx/ir2_ra.c - -a3xx_SOURCES := \ - a3xx/fd3_blend.c \ - a3xx/fd3_blend.h \ - a3xx/fd3_context.c \ - a3xx/fd3_context.h \ - a3xx/fd3_draw.c \ - a3xx/fd3_draw.h \ - a3xx/fd3_emit.c \ - a3xx/fd3_emit.h \ - a3xx/fd3_format.c \ - a3xx/fd3_format.h \ - a3xx/fd3_gmem.c \ - a3xx/fd3_gmem.h \ - a3xx/fd3_program.c \ - a3xx/fd3_program.h \ - a3xx/fd3_query.c \ - a3xx/fd3_query.h \ - a3xx/fd3_rasterizer.c \ - a3xx/fd3_rasterizer.h \ - a3xx/fd3_resource.c \ - a3xx/fd3_resource.h \ - a3xx/fd3_screen.c \ - a3xx/fd3_screen.h \ - a3xx/fd3_texture.c \ - a3xx/fd3_texture.h \ - a3xx/fd3_zsa.c \ - a3xx/fd3_zsa.h - -a4xx_SOURCES := \ - a4xx/fd4_blend.c \ - a4xx/fd4_blend.h \ - a4xx/fd4_context.c \ - a4xx/fd4_context.h \ - a4xx/fd4_draw.c \ - a4xx/fd4_draw.h \ - a4xx/fd4_emit.c \ - a4xx/fd4_emit.h \ - a4xx/fd4_format.c \ - a4xx/fd4_format.h \ - a4xx/fd4_gmem.c \ - a4xx/fd4_gmem.h \ - a4xx/fd4_program.c \ - a4xx/fd4_program.h \ - a4xx/fd4_query.c \ - a4xx/fd4_query.h \ - a4xx/fd4_rasterizer.c \ - a4xx/fd4_rasterizer.h \ - a4xx/fd4_resource.c \ - a4xx/fd4_resource.h \ - a4xx/fd4_screen.c \ - a4xx/fd4_screen.h \ - a4xx/fd4_texture.c \ - a4xx/fd4_texture.h \ - a4xx/fd4_zsa.c \ - a4xx/fd4_zsa.h - -a5xx_SOURCES := \ - a5xx/fd5_blend.c \ - a5xx/fd5_blend.h \ - a5xx/fd5_blitter.c \ - a5xx/fd5_blitter.h \ - a5xx/fd5_compute.c \ - a5xx/fd5_compute.h \ - a5xx/fd5_context.c \ - a5xx/fd5_context.h \ - a5xx/fd5_draw.c \ - a5xx/fd5_draw.h \ - a5xx/fd5_emit.c \ - a5xx/fd5_emit.h \ - a5xx/fd5_format.c \ - a5xx/fd5_format.h \ - a5xx/fd5_gmem.c \ - a5xx/fd5_gmem.h \ - a5xx/fd5_image.c \ - a5xx/fd5_image.h \ - a5xx/fd5_program.c \ - a5xx/fd5_program.h \ - a5xx/fd5_query.c \ - a5xx/fd5_query.h \ - a5xx/fd5_rasterizer.c \ - a5xx/fd5_rasterizer.h \ - a5xx/fd5_resource.c \ - a5xx/fd5_resource.h \ - a5xx/fd5_screen.c \ - a5xx/fd5_screen.h \ - a5xx/fd5_texture.c \ - a5xx/fd5_texture.h \ - a5xx/fd5_zsa.c \ - a5xx/fd5_zsa.h - -a6xx_SOURCES := \ - a6xx/fd6_blend.c \ - a6xx/fd6_blend.h \ - a6xx/fd6_blitter.c \ - a6xx/fd6_blitter.h \ - a6xx/fd6_compute.c \ - a6xx/fd6_compute.h \ - a6xx/fd6_const.c \ - a6xx/fd6_const.h \ - a6xx/fd6_context.c \ - a6xx/fd6_context.h \ - a6xx/fd6_draw.c \ - a6xx/fd6_draw.h \ - a6xx/fd6_emit.c \ - a6xx/fd6_emit.h \ - a6xx/fd6_format.c \ - a6xx/fd6_format.h \ - a6xx/fd6_gmem.c \ - a6xx/fd6_gmem.h \ - a6xx/fd6_image.c \ - a6xx/fd6_image.h \ - a6xx/fd6_program.c \ - a6xx/fd6_program.h \ - a6xx/fd6_query.c \ - a6xx/fd6_query.h \ - a6xx/fd6_rasterizer.c \ - a6xx/fd6_rasterizer.h \ - a6xx/fd6_resource.c \ - a6xx/fd6_resource.h \ - a6xx/fd6_screen.c \ - a6xx/fd6_screen.h \ - a6xx/fd6_texture.c \ - a6xx/fd6_texture.h \ - a6xx/fd6_vsc.c \ - a6xx/fd6_vsc.h \ - a6xx/fd6_zsa.c \ - a6xx/fd6_zsa.h - -ir3_SOURCES := \ - ir3/ir3_cache.c \ - ir3/ir3_cache.h \ - ir3/ir3_const.h \ - ir3/ir3_gallium.c \ - ir3/ir3_gallium.h - diff --git a/src/gallium/drivers/i915/Android.mk b/src/gallium/drivers/i915/Android.mk deleted file mode 100644 index f00915473ba..00000000000 --- a/src/gallium/drivers/i915/Android.mk +++ /dev/null @@ -1,41 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2010-2011 Chia-I Wu -# Copyright (C) 2010-2011 LunarG Inc. -# -# 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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(C_SOURCES) - -LOCAL_MODULE := libmesa_pipe_i915 - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -ifneq ($(HAVE_GALLIUM_I915),) -GALLIUM_TARGET_DRIVERS += i915 -$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_i915) -endif diff --git a/src/gallium/drivers/i915/Makefile.sources b/src/gallium/drivers/i915/Makefile.sources deleted file mode 100644 index 5354f047bcc..00000000000 --- a/src/gallium/drivers/i915/Makefile.sources +++ /dev/null @@ -1,42 +0,0 @@ -C_SOURCES := \ - i915_batchbuffer.h \ - i915_batch.h \ - i915_blit.c \ - i915_blit.h \ - i915_clear.c \ - i915_context.c \ - i915_context.h \ - i915_debug.c \ - i915_debug_fp.c \ - i915_debug.h \ - i915_debug_private.h \ - i915_flush.c \ - i915_fpc_emit.c \ - i915_fpc.h \ - i915_fpc_optimize.c \ - i915_fpc_translate.c \ - i915_prim_emit.c \ - i915_prim_vbuf.c \ - i915_public.h \ - i915_query.c \ - i915_query.h \ - i915_reg.h \ - i915_resource_buffer.c \ - i915_resource.c \ - i915_resource.h \ - i915_resource_texture.c \ - i915_screen.c \ - i915_screen.h \ - i915_state.c \ - i915_state_derived.c \ - i915_state_dynamic.c \ - i915_state_emit.c \ - i915_state_fpc.c \ - i915_state.h \ - i915_state_immediate.c \ - i915_state_inlines.h \ - i915_state_sampler.c \ - i915_state_static.c \ - i915_surface.c \ - i915_surface.h \ - i915_winsys.h diff --git a/src/gallium/drivers/iris/Android.mk b/src/gallium/drivers/iris/Android.mk deleted file mode 100644 index 5d5744025b7..00000000000 --- a/src/gallium/drivers/iris/Android.mk +++ /dev/null @@ -1,183 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2018 Intel Corporation -# -# 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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LIBIRIS_SRC_FILES := \ - iris_blorp.c \ - iris_query.c \ - iris_state.c - -LIBIRIS_STATIC_LIBS := \ - libmesa_nir - -IRIS_COMMON_INCLUDES := \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/mesa \ - $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src/gallium/auxiliary - -# -# libiris for gfx8 -# - -include $(CLEAR_VARS) -LOCAL_MODULE := libmesa_iris_gfx8 -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -LOCAL_SRC_FILES := $(LIBIRIS_SRC_FILES) -LOCAL_CFLAGS := -DGFX_VERx10=80 - -LOCAL_C_INCLUDES := $(IRIS_COMMON_INCLUDES) - -LOCAL_STATIC_LIBRARIES := $(LIBIRIS_STATIC_LIBS) - -LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# -# libiris for gfx9 -# - -include $(CLEAR_VARS) -LOCAL_MODULE := libmesa_iris_gfx9 -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -LOCAL_SRC_FILES := $(LIBIRIS_SRC_FILES) -LOCAL_CFLAGS := -DGFX_VERx10=90 - -LOCAL_C_INCLUDES := $(IRIS_COMMON_INCLUDES) - -LOCAL_STATIC_LIBRARIES := $(LIBIRIS_STATIC_LIBS) - -LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# -# libiris for gfx11 -# - -include $(CLEAR_VARS) -LOCAL_MODULE := libmesa_iris_gfx11 -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -LOCAL_SRC_FILES := $(LIBIRIS_SRC_FILES) -LOCAL_CFLAGS := -DGFX_VERx10=110 - -LOCAL_C_INCLUDES := $(IRIS_COMMON_INCLUDES) - -LOCAL_STATIC_LIBRARIES := $(LIBIRIS_STATIC_LIBS) - -LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# -# libiris for gfx12 -# - -include $(CLEAR_VARS) -LOCAL_MODULE := libmesa_iris_gfx12 -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -LOCAL_SRC_FILES := $(LIBIRIS_SRC_FILES) -LOCAL_CFLAGS := -DGFX_VERx10=120 - -LOCAL_C_INCLUDES := $(IRIS_COMMON_INCLUDES) - -LOCAL_STATIC_LIBRARIES := $(LIBIRIS_STATIC_LIBS) - -LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# -# libiris for gfx125 -# - -include $(CLEAR_VARS) -LOCAL_MODULE := libmesa_iris_gfx125 -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -LOCAL_SRC_FILES := $(LIBIRIS_SRC_FILES) -LOCAL_CFLAGS := -DGFX_VERx10=125 - -LOCAL_C_INCLUDES := $(IRIS_COMMON_INCLUDES) - -LOCAL_STATIC_LIBRARIES := $(LIBIRIS_STATIC_LIBS) - -LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -########################################################### -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_pipe_iris - -LOCAL_SRC_FILES := \ - $(IRIS_C_SOURCES) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/mesa \ - $(MESA_TOP)/include/drm-uapi \ - $(MESA_TOP)/src/gallium/include - -LOCAL_SHARED_LIBRARIES := libdrm_intel - -LOCAL_STATIC_LIBRARIES := \ - libmesa_intel_common \ - libmesa_nir - -LOCAL_WHOLE_STATIC_LIBRARIES := \ - libmesa_genxml \ - libmesa_blorp \ - libmesa_intel_common \ - libmesa_intel_compiler \ - libmesa_intel_perf \ - libmesa_iris_gfx8 \ - libmesa_iris_gfx9 \ - libmesa_iris_gfx11 \ - libmesa_iris_gfx12 \ - libmesa_iris_gfx125 - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -ifneq ($(HAVE_GALLIUM_IRIS),) -GALLIUM_TARGET_DRIVERS += iris -$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_iris) -$(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES)) -endif diff --git a/src/gallium/drivers/iris/Makefile.sources b/src/gallium/drivers/iris/Makefile.sources deleted file mode 100644 index c727bce865a..00000000000 --- a/src/gallium/drivers/iris/Makefile.sources +++ /dev/null @@ -1,58 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2018 Intel Corporation -# -# 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. - -IRIS_C_SOURCES = \ - driinfo_iris.h \ - iris_batch.c \ - iris_batch.h \ - iris_binder.c \ - iris_binder.h \ - iris_blit.c \ - iris_border_color.c \ - iris_bufmgr.c \ - iris_bufmgr.h \ - iris_clear.c \ - iris_context.c \ - iris_context.h \ - iris_disk_cache.c \ - iris_draw.c \ - iris_fence.c \ - iris_fence.h \ - iris_fine_fence.c \ - iris_fine_fence.h \ - iris_formats.c \ - iris_genx_macros.h \ - iris_genx_protos.h \ - iris_measure.c \ - iris_measure.h \ - iris_monitor.c \ - iris_performance_query.c \ - iris_perf.c \ - iris_pipe.h \ - iris_pipe_control.c \ - iris_program.c \ - iris_program_cache.c \ - iris_resolve.c \ - iris_resource.c \ - iris_resource.h \ - iris_screen.c \ - iris_screen.h diff --git a/src/gallium/drivers/kmsro/Android.mk b/src/gallium/drivers/kmsro/Android.mk deleted file mode 100644 index e0e26482b0c..00000000000 --- a/src/gallium/drivers/kmsro/Android.mk +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright (C) 2014 Emil Velikov -# -# 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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(C_SOURCES) - -LOCAL_MODULE := libmesa_pipe_kmsro - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -ifneq ($(HAVE_GALLIUM_KMSRO),) -GALLIUM_TARGET_DRIVERS += armada-drm -GALLIUM_TARGET_DRIVERS += exynos -GALLIUM_TARGET_DRIVERS += hx8357d -GALLIUM_TARGET_DRIVERS += ili9225 -GALLIUM_TARGET_DRIVERS += ili9341 -GALLIUM_TARGET_DRIVERS += imx-drm -GALLIUM_TARGET_DRIVERS += imx-dcss -GALLIUM_TARGET_DRIVERS += ingenic-drm -GALLIUM_TARGET_DRIVERS += mcde -GALLIUM_TARGET_DRIVERS += mediatek -GALLIUM_TARGET_DRIVERS += meson -GALLIUM_TARGET_DRIVERS += mi0283qt -GALLIUM_TARGET_DRIVERS += mxsfb-drm -GALLIUM_TARGET_DRIVERS += pl111 -GALLIUM_TARGET_DRIVERS += repaper -GALLIUM_TARGET_DRIVERS += rockchip -GALLIUM_TARGET_DRIVERS += st7586 -GALLIUM_TARGET_DRIVERS += st7735r -GALLIUM_TARGET_DRIVERS += stm -GALLIUM_TARGET_DRIVERS += sun4i-drm -$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_kmsro) -endif diff --git a/src/gallium/drivers/kmsro/Makefile.sources b/src/gallium/drivers/kmsro/Makefile.sources deleted file mode 100644 index 20396753fdb..00000000000 --- a/src/gallium/drivers/kmsro/Makefile.sources +++ /dev/null @@ -1,2 +0,0 @@ -C_SOURCES := - diff --git a/src/gallium/drivers/lima/Android.mk b/src/gallium/drivers/lima/Android.mk deleted file mode 100644 index 09487d9dce9..00000000000 --- a/src/gallium/drivers/lima/Android.mk +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright (C) 2019 Icenowy Zheng -# -# 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. - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - ir/gp/codegen.c \ - ir/gp/codegen.h \ - ir/gp/disasm.c \ - ir/gp/gpir.h \ - ir/gp/instr.c \ - ir/gp/lower.c \ - ir/gp/nir.c \ - ir/gp/node.c \ - ir/gp/optimize.c \ - ir/gp/regalloc.c \ - ir/gp/reduce_scheduler.c \ - ir/gp/scheduler.c \ - ir/lima_ir.h \ - ir/lima_nir_duplicate_consts.c \ - ir/lima_nir_duplicate_intrinsic.c \ - ir/lima_nir_lower_uniform_to_scalar.c \ - ir/lima_nir_split_load_input.c \ - ir/pp/codegen.c \ - ir/pp/codegen.h \ - ir/pp/disasm.c \ - ir/pp/instr.c \ - ir/pp/lower.c \ - ir/pp/nir.c \ - ir/pp/node.c \ - ir/pp/node_to_instr.c \ - ir/pp/ppir.h \ - ir/pp/regalloc.c \ - ir/pp/liveness.c \ - ir/pp/scheduler.c \ - lima_bo.c \ - lima_bo.h \ - lima_context.c \ - lima_context.h \ - lima_disk_cache.c \ - lima_disk_cache.h \ - lima_draw.c \ - lima_fence.c \ - lima_fence.h \ - lima_parser.c \ - lima_parser.h \ - lima_program.c \ - lima_program.h \ - lima_query.c \ - lima_resource.c \ - lima_resource.h \ - lima_screen.c \ - lima_screen.h \ - lima_state.c \ - lima_job.c \ - lima_job.h \ - lima_texture.c \ - lima_texture.h \ - lima_util.c \ - lima_util.h \ - lima_format.c \ - lima_format.h \ - lima_gpu.h - -LOCAL_MODULE := libmesa_pipe_lima - -LOCAL_SHARED_LIBRARIES := libdrm - -LOCAL_STATIC_LIBRARIES := \ - libmesa_nir \ - libpanfrost_shared \ - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -intermediates := $(call local-generated-sources-dir) - -$(intermediates)/lima_nir_algebraic.c: $(LOCAL_PATH)/ir/lima_nir_algebraic.py - @echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))" - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $< -p $(MESA_TOP)/src/compiler/nir/ > $@ - -LOCAL_GENERATED_SOURCES := \ - $(intermediates)/lima_nir_algebraic.c \ - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -ifneq ($(HAVE_GALLIUM_LIMA),) -GALLIUM_TARGET_DRIVERS += lima -$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_lima) -$(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES)) -endif diff --git a/src/gallium/drivers/llvmpipe/Makefile.sources b/src/gallium/drivers/llvmpipe/Makefile.sources deleted file mode 100644 index 71579cd02bb..00000000000 --- a/src/gallium/drivers/llvmpipe/Makefile.sources +++ /dev/null @@ -1,76 +0,0 @@ -C_SOURCES := \ - lp_bld_alpha.c \ - lp_bld_alpha.h \ - lp_bld_blend_aos.c \ - lp_bld_blend.c \ - lp_bld_blend.h \ - lp_bld_blend_logicop.c \ - lp_bld_depth.c \ - lp_bld_depth.h \ - lp_bld_interp.c \ - lp_bld_interp.h \ - lp_clear.c \ - lp_clear.h \ - lp_context.c \ - lp_context.h \ - lp_cs_tpool.c \ - lp_cs_tpool.h \ - lp_debug.h \ - lp_draw_arrays.c \ - lp_fence.c \ - lp_fence.h \ - lp_flush.c \ - lp_flush.h \ - lp_jit.c \ - lp_jit.h \ - lp_limits.h \ - lp_memory.c \ - lp_memory.h \ - lp_perf.c \ - lp_perf.h \ - lp_public.h \ - lp_query.c \ - lp_query.h \ - lp_rast.c \ - lp_rast_debug.c \ - lp_rast.h \ - lp_rast_priv.h \ - lp_rast_tri.c \ - lp_rast_tri_tmp.h \ - lp_scene.c \ - lp_scene.h \ - lp_scene_queue.c \ - lp_scene_queue.h \ - lp_screen.c \ - lp_screen.h \ - lp_setup.c \ - lp_setup_context.h \ - lp_setup.h \ - lp_setup_line.c \ - lp_setup_point.c \ - lp_setup_tri.c \ - lp_setup_vbuf.c \ - lp_state_blend.c \ - lp_state_clip.c \ - lp_state_derived.c \ - lp_state_cs.c \ - lp_state_cs.h \ - lp_state_fs.c \ - lp_state_fs.h \ - lp_state_gs.c \ - lp_state.h \ - lp_state_rasterizer.c \ - lp_state_sampler.c \ - lp_state_setup.c \ - lp_state_setup.h \ - lp_state_so.c \ - lp_state_surface.c \ - lp_state_tess.c \ - lp_state_vertex.c \ - lp_state_vs.c \ - lp_surface.c \ - lp_surface.h \ - lp_tex_sample.c \ - lp_tex_sample.h \ - lp_texture.c \ - lp_texture.h diff --git a/src/gallium/drivers/nouveau/Android.mk b/src/gallium/drivers/nouveau/Android.mk deleted file mode 100644 index 49a341c8314..00000000000 --- a/src/gallium/drivers/nouveau/Android.mk +++ /dev/null @@ -1,57 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2011 Chia-I Wu -# Copyright (C) 2011 LunarG Inc. -# -# 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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(C_SOURCES) \ - $(NV30_C_SOURCES) \ - $(NV50_CODEGEN_SOURCES) \ - $(NV50_C_SOURCES) \ - $(NVC0_CODEGEN_SOURCES) \ - $(NVC0_C_SOURCES) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/include \ - $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \ - $(MESA_TOP)/src/compiler/nir \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/mesa - -LOCAL_STATIC_LIBRARIES := libmesa_nir -LOCAL_SHARED_LIBRARIES := libdrm_nouveau -LOCAL_MODULE := libmesa_pipe_nouveau - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -ifneq ($(HAVE_GALLIUM_NOUVEAU),) -GALLIUM_TARGET_DRIVERS += nouveau -$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_nouveau) -$(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES)) -endif diff --git a/src/gallium/drivers/nouveau/Makefile.sources b/src/gallium/drivers/nouveau/Makefile.sources deleted file mode 100644 index 8b2ab3806fc..00000000000 --- a/src/gallium/drivers/nouveau/Makefile.sources +++ /dev/null @@ -1,214 +0,0 @@ -C_SOURCES := \ - nouveau_buffer.c \ - nouveau_buffer.h \ - nouveau_context.h \ - nouveau_debug.h \ - nouveau_fence.c \ - nouveau_fence.h \ - nouveau_gldefs.h \ - nouveau_heap.c \ - nouveau_heap.h \ - nouveau_mm.c \ - nouveau_mm.h \ - nouveau_screen.c \ - nouveau_screen.h \ - nouveau_video.c \ - nouveau_video.h \ - nouveau_vp3_video_bsp.c \ - nouveau_vp3_video.c \ - nouveau_vp3_video.h \ - nouveau_vp3_video_vp.c \ - nouveau_winsys.h \ - nv17_mpeg.xml.h \ - nv31_mpeg.xml.h \ - nv_m2mf.xml.h \ - nv_object.xml.h - -NV30_C_SOURCES := \ - nv30/nv01_2d.xml.h \ - nv30/nv30-40_3d.xml.h \ - nv30/nv30_clear.c \ - nv30/nv30_context.c \ - nv30/nv30_context.h \ - nv30/nv30_draw.c \ - nv30/nv30_format.c \ - nv30/nv30_format.h \ - nv30/nv30_fragprog.c \ - nv30/nv30_fragtex.c \ - nv30/nv30_miptree.c \ - nv30/nv30_push.c \ - nv30/nv30_query.c \ - nv30/nv30_resource.c \ - nv30/nv30_resource.h \ - nv30/nv30_screen.c \ - nv30/nv30_screen.h \ - nv30/nv30_state.c \ - nv30/nv30_state.h \ - nv30/nv30_state_validate.c \ - nv30/nv30_texture.c \ - nv30/nv30_transfer.c \ - nv30/nv30_transfer.h \ - nv30/nv30_vbo.c \ - nv30/nv30_vertprog.c \ - nv30/nv30_vertprog.h \ - nv30/nv30_winsys.h \ - nv30/nv40_vertprog.h \ - nv30/nv40_verttex.c \ - nv30/nvfx_fragprog.c \ - nv30/nvfx_shader.h \ - nv30/nvfx_vertprog.c - -NV50_C_SOURCES := \ - nv50/g80_defs.xml.h \ - nv50/g80_texture.xml.h \ - nv50/nv50_2d.xml.h \ - nv50/nv50_3ddefs.xml.h \ - nv50/nv50_3d.xml.h \ - nv50/nv50_blit.h \ - nv50/nv50_compute.c \ - nv50/nv50_compute.xml.h \ - nv50/nv50_context.c \ - nv50/nv50_context.h \ - nv50/nv50_formats.c \ - nv50/nv50_miptree.c \ - nv50/nv50_program.c \ - nv50/nv50_program.h \ - nv50/nv50_push.c \ - nv50/nv50_query.c \ - nv50/nv50_query.h \ - nv50/nv50_query_hw.c \ - nv50/nv50_query_hw.h \ - nv50/nv50_query_hw_metric.c \ - nv50/nv50_query_hw_metric.h \ - nv50/nv50_query_hw_sm.c \ - nv50/nv50_query_hw_sm.h \ - nv50/nv50_resource.c \ - nv50/nv50_resource.h \ - nv50/nv50_screen.c \ - nv50/nv50_screen.h \ - nv50/nv50_shader_state.c \ - nv50/nv50_state.c \ - nv50/nv50_stateobj.h \ - nv50/nv50_stateobj_tex.h \ - nv50/nv50_state_validate.c \ - nv50/nv50_surface.c \ - nv50/nv50_tex.c \ - nv50/nv50_transfer.c \ - nv50/nv50_transfer.h \ - nv50/nv50_vbo.c \ - nv50/nv50_winsys.h \ - nv50/nv84_video_bsp.c \ - nv50/nv84_video.c \ - nv50/nv84_video.h \ - nv50/nv84_video_vp.c \ - nv50/nv98_video_bsp.c \ - nv50/nv98_video.c \ - nv50/nv98_video.h \ - nv50/nv98_video_ppp.c \ - nv50/nv98_video_vp.c - -NV50_CODEGEN_SOURCES := \ - codegen/nv50_ir.cpp \ - codegen/nv50_ir_bb.cpp \ - codegen/nv50_ir_build_util.cpp \ - codegen/nv50_ir_build_util.h \ - codegen/nv50_ir_driver.h \ - codegen/nv50_ir_emit_nv50.cpp \ - codegen/nv50_ir_from_common.cpp \ - codegen/nv50_ir_from_common.h \ - codegen/nv50_ir_from_nir.cpp \ - codegen/nv50_ir_from_tgsi.cpp \ - codegen/nv50_ir_graph.cpp \ - codegen/nv50_ir_graph.h \ - codegen/nv50_ir.h \ - codegen/nv50_ir_inlines.h \ - codegen/nv50_ir_lowering_helper.cpp \ - codegen/nv50_ir_lowering_helper.h \ - codegen/nv50_ir_lowering_nv50.cpp \ - codegen/nv50_ir_peephole.cpp \ - codegen/nv50_ir_print.cpp \ - codegen/nv50_ir_ra.cpp \ - codegen/nv50_ir_serialize.cpp \ - codegen/nv50_ir_ssa.cpp \ - codegen/nv50_ir_target.cpp \ - codegen/nv50_ir_target.h \ - codegen/nv50_ir_target_nv50.cpp \ - codegen/nv50_ir_target_nv50.h \ - codegen/nv50_ir_util.cpp \ - codegen/nv50_ir_util.h \ - codegen/unordered_set.h - -NVC0_CODEGEN_SOURCES := \ - codegen/nv50_ir_emit_gk110.cpp \ - codegen/nv50_ir_emit_gm107.cpp \ - codegen/nv50_ir_emit_gv100.cpp \ - codegen/nv50_ir_emit_gv100.h \ - codegen/nv50_ir_emit_nvc0.cpp \ - codegen/nv50_ir_lowering_gm107.cpp \ - codegen/nv50_ir_lowering_gm107.h \ - codegen/nv50_ir_lowering_gv100.cpp \ - codegen/nv50_ir_lowering_gv100.h \ - codegen/nv50_ir_lowering_nvc0.cpp \ - codegen/nv50_ir_lowering_nvc0.h \ - codegen/nv50_ir_target_gm107.cpp \ - codegen/nv50_ir_target_gm107.h \ - codegen/nv50_ir_target_gv100.cpp \ - codegen/nv50_ir_target_gv100.h \ - codegen/nv50_ir_target_nvc0.cpp \ - codegen/nv50_ir_target_nvc0.h - -NVC0_C_SOURCES := \ - nvc0/cla0c0qmd.h \ - nvc0/clc0c0qmd.h \ - nvc0/clc3c0qmd.h \ - nvc0/drf.h \ - nvc0/qmd.h \ - nvc0/qmda0c0.c \ - nvc0/qmdc0c0.c \ - nvc0/qmdc3c0.c \ - nvc0/gm107_texture.xml.h \ - nvc0/nvc0_3d.xml.h \ - nvc0/nvc0_compute.c \ - nvc0/nvc0_compute.xml.h \ - nvc0/nvc0_context.c \ - nvc0/nvc0_context.h \ - nvc0/nvc0_formats.c \ - nvc0/nvc0_m2mf.xml.h \ - nvc0/nvc0_macros.h \ - nvc0/nvc0_miptree.c \ - nvc0/nvc0_program.c \ - nvc0/nvc0_program.h \ - nvc0/nvc0_query.c \ - nvc0/nvc0_query.h \ - nvc0/nvc0_query_hw.c \ - nvc0/nvc0_query_hw.h \ - nvc0/nvc0_query_hw_metric.c \ - nvc0/nvc0_query_hw_metric.h \ - nvc0/nvc0_query_hw_sm.c \ - nvc0/nvc0_query_hw_sm.h \ - nvc0/nvc0_query_sw.c \ - nvc0/nvc0_query_sw.h \ - nvc0/nvc0_resource.c \ - nvc0/nvc0_resource.h \ - nvc0/nvc0_screen.c \ - nvc0/nvc0_screen.h \ - nvc0/nvc0_shader_state.c \ - nvc0/nvc0_state.c \ - nvc0/nvc0_stateobj.h \ - nvc0/nvc0_state_validate.c \ - nvc0/nvc0_surface.c \ - nvc0/nvc0_tex.c \ - nvc0/nvc0_transfer.c \ - nvc0/nvc0_vbo.c \ - nvc0/nvc0_vbo_translate.c \ - nvc0/nvc0_video_bsp.c \ - nvc0/nvc0_video.c \ - nvc0/nvc0_video.h \ - nvc0/nvc0_video_ppp.c \ - nvc0/nvc0_video_vp.c \ - nvc0/nvc0_winsys.h \ - nvc0/nve4_compute.c \ - nvc0/nve4_compute.h \ - nvc0/nve4_compute.xml.h \ - nvc0/nve4_copy.xml.h \ - nvc0/nve4_p2mf.xml.h diff --git a/src/gallium/drivers/panfrost/Android.mk b/src/gallium/drivers/panfrost/Android.mk deleted file mode 100644 index 48c4d52c711..00000000000 --- a/src/gallium/drivers/panfrost/Android.mk +++ /dev/null @@ -1,59 +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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(C_SOURCES) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/gallium/auxiliary/ \ - $(MESA_TOP)/src/gallium/include/ \ - $(MESA_TOP)/src/panfrost/include/ \ - $(MESA_TOP)/src/panfrost/ - -LOCAL_MODULE := libmesa_pipe_panfrost - -LOCAL_SHARED_LIBRARIES := libdrm - -LOCAL_STATIC_LIBRARIES := \ - libmesa_nir \ - libmesa_winsys_panfrost \ - libpanfrost_bifrost \ - libpanfrost_lib \ - libpanfrost_midgard \ - libpanfrost_shared \ - libpanfrost_util \ - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -ifneq ($(HAVE_GALLIUM_PANFROST),) -GALLIUM_TARGET_DRIVERS += panfrost -$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_panfrost) -$(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES)) -endif diff --git a/src/gallium/drivers/panfrost/Makefile.sources b/src/gallium/drivers/panfrost/Makefile.sources deleted file mode 100644 index 18f68512f1f..00000000000 --- a/src/gallium/drivers/panfrost/Makefile.sources +++ /dev/null @@ -1,19 +0,0 @@ -C_SOURCES := \ - pan_assemble.c \ - pan_blend_cso.c \ - pan_blend_cso.h \ - pan_blit.c \ - pan_cmdstream.c \ - pan_cmdstream.h \ - pan_compute.c \ - pan_context.c \ - pan_context.h \ - pan_job.c \ - pan_job.h \ - pan_mempool.c \ - pan_mempool.h \ - pan_public.h \ - pan_resource.c \ - pan_resource.h \ - pan_screen.c \ - pan_screen.h diff --git a/src/gallium/drivers/r300/Android.mk b/src/gallium/drivers/r300/Android.mk deleted file mode 100644 index 7b1c1055ef4..00000000000 --- a/src/gallium/drivers/r300/Android.mk +++ /dev/null @@ -1,48 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2011 Chia-I Wu -# Copyright (C) 2011 LunarG Inc. -# -# 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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(C_SOURCES) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/mesa - - -LOCAL_SHARED_LIBRARIES := libdrm_radeon -LOCAL_MODULE := libmesa_pipe_r300 - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -ifneq ($(HAVE_GALLIUM_R300),) -GALLIUM_TARGET_DRIVERS += r300 -$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_radeon) -$(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES)) -endif diff --git a/src/gallium/drivers/r300/Makefile.sources b/src/gallium/drivers/r300/Makefile.sources deleted file mode 100644 index 1ba6db00d7e..00000000000 --- a/src/gallium/drivers/r300/Makefile.sources +++ /dev/null @@ -1,110 +0,0 @@ -C_SOURCES := \ - r300_blit.c \ - r300_cb.h \ - r300_chipset.c \ - r300_chipset.h \ - r300_context.c \ - r300_context.h \ - r300_cs.h \ - r300_debug.c \ - r300_defines.h \ - r300_emit.c \ - r300_emit.h \ - r300_flush.c \ - r300_fs.c \ - r300_fs.h \ - r300_hyperz.c \ - r300_public.h \ - r300_query.c \ - r300_reg.h \ - r300_render.c \ - r300_render_stencilref.c \ - r300_render_translate.c \ - r300_resource.c \ - r300_screen_buffer.c \ - r300_screen_buffer.h \ - r300_screen.c \ - r300_screen.h \ - r300_shader_semantics.h \ - r300_state.c \ - r300_state_derived.c \ - r300_state_inlines.h \ - r300_texture.c \ - r300_texture_desc.c \ - r300_texture_desc.h \ - r300_texture.h \ - r300_tgsi_to_rc.c \ - r300_tgsi_to_rc.h \ - r300_transfer.c \ - r300_transfer.h \ - r300_vs.c \ - r300_vs_draw.c \ - r300_vs.h \ - \ - compiler/memory_pool.c \ - compiler/memory_pool.h \ - compiler/r300_fragprog.c \ - compiler/r300_fragprog_emit.c \ - compiler/r300_fragprog.h \ - compiler/r300_fragprog_swizzle.c \ - compiler/r300_fragprog_swizzle.h \ - compiler/r3xx_fragprog.c \ - compiler/r3xx_vertprog.c \ - compiler/r3xx_vertprog_dump.c \ - compiler/r500_fragprog.c \ - compiler/r500_fragprog_emit.c \ - compiler/r500_fragprog.h \ - compiler/radeon_code.c \ - compiler/radeon_code.h \ - compiler/radeon_compiler.c \ - compiler/radeon_compiler.h \ - compiler/radeon_compiler_util.c \ - compiler/radeon_compiler_util.h \ - compiler/radeon_dataflow.c \ - compiler/radeon_dataflow_deadcode.c \ - compiler/radeon_dataflow.h \ - compiler/radeon_dataflow_swizzles.c \ - compiler/radeon_emulate_branches.c \ - compiler/radeon_emulate_branches.h \ - compiler/radeon_emulate_loops.c \ - compiler/radeon_emulate_loops.h \ - compiler/radeon_inline_literals.c \ - compiler/radeon_list.c \ - compiler/radeon_list.h \ - compiler/radeon_opcodes.c \ - compiler/radeon_opcodes.h \ - compiler/radeon_optimize.c \ - compiler/radeon_pair_dead_sources.c \ - compiler/radeon_pair_regalloc.c \ - compiler/radeon_pair_schedule.c \ - compiler/radeon_pair_translate.c \ - compiler/radeon_program_alu.c \ - compiler/radeon_program_alu.h \ - compiler/radeon_program.c \ - compiler/radeon_program_constants.h \ - compiler/radeon_program.h \ - compiler/radeon_program_pair.c \ - compiler/radeon_program_pair.h \ - compiler/radeon_program_print.c \ - compiler/radeon_program_tex.c \ - compiler/radeon_program_tex.h \ - compiler/radeon_regalloc.h \ - compiler/radeon_remove_constants.c \ - compiler/radeon_remove_constants.h \ - compiler/radeon_rename_regs.c \ - compiler/radeon_rename_regs.h \ - compiler/radeon_swizzle.h \ - compiler/radeon_variable.c \ - compiler/radeon_variable.h \ - compiler/radeon_vert_fc.c - -COMPILER_TESTS_SOURCES := \ - compiler/tests/r300_compiler_tests.c \ - compiler/tests/r300_compiler_tests.h \ - compiler/tests/radeon_compiler_optimize_tests.c \ - compiler/tests/radeon_compiler_regalloc_tests.c \ - compiler/tests/radeon_compiler_util_tests.c \ - compiler/tests/rc_test_helpers.c \ - compiler/tests/rc_test_helpers.h \ - compiler/tests/unit_test.c \ - compiler/tests/unit_test.h diff --git a/src/gallium/drivers/r600/Android.mk b/src/gallium/drivers/r600/Android.mk deleted file mode 100644 index 296aa3ac9b9..00000000000 --- a/src/gallium/drivers/r600/Android.mk +++ /dev/null @@ -1,65 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2010-2011 Chia-I Wu -# Copyright (C) 2010-2011 LunarG Inc. -# -# 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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(C_SOURCES) $(CXX_SOURCES) - -LOCAL_C_INCLUDES += \ - $(MESA_TOP)/src/amd/common \ - $(MESA_TOP)/src/amd/llvm \ - $(MESA_TOP)/src/mesa - -LOCAL_STATIC_LIBRARIES := libmesa_nir -LOCAL_SHARED_LIBRARIES := libdrm_radeon -LOCAL_MODULE := libmesa_pipe_r600 - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -intermediates := $(call local-generated-sources-dir) - -LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, $(R600_GENERATED_FILES)) - -$(intermediates)/egd_tables.h: $(MESA_TOP)/src/gallium/drivers/r600/egd_tables.py $(MESA_TOP)/src/gallium/drivers/r600/evergreend.h - @mkdir -p $(dir $@) - @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(MESA_PYTHON2) $(MESA_TOP)/src/gallium/drivers/r600/egd_tables.py $(MESA_TOP)/src/gallium/drivers/r600/evergreend.h > $@ - -ifeq ($(MESA_ENABLE_LLVM),true) -$(call mesa-build-with-llvm) -endif - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -ifneq ($(HAVE_GALLIUM_R600),) -GALLIUM_TARGET_DRIVERS += r600 -$(eval GALLIUM_LIBS += \ - $(LOCAL_MODULE) \ - libmesa_winsys_radeon) -$(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES)) -endif diff --git a/src/gallium/drivers/r600/Makefile.sources b/src/gallium/drivers/r600/Makefile.sources deleted file mode 100644 index 09b5f5e2c4c..00000000000 --- a/src/gallium/drivers/r600/Makefile.sources +++ /dev/null @@ -1,170 +0,0 @@ - -C_SOURCES = \ - r600d_common.h \ - compute_memory_pool.c \ - compute_memory_pool.h \ - eg_asm.c \ - eg_debug.c \ - eg_sq.h \ - evergreen_compute.c \ - evergreen_compute.h \ - evergreen_compute_internal.h \ - evergreend.h \ - evergreen_hw_context.c \ - evergreen_state.c \ - r600_asm.c \ - r600_asm.h \ - r600_blit.c \ - r600d.h \ - r600_dump.c \ - r600_dump.h \ - r600_formats.h \ - r600_hw_context.c \ - r600_isa.c \ - r600_isa.h \ - r600_opcodes.h \ - r600_pipe.c \ - r600_pipe.h \ - r600_public.h \ - r600_shader.c \ - r600_shader.h \ - r600_sq.h \ - r600_state.c \ - r600_state_common.c \ - r600_uvd.c \ - r700_asm.c \ - r700_sq.h \ - cayman_msaa.c \ - r600_buffer_common.c \ - r600_cs.h \ - r600_gpu_load.c \ - r600_perfcounter.c \ - r600_pipe_common.c \ - r600_pipe_common.h \ - r600_query.c \ - r600_query.h \ - r600_streamout.c \ - r600_test_dma.c \ - r600_texture.c \ - r600_viewport.c \ - radeon_uvd.c \ - radeon_uvd.h \ - radeon_vce.c \ - radeon_vce.h \ - radeon_video.c \ - radeon_video.h - -CXX_SOURCES = \ - sb/sb_bc_builder.cpp \ - sb/sb_bc_decoder.cpp \ - sb/sb_bc_dump.cpp \ - sb/sb_bc_finalize.cpp \ - sb/sb_bc.h \ - sb/sb_bc_parser.cpp \ - sb/sb_context.cpp \ - sb/sb_core.cpp \ - sb/sb_dce_cleanup.cpp \ - sb/sb_def_use.cpp \ - sb/sb_dump.cpp \ - sb/sb_expr.cpp \ - sb/sb_expr.h \ - sb/sb_gcm.cpp \ - sb/sb_gvn.cpp \ - sb/sb_if_conversion.cpp \ - sb/sb_ir.cpp \ - sb/sb_ir.h \ - sb/sb_liveness.cpp \ - sb/sb_pass.cpp \ - sb/sb_pass.h \ - sb/sb_peephole.cpp \ - sb/sb_psi_ops.cpp \ - sb/sb_public.h \ - sb/sb_ra_checker.cpp \ - sb/sb_ra_coalesce.cpp \ - sb/sb_ra_init.cpp \ - sb/sb_sched.cpp \ - sb/sb_sched.h \ - sb/sb_shader.cpp \ - sb/sb_shader.h \ - sb/sb_ssa_builder.cpp \ - sb/sb_valtable.cpp \ - sfn/sfn_alu_defines.cpp \ - sfn/sfn_alu_defines.h \ - sfn/sfn_callstack.cpp \ - sfn/sfn_callstack.h \ - sfn/sfn_conditionaljumptracker.cpp \ - sfn/sfn_conditionaljumptracker.h \ - sfn/sfn_defines.h \ - sfn/sfn_debug.cpp \ - sfn/sfn_debug.h \ - sfn/sfn_emitaluinstruction.cpp \ - sfn/sfn_emitaluinstruction.h \ - sfn/sfn_emitinstruction.cpp \ - sfn/sfn_emitinstruction.h \ - sfn/sfn_emitssboinstruction.cpp \ - sfn/sfn_emitssboinstruction.h \ - sfn/sfn_emittexinstruction.cpp \ - sfn/sfn_emittexinstruction.h \ - sfn/sfn_emitinstruction.h \ - sfn/sfn_instruction_alu.cpp \ - sfn/sfn_instruction_alu.h \ - sfn/sfn_instruction_base.cpp \ - sfn/sfn_instruction_base.h \ - sfn/sfn_instruction_block.cpp \ - sfn/sfn_instruction_block.h \ - sfn/sfn_instruction_cf.cpp \ - sfn/sfn_instruction_cf.h \ - sfn/sfn_instruction_export.cpp \ - sfn/sfn_instruction_export.h \ - sfn/sfn_instruction_fetch.cpp \ - sfn/sfn_instruction_fetch.h \ - sfn/sfn_instruction_lds.cpp \ - sfn/sfn_instruction_lds.h \ - sfn/sfn_instruction_gds.cpp \ - sfn/sfn_instruction_gds.h \ - sfn/sfn_instruction_misc.cpp \ - sfn/sfn_instruction_misc.h \ - sfn/sfn_instruction_tex.cpp \ - sfn/sfn_instruction_tex.h \ - sfn/sfn_ir_to_assembly.cpp \ - sfn/sfn_ir_to_assembly.h \ - sfn/sfn_liverange.cpp \ - sfn/sfn_liverange.h \ - sfn/sfn_nir.cpp \ - sfn/sfn_nir.h \ - sfn/sfn_nir_legalize_image_load_store.cpp \ - sfn/sfn_nir_lower_alu.cpp \ - sfn/sfn_nir_lower_alu.h \ - sfn/sfn_nir_lower_64bit.cpp \ - sfn/sfn_nir_lower_fs_out_to_vector.cpp \ - sfn/sfn_nir_lower_fs_out_to_vector.h \ - sfn/sfn_nir_lower_tess_io.cpp \ - sfn/sfn_nir_vectorize_vs_inputs.c \ - sfn/sfn_shader_base.cpp \ - sfn/sfn_shader_base.h \ - sfn/sfn_shader_compute.cpp \ - sfn/sfn_shader_compute.h \ - sfn/sfn_shader_fragment.cpp \ - sfn/sfn_shader_fragment.h \ - sfn/sfn_shader_geometry.cpp \ - sfn/sfn_shader_geometry.h \ - sfn/sfn_shader_tcs.cpp \ - sfn/sfn_shader_tcs.h \ - sfn/sfn_shader_tess_eval.cpp \ - sfn/sfn_shader_tess_eval.h \ - sfn/sfn_shader_vertex.cpp \ - sfn/sfn_shader_vertex.h \ - sfn/sfn_shaderio.cpp \ - sfn/sfn_shaderio.h \ - sfn/sfn_value.cpp \ - sfn/sfn_value.h \ - sfn/sfn_value_gpr.cpp \ - sfn/sfn_value_gpr.h \ - sfn/sfn_valuepool.cpp \ - sfn/sfn_valuepool.h \ - sfn/sfn_vertexstageexport.cpp \ - sfn/sfn_vertexstageexport.h - -R600_GENERATED_FILES = \ - egd_tables.h \ - sfn_nir_algebraic.c diff --git a/src/gallium/drivers/radeonsi/Android.mk b/src/gallium/drivers/radeonsi/Android.mk deleted file mode 100644 index 75f30f6212f..00000000000 --- a/src/gallium/drivers/radeonsi/Android.mk +++ /dev/null @@ -1,71 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2010-2011 Chia-I Wu -# Copyright (C) 2010-2011 LunarG Inc. -# -# 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. - -ifeq ($(MESA_ENABLE_LLVM),true) - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES and GENERATED_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(C_SOURCES) - -LOCAL_CFLAGS += -DFORCE_BUILD_AMDGPU # instructs LLVM to declare LLVMInitializeAMDGPU* functions - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/amd/common \ - $(MESA_TOP)/src/amd/llvm \ - $(MESA_TOP)/src/compiler/nir \ - $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_amd_common,,)/common \ - $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir - -LOCAL_STATIC_LIBRARIES := \ - libmesa_amd_common \ - libmesa_galliumvl - -LOCAL_SHARED_LIBRARIES := libdrm_radeon -LOCAL_MODULE := libmesa_pipe_radeonsi - -# We need to get NIR's generated headers. -LOCAL_GENERATED_SOURCES := $(MESA_GEN_NIR_H) - -$(call mesa-build-with-llvm) - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -ifneq ($(HAVE_GALLIUM_RADEONSI),) -GALLIUM_TARGET_DRIVERS += radeonsi -$(eval GALLIUM_LIBS += \ - $(LOCAL_MODULE) \ - $(LOCAL_STATIC_LIBRARIES) \ - libmesa_winsys_radeon \ - libmesa_winsys_amdgpu) -$(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES)) -endif - -endif # MESA_ENABLE_LLVM==true diff --git a/src/gallium/drivers/radeonsi/Makefile.sources b/src/gallium/drivers/radeonsi/Makefile.sources deleted file mode 100644 index 55ef8085644..00000000000 --- a/src/gallium/drivers/radeonsi/Makefile.sources +++ /dev/null @@ -1,75 +0,0 @@ -C_SOURCES := \ - driinfo_radeonsi.h \ - gfx10_query.c \ - gfx10_shader_ngg.c \ - si_blit.c \ - si_buffer.c \ - si_build_pm4.h \ - si_clear.c \ - si_compute.c \ - si_compute_prim_discard.c \ - si_compute.h \ - si_compute_blit.c \ - si_cp_dma.c \ - si_cp_reg_shadowing.c \ - si_debug.c \ - si_descriptors.c \ - si_fence.c \ - si_get.c \ - si_gfx_cs.c \ - si_gpu_load.c \ - si_pipe.c \ - si_pipe.h \ - si_pm4.c \ - si_pm4.h \ - si_perfcounter.c \ - si_public.h \ - si_query.c \ - si_query.h \ - si_shader.c \ - si_shader.h \ - si_shader_internal.h \ - si_shader_llvm.c \ - si_shader_llvm_gs.c \ - si_shader_llvm_ps.c \ - si_shader_llvm_resources.c \ - si_shader_llvm_tess.c \ - si_shader_llvm_vs.c \ - si_shader_nir.c \ - si_shaderlib_nir.c \ - si_shaderlib_tgsi.c \ - si_sqtt.c \ - si_state.c \ - si_state_binning.c \ - si_state_draw.cpp \ - si_state_msaa.c \ - si_state_shaders.c \ - si_state_streamout.c \ - si_state_viewport.c \ - si_state.h \ - si_test_blit.c \ - si_test_dma_perf.c \ - si_texture.c \ - si_uvd.c \ - ../radeon/radeon_uvd.c \ - ../radeon/radeon_uvd.h \ - ../radeon/radeon_vcn_dec_jpeg.c \ - ../radeon/radeon_vcn_dec.c \ - ../radeon/radeon_vcn_dec.h \ - ../radeon/radeon_vcn_av1_default.h \ - ../radeon/radeon_vcn_enc_1_2.c \ - ../radeon/radeon_vcn_enc_2_0.c \ - ../radeon/radeon_vcn_enc_3_0.c \ - ../radeon/radeon_vcn_enc.c \ - ../radeon/radeon_vcn_enc.h \ - ../radeon/radeon_uvd_enc_1_1.c \ - ../radeon/radeon_uvd_enc.c \ - ../radeon/radeon_uvd_enc.h \ - ../radeon/radeon_vce_40_2_2.c \ - ../radeon/radeon_vce_50.c \ - ../radeon/radeon_vce_52.c \ - ../radeon/radeon_vce.c \ - ../radeon/radeon_vce.h \ - ../radeon/radeon_video.c \ - ../radeon/radeon_video.h \ - ../radeon/radeon_winsys.h diff --git a/src/gallium/drivers/softpipe/Android.mk b/src/gallium/drivers/softpipe/Android.mk deleted file mode 100644 index 7e879161090..00000000000 --- a/src/gallium/drivers/softpipe/Android.mk +++ /dev/null @@ -1,42 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2010-2011 Chia-I Wu -# Copyright (C) 2010-2011 LunarG Inc. -# -# 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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(C_SOURCES) - -LOCAL_MODULE := libmesa_pipe_softpipe - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -ifneq ($(HAVE_GALLIUM_SOFTPIPE),) -GALLIUM_TARGET_DRIVERS += swrast kms_swrast -$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_sw_dri libmesa_winsys_sw_kms_dri) -endif diff --git a/src/gallium/drivers/softpipe/Makefile.sources b/src/gallium/drivers/softpipe/Makefile.sources deleted file mode 100644 index e405ef27f85..00000000000 --- a/src/gallium/drivers/softpipe/Makefile.sources +++ /dev/null @@ -1,56 +0,0 @@ -C_SOURCES := \ - sp_buffer.c \ - sp_buffer.h \ - sp_clear.c \ - sp_clear.h \ - sp_context.c \ - sp_context.h \ - sp_compute.c \ - sp_draw_arrays.c \ - sp_fence.c \ - sp_fence.h \ - sp_flush.c \ - sp_flush.h \ - sp_fs_exec.c \ - sp_fs.h \ - sp_image.c \ - sp_image.h \ - sp_limits.h \ - sp_prim_vbuf.c \ - sp_prim_vbuf.h \ - sp_public.h \ - sp_quad_blend.c \ - sp_quad_depth_test.c \ - sp_quad_depth_test_tmp.h \ - sp_quad_fs.c \ - sp_quad.h \ - sp_quad_pipe.c \ - sp_quad_pipe.h \ - sp_quad_stipple.c \ - sp_query.c \ - sp_query.h \ - sp_screen.c \ - sp_screen.h \ - sp_setup.c \ - sp_setup.h \ - sp_state_blend.c \ - sp_state_clip.c \ - sp_state_derived.c \ - sp_state_image.c \ - sp_state.h \ - sp_state_rasterizer.c \ - sp_state_sampler.c \ - sp_state_shader.c \ - sp_state_so.c \ - sp_state_surface.c \ - sp_state_vertex.c \ - sp_surface.c \ - sp_surface.h \ - sp_tex_sample.c \ - sp_tex_sample.h \ - sp_tex_tile_cache.c \ - sp_tex_tile_cache.h \ - sp_texture.c \ - sp_texture.h \ - sp_tile_cache.c \ - sp_tile_cache.h diff --git a/src/gallium/drivers/svga/Android.mk b/src/gallium/drivers/svga/Android.mk deleted file mode 100644 index edb69bf2bfd..00000000000 --- a/src/gallium/drivers/svga/Android.mk +++ /dev/null @@ -1,45 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2010-2011 Chia-I Wu -# Copyright (C) 2010-2011 LunarG Inc. -# -# 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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(C_SOURCES) - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/include - -LOCAL_MODULE := libmesa_pipe_svga - -LOCAL_STATIC_LIBRARIES += libmesa_git_sha1 - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -ifneq ($(HAVE_GALLIUM_VMWGFX),) -GALLIUM_TARGET_DRIVERS += vmwgfx -$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_svga) -endif diff --git a/src/gallium/drivers/svga/Makefile.sources b/src/gallium/drivers/svga/Makefile.sources deleted file mode 100644 index 2b57ae6d091..00000000000 --- a/src/gallium/drivers/svga/Makefile.sources +++ /dev/null @@ -1,108 +0,0 @@ -C_SOURCES := \ - svga_cmd.c \ - svga_cmd.h \ - svga_cmd_vgpu10.c \ - svga_context.c \ - svga_context.h \ - svga_debug.h \ - svga_draw_arrays.c \ - svga_draw.c \ - svga_draw_elements.c \ - svga_draw.h \ - svga_draw_private.h \ - svga_format.c \ - svga_format.h \ - svga_hw_reg.h \ - svga_link.c \ - svga_link.h \ - svga_mksstats.h \ - svga_pipe_blend.c \ - svga_pipe_blit.c \ - svga_pipe_clear.c \ - svga_pipe_constants.c \ - svga_pipe_depthstencil.c \ - svga_pipe_draw.c \ - svga_pipe_flush.c \ - svga_pipe_fs.c \ - svga_pipe_gs.c \ - svga_pipe_misc.c \ - svga_pipe_query.c \ - svga_pipe_rasterizer.c \ - svga_pipe_sampler.c \ - svga_pipe_streamout.c \ - svga_pipe_vertex.c \ - svga_pipe_ts.c \ - svga_pipe_vs.c \ - svga_public.h \ - svga_resource_buffer.c \ - svga_resource_buffer.h \ - svga_resource_buffer_upload.c \ - svga_resource_buffer_upload.h \ - svga_resource.c \ - svga_resource.h \ - svga_resource_texture.c \ - svga_resource_texture.h \ - svga_sampler_view.c \ - svga_sampler_view.h \ - svga_screen.c \ - svga_screen_cache.c \ - svga_screen_cache.h \ - svga_screen.h \ - svga_shader.c \ - svga_shader.h \ - svga_state.c \ - svga_state.h \ - svga_state_constants.c \ - svga_state_framebuffer.c \ - svga_state_fs.c \ - svga_state_gs.c \ - svga_state_need_swtnl.c \ - svga_state_rss.c \ - svga_state_sampler.c \ - svga_state_tgsi_transform.c \ - svga_state_tss.c \ - svga_state_vdecl.c \ - svga_state_ts.c \ - svga_state_vs.c \ - svga_streamout.h \ - svga_surface.c \ - svga_surface.h \ - svga_swtnl_backend.c \ - svga_swtnl_draw.c \ - svga_swtnl.h \ - svga_swtnl_private.h \ - svga_swtnl_state.c \ - svga_tgsi.c \ - svga_tgsi_decl_sm30.c \ - svga_tgsi_emit.h \ - svga_tgsi.h \ - svga_tgsi_insn.c \ - svga_tgsi_vgpu10.c \ - svga_winsys.h \ - \ - svgadump/svga_dump.c \ - svgadump/svga_dump.h \ - svgadump/svga_shader_dump.c \ - svgadump/svga_shader_dump.h \ - svgadump/svga_shader.h \ - svgadump/svga_shader_op.c \ - svgadump/svga_shader_op.h - -SVGA_H_FILES := \ - include/includeCheck.h \ - include/svga3d_caps.h \ - include/svga3d_cmd.h \ - include/svga3d_devcaps.h \ - include/svga3d_dx.h \ - include/svga3d_limits.h \ - include/svga3d_reg.h \ - include/svga3d_shaderdefs.h \ - include/svga3d_surfacedefs.h \ - include/svga3d_types.h \ - include/svga_escape.h \ - include/svga_overlay.h \ - include/svga_reg.h \ - include/svga_types.h \ - include/VGPU10ShaderTokens.h \ - include/vmware_pack_begin.h \ - include/vmware_pack_end.h diff --git a/src/gallium/drivers/tegra/Makefile.sources b/src/gallium/drivers/tegra/Makefile.sources deleted file mode 100644 index af4ff838c7c..00000000000 --- a/src/gallium/drivers/tegra/Makefile.sources +++ /dev/null @@ -1,6 +0,0 @@ -C_SOURCES := \ - tegra_context.c \ - tegra_context.h \ - tegra_resource.h \ - tegra_screen.c \ - tegra_screen.h diff --git a/src/gallium/drivers/v3d/Makefile.sources b/src/gallium/drivers/v3d/Makefile.sources deleted file mode 100644 index c81ccb42013..00000000000 --- a/src/gallium/drivers/v3d/Makefile.sources +++ /dev/null @@ -1,36 +0,0 @@ -C_SOURCES := \ - v3d_blit.c \ - v3d_bufmgr.c \ - v3d_bufmgr.h \ - v3d_cl.c \ - v3d_cl.h \ - v3d_context.c \ - v3d_context.h \ - v3d_fence.c \ - v3d_formats.c \ - v3d_format_table.h \ - v3d_job.c \ - v3d_program.c \ - v3d_query.c \ - v3d_resource.c \ - v3d_resource.h \ - v3d_screen.c \ - v3d_screen.h \ - v3d_simulator.c \ - v3d_simulator_wrapper.cpp \ - v3d_simulator_wrapper.h \ - v3d_tiling.c \ - v3d_tiling.h \ - v3d_uniforms.c \ - $() - -V3D_PER_VERSION_SOURCES = \ - v3dx_context.h \ - v3dx_draw.c \ - v3dx_emit.c \ - v3dx_format_table.c \ - v3dx_job.c \ - v3dx_rcl.c \ - v3dx_simulator.c \ - v3dx_state.c \ - $() diff --git a/src/gallium/drivers/vc4/Android.mk b/src/gallium/drivers/vc4/Android.mk deleted file mode 100644 index 45c95b649a2..00000000000 --- a/src/gallium/drivers/vc4/Android.mk +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright (C) 2014 Emil Velikov -# -# 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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(C_SOURCES) - -ifeq ($(ARCH_ARM_HAVE_NEON),true) -LOCAL_SRC_FILES += $(NEON_C_SOURCES) -endif - -LOCAL_GENERATED_SOURCES := $(MESA_GEN_NIR_H) -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/include - -# We need libmesa_nir to get NIR's generated include directories. -LOCAL_STATIC_LIBRARIES := \ - libmesa_nir - -LOCAL_WHOLE_STATIC_LIBRARIES := \ - libmesa_broadcom_cle \ - libmesa_broadcom_genxml - -LOCAL_MODULE := libmesa_pipe_vc4 - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -ifneq ($(HAVE_GALLIUM_VC4),) -GALLIUM_TARGET_DRIVERS += vc4 -$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_vc4) -endif diff --git a/src/gallium/drivers/vc4/Makefile.sources b/src/gallium/drivers/vc4/Makefile.sources deleted file mode 100644 index 76dea7041b7..00000000000 --- a/src/gallium/drivers/vc4/Makefile.sources +++ /dev/null @@ -1,64 +0,0 @@ -C_SOURCES := \ - kernel/vc4_drv.h \ - kernel/vc4_gem.c \ - kernel/vc4_packet.h \ - kernel/vc4_render_cl.c \ - kernel/vc4_validate.c \ - kernel/vc4_validate_shaders.c \ - vc4_blit.c \ - vc4_bufmgr.c \ - vc4_bufmgr.h \ - vc4_cl.c \ - vc4_cl_dump.c \ - vc4_cl_dump.h \ - vc4_cl.h \ - vc4_context.c \ - vc4_context.h \ - vc4_draw.c \ - vc4_emit.c \ - vc4_fence.c \ - vc4_formats.c \ - vc4_job.c \ - vc4_nir_lower_blend.c \ - vc4_nir_lower_io.c \ - vc4_nir_lower_txf_ms.c \ - vc4_opt_algebraic.c \ - vc4_opt_constant_folding.c \ - vc4_opt_copy_propagation.c \ - vc4_opt_dead_code.c \ - vc4_opt_peephole_sf.c \ - vc4_opt_small_immediates.c \ - vc4_opt_vpm.c \ - vc4_opt_coalesce_ff_writes.c \ - vc4_program.c \ - vc4_qir.c \ - vc4_qir_emit_uniform_stream_resets.c \ - vc4_qir_live_variables.c \ - vc4_qir_lower_uniforms.c \ - vc4_qir_schedule.c \ - vc4_qir_validate.c \ - vc4_qir.h \ - vc4_qpu.c \ - vc4_qpu_defines.h \ - vc4_qpu_disasm.c \ - vc4_qpu_emit.c \ - vc4_qpu.h \ - vc4_qpu_schedule.c \ - vc4_qpu_validate.c \ - vc4_query.c \ - vc4_register_allocate.c \ - vc4_reorder_uniforms.c \ - vc4_resource.c \ - vc4_resource.h \ - vc4_screen.c \ - vc4_screen.h \ - vc4_simulator.c \ - vc4_simulator_validate.h \ - vc4_state.c \ - vc4_tiling.c \ - vc4_tiling_lt.c \ - vc4_tiling.h \ - vc4_uniforms.c \ - $() - -NEON_C_SOURCES := vc4_tiling_lt_neon.c diff --git a/src/gallium/drivers/virgl/Android.mk b/src/gallium/drivers/virgl/Android.mk deleted file mode 100644 index a64828e90f0..00000000000 --- a/src/gallium/drivers/virgl/Android.mk +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright (C) 2014 Emil Velikov -# -# 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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(C_SOURCES) - -LOCAL_MODULE := libmesa_pipe_virgl - -LOCAL_C_INCLUDES := $(MESA_TOP)/src/virtio - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -ifneq ($(HAVE_GALLIUM_VIRGL),) -GALLIUM_TARGET_DRIVERS += virtio_gpu -$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_virgl_common libmesa_winsys_virgl libmesa_winsys_virgl_vtest) -endif diff --git a/src/gallium/drivers/virgl/Makefile.sources b/src/gallium/drivers/virgl/Makefile.sources deleted file mode 100644 index c8372677f70..00000000000 --- a/src/gallium/drivers/virgl/Makefile.sources +++ /dev/null @@ -1,20 +0,0 @@ -C_SOURCES := \ - virgl_buffer.c \ - virgl_context.c \ - virgl_context.h \ - virgl_encode.c \ - virgl_encode.h \ - virgl_public.h \ - virgl_query.c \ - virgl_resource.c \ - virgl_resource.h \ - virgl_screen.c \ - virgl_screen.h \ - virgl_staging_mgr.c \ - virgl_staging_mgr.h \ - virgl_streamout.c \ - virgl_texture.c \ - virgl_tgsi.c \ - virgl_transfer_queue.c \ - virgl_transfer_queue.h \ - virgl_winsys.h diff --git a/src/gallium/frontends/clover/Makefile.sources b/src/gallium/frontends/clover/Makefile.sources deleted file mode 100644 index 534574178c3..00000000000 --- a/src/gallium/frontends/clover/Makefile.sources +++ /dev/null @@ -1,70 +0,0 @@ -CPP_SOURCES := \ - api/context.cpp \ - api/device.cpp \ - api/dispatch.cpp \ - api/dispatch.hpp \ - api/event.cpp \ - api/interop.cpp \ - api/kernel.cpp \ - api/memory.cpp \ - api/platform.cpp \ - api/program.cpp \ - api/queue.cpp \ - api/sampler.cpp \ - api/transfer.cpp \ - api/util.hpp \ - core/context.cpp \ - core/context.hpp \ - core/device.cpp \ - core/device.hpp \ - core/error.hpp \ - core/event.cpp \ - core/event.hpp \ - core/format.cpp \ - core/format.hpp \ - core/kernel.cpp \ - core/kernel.hpp \ - core/memory.cpp \ - core/memory.hpp \ - core/module.cpp \ - core/module.hpp \ - core/object.hpp \ - core/platform.cpp \ - core/platform.hpp \ - core/printf.cpp \ - core/printf.hpp \ - core/program.cpp \ - core/program.hpp \ - core/property.hpp \ - core/queue.cpp \ - core/queue.hpp \ - core/resource.cpp \ - core/resource.hpp \ - core/sampler.cpp \ - core/sampler.hpp \ - core/timestamp.cpp \ - core/timestamp.hpp \ - util/adaptor.hpp \ - util/algebra.hpp \ - util/algorithm.hpp \ - util/factor.hpp \ - util/functional.hpp \ - util/lazy.hpp \ - util/pointer.hpp \ - util/range.hpp \ - util/tuple.hpp - -LLVM_SOURCES := \ - llvm/codegen/bitcode.cpp \ - llvm/codegen/common.cpp \ - llvm/codegen/native.cpp \ - llvm/codegen.hpp \ - llvm/compat.hpp \ - llvm/invocation.cpp \ - llvm/invocation.hpp \ - llvm/metadata.hpp \ - llvm/util.hpp - -SPIRV_SOURCES := \ - spirv/invocation.cpp \ - spirv/invocation.hpp diff --git a/src/gallium/frontends/dri/Android.mk b/src/gallium/frontends/dri/Android.mk deleted file mode 100644 index d6f8a6ed247..00000000000 --- a/src/gallium/frontends/dri/Android.mk +++ /dev/null @@ -1,55 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2015 Chih-Wei Huang -# Copyright (C) 2015 Android-x86 Open Source Project -# -# 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. - -LOCAL_PATH := $(call my-dir) - -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(common_SOURCES) \ - $(dri2_SOURCES) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/mesa - -LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(LOCAL_PATH) \ - $(LOCAL_C_INCLUDES) - -LOCAL_STATIC_LIBRARIES := \ - libmesa_dri_common - -ifneq ($(HAVE_GALLIUM_SOFTPIPE),) -LOCAL_SRC_FILES += $(drisw_SOURCES) -LOCAL_CFLAGS += -DGALLIUM_SOFTPIPE -endif - -LOCAL_MODULE := libmesa_st_dri - -LOCAL_GENERATED_SOURCES := $(MESA_DRI_OPTIONS_H) - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/frontends/dri/Makefile.sources b/src/gallium/frontends/dri/Makefile.sources deleted file mode 100644 index a610293bb11..00000000000 --- a/src/gallium/frontends/dri/Makefile.sources +++ /dev/null @@ -1,17 +0,0 @@ -common_SOURCES := \ - dri_context.c \ - dri_context.h \ - dri_drawable.c \ - dri_drawable.h \ - dri_helpers.c \ - dri_helpers.h \ - dri_query_renderer.c \ - dri_query_renderer.h \ - dri_screen.c \ - dri_screen.h - -dri2_SOURCES := \ - dri2.c - -drisw_SOURCES := \ - drisw.c diff --git a/src/gallium/frontends/glx/xlib/Makefile.sources b/src/gallium/frontends/glx/xlib/Makefile.sources deleted file mode 100644 index 9e31a70eb3e..00000000000 --- a/src/gallium/frontends/glx/xlib/Makefile.sources +++ /dev/null @@ -1,9 +0,0 @@ -C_SOURCES := \ - glx_api.c \ - glx_getproc.c \ - glx_usefont.c \ - xm_api.c \ - xm_api.h \ - xm_public.h \ - xm_st.c \ - xm_st.h diff --git a/src/gallium/frontends/nine/Makefile.sources b/src/gallium/frontends/nine/Makefile.sources deleted file mode 100644 index 56698a19f10..00000000000 --- a/src/gallium/frontends/nine/Makefile.sources +++ /dev/null @@ -1,82 +0,0 @@ -C_SOURCES := \ - adapter9.c \ - adapter9.h \ - authenticatedchannel9.c \ - authenticatedchannel9.h \ - basetexture9.c \ - basetexture9.h \ - buffer9.c \ - buffer9.h \ - cryptosession9.c \ - cryptosession9.h \ - cubetexture9.c \ - cubetexture9.h \ - device9.c \ - device9.h \ - device9ex.c \ - device9ex.h \ - device9video.c \ - device9video.h \ - guid.c \ - guid.h \ - indexbuffer9.c \ - indexbuffer9.h \ - iunknown.c \ - iunknown.h \ - nine_buffer_upload.c \ - nine_buffer_upload.h \ - nine_csmt_helper.h \ - nine_debug.c \ - nine_debug.h \ - nine_defines.h \ - nine_dump.c \ - nine_dump.h \ - nineexoverlayextension.c \ - nineexoverlayextension.h \ - nine_ff.c \ - nine_ff.h \ - nine_flags.h \ - nine_helpers.c \ - nine_helpers.h \ - nine_limits.h \ - nine_lock.c \ - nine_lock.h \ - nine_pdata.h \ - nine_pipe.c \ - nine_pipe.h \ - nine_quirk.c \ - nine_quirk.h \ - nine_queue.c \ - nine_queue.h \ - nine_shader.c \ - nine_shader.h \ - nine_state.c \ - nine_state.h \ - pixelshader9.c \ - pixelshader9.h \ - query9.c \ - query9.h \ - resource9.c \ - resource9.h \ - stateblock9.c \ - stateblock9.h \ - surface9.c \ - surface9.h \ - swapchain9.c \ - swapchain9ex.c \ - swapchain9ex.h \ - swapchain9.h \ - texture9.c \ - texture9.h \ - threadpool.c \ - threadpool.h \ - vertexbuffer9.c \ - vertexbuffer9.h \ - vertexdeclaration9.c \ - vertexdeclaration9.h \ - vertexshader9.c \ - vertexshader9.h \ - volume9.c \ - volume9.h \ - volumetexture9.c \ - volumetexture9.h diff --git a/src/gallium/frontends/omx/Makefile.sources b/src/gallium/frontends/omx/Makefile.sources deleted file mode 100644 index 0fb1d9a4d76..00000000000 --- a/src/gallium/frontends/omx/Makefile.sources +++ /dev/null @@ -1,9 +0,0 @@ -C_SOURCES := \ - vid_dec_common.c \ - vid_dec_common.h \ - vid_dec_h264_common.c \ - vid_dec_h264_common.h \ - vid_omx_common.c \ - vid_omx_common.h \ - vid_enc_common.c \ - vid_enc_common.h diff --git a/src/gallium/frontends/omx/bellagio/Makefile.sources b/src/gallium/frontends/omx/bellagio/Makefile.sources deleted file mode 100644 index 94393597292..00000000000 --- a/src/gallium/frontends/omx/bellagio/Makefile.sources +++ /dev/null @@ -1,11 +0,0 @@ -C_SOURCES := \ - entrypoint.c \ - entrypoint.h \ - vid_dec.c \ - vid_dec.h \ - vid_dec_mpeg12.c \ - vid_dec_h264.c \ - vid_dec_h265.c \ - vid_dec_av1.c \ - vid_enc.c \ - vid_enc.h diff --git a/src/gallium/frontends/omx/tizonia/Makefile.sources b/src/gallium/frontends/omx/tizonia/Makefile.sources deleted file mode 100644 index 7e039d3c5ad..00000000000 --- a/src/gallium/frontends/omx/tizonia/Makefile.sources +++ /dev/null @@ -1,22 +0,0 @@ -C_SOURCES := \ - entrypoint.c \ - entrypoint.h \ - h264d.c \ - h264d.h \ - h264dprc.c \ - h264dprc.h \ - h264dinport.c \ - h264dinport.h \ - h264dinport_decls.h \ - h264e.c \ - h264e.h \ - h264eprc.c \ - h264eprc.h \ - h264einport.h \ - h264einport.c \ - h264einport_decls.h \ - h264einport.h \ - h264eoutport.c \ - h264eoutport_decls.h \ - h264eoutport.h \ - names.h diff --git a/src/gallium/frontends/osmesa/Makefile.sources b/src/gallium/frontends/osmesa/Makefile.sources deleted file mode 100644 index f8008efdec5..00000000000 --- a/src/gallium/frontends/osmesa/Makefile.sources +++ /dev/null @@ -1,2 +0,0 @@ -C_SOURCES := \ - osmesa.c diff --git a/src/gallium/frontends/va/Makefile.sources b/src/gallium/frontends/va/Makefile.sources deleted file mode 100644 index bd43100a870..00000000000 --- a/src/gallium/frontends/va/Makefile.sources +++ /dev/null @@ -1,20 +0,0 @@ -C_SOURCES := \ - buffer.c \ - config.c \ - context.c \ - display.c \ - image.c \ - picture.c \ - picture_mpeg12.c \ - picture_mpeg4.c \ - picture_h264.c \ - picture_h264_enc.c \ - picture_hevc.c \ - picture_hevc_enc.c \ - picture_vc1.c \ - picture_mjpeg.c \ - picture_vp9.c \ - postproc.c \ - subpicture.c \ - surface.c \ - va_private.h diff --git a/src/gallium/frontends/vdpau/Makefile.sources b/src/gallium/frontends/vdpau/Makefile.sources deleted file mode 100644 index dfe0bcd043f..00000000000 --- a/src/gallium/frontends/vdpau/Makefile.sources +++ /dev/null @@ -1,13 +0,0 @@ -C_SOURCES := \ - bitmap.c \ - decode.c \ - device.c \ - ftab.c \ - htab.c \ - mixer.c \ - output.c \ - preemption.c \ - presentation.c \ - query.c \ - surface.c \ - vdpau_private.h diff --git a/src/gallium/frontends/wgl/Makefile.sources b/src/gallium/frontends/wgl/Makefile.sources deleted file mode 100644 index 2630b445d54..00000000000 --- a/src/gallium/frontends/wgl/Makefile.sources +++ /dev/null @@ -1,17 +0,0 @@ -C_SOURCES := \ - stw_context.c \ - stw_device.c \ - stw_ext_context.c \ - stw_ext_extensionsstring.c \ - stw_ext_pbuffer.c \ - stw_ext_pixelformat.c \ - stw_ext_rendertexture.c \ - stw_ext_swapinterval.c \ - stw_framebuffer.c \ - stw_getprocaddress.c \ - stw_nopfuncs.c \ - stw_nopfuncs.h \ - stw_pixelformat.c \ - stw_st.c \ - stw_tls.c \ - stw_wgl.c diff --git a/src/gallium/frontends/xa/Makefile.sources b/src/gallium/frontends/xa/Makefile.sources deleted file mode 100644 index cdcc4187ac1..00000000000 --- a/src/gallium/frontends/xa/Makefile.sources +++ /dev/null @@ -1,8 +0,0 @@ -C_SOURCES := \ - xa_composite.c \ - xa_context.c \ - xa_priv.h \ - xa_renderer.c \ - xa_tgsi.c \ - xa_tracker.c \ - xa_yuv.c diff --git a/src/gallium/frontends/xvmc/Makefile.sources b/src/gallium/frontends/xvmc/Makefile.sources deleted file mode 100644 index 814357bf25d..00000000000 --- a/src/gallium/frontends/xvmc/Makefile.sources +++ /dev/null @@ -1,7 +0,0 @@ -C_SOURCES := \ - attributes.c \ - block.c \ - context.c \ - surface.c \ - subpicture.c \ - xvmc_private.h diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk deleted file mode 100644 index 6ec4055f1d6..00000000000 --- a/src/gallium/targets/dri/Android.mk +++ /dev/null @@ -1,111 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2015 Chih-Wei Huang -# Copyright (C) 2015 Android-x86 Open Source Project -# -# 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. - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := gallium_dri - -LOCAL_MODULE_RELATIVE_PATH := $(MESA_DRI_MODULE_REL_PATH) -LOCAL_SRC_FILES := target.c - -LOCAL_CFLAGS := - -# We need --undefined-version as some functions in dri.sym may be missing -# depending on which drivers are enabled or not. Otherwise, we get the error: -# "version script assignment of to symbol FOO failed: symbol not defined" -LOCAL_LDFLAGS := \ - -Wl,--version-script=$(LOCAL_PATH)/dri.sym \ - -Wl,--undefined-version - -LOCAL_SHARED_LIBRARIES := \ - libdl \ - libglapi \ - libz \ - liblog \ - libsync - -# If Android version >=8 MESA should static link libexpat else should dynamic link -ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0) -LOCAL_STATIC_LIBRARIES := \ - libexpat -else -LOCAL_SHARED_LIBRARIES += \ - libexpat -endif - -LOCAL_STATIC_LIBRARIES += \ - libetnaviv_drm \ - libfreedreno_common \ - libfreedreno_drm \ - libfreedreno_ir2 \ - libfreedreno_ir3 \ - libfreedreno_perfcntrs \ - libmesa_gallium \ - libpanfrost_lib \ - libpanfrost_bifrost \ - libpanfrost_bifrost_disasm \ - libpanfrost_midgard \ - libpanfrost_midgard_disasm \ - libpanfrost_shared \ - libpanfrost_util \ - -ifeq ($(USE_LIBBACKTRACE),true) - LOCAL_SHARED_LIBRARIES += libbacktrace -endif - -$(foreach d, $(MESA_BUILD_GALLIUM), $(eval LOCAL_CFLAGS += $(patsubst HAVE_%,-D%,$(d)))) - -# sort GALLIUM_LIBS to remove any duplicates -LOCAL_WHOLE_STATIC_LIBRARIES := \ - $(sort $(GALLIUM_LIBS)) \ - libmesa_st_dri \ - libmesa_st_mesa \ - libmesa_glsl \ - libmesa_compiler \ - libmesa_nir \ - libmesa_dri_common \ - libmesa_megadriver_stub \ - libmesa_pipe_loader \ - libmesa_util \ - libmesa_loader - -LOCAL_SHARED_LIBRARIES += libcutils - -# sort GALLIUM_SHARED_LIBS to remove any duplicates -LOCAL_SHARED_LIBRARIES += $(sort $(GALLIUM_SHARED_LIBS)) - -ifneq ($(filter 5 6 7, $(MESA_ANDROID_MAJOR_VERSION)),) -LOCAL_POST_INSTALL_CMD := \ - $(foreach l, lib $(if $(filter true,$(TARGET_IS_64_BIT)),lib64), \ - $(eval MESA_DRI_MODULE_PATH := $(TARGET_OUT_VENDOR)/$(l)/$(MESA_DRI_MODULE_REL_PATH)) \ - mkdir -p $(MESA_DRI_MODULE_PATH); \ - $(foreach d, $(GALLIUM_TARGET_DRIVERS), ln -sf gallium_dri.so $(MESA_DRI_MODULE_PATH)/$(d)_dri.so;) \ - ) -else -LOCAL_MODULE_SYMLINKS := $(foreach d, $(GALLIUM_TARGET_DRIVERS), $(d)_dri.so) -endif - -include $(GALLIUM_COMMON_MK) -include $(BUILD_SHARED_LIBRARY) diff --git a/src/gallium/winsys/amdgpu/drm/Android.mk b/src/gallium/winsys/amdgpu/drm/Android.mk deleted file mode 100644 index 90f56e45bdc..00000000000 --- a/src/gallium/winsys/amdgpu/drm/Android.mk +++ /dev/null @@ -1,52 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2011 Chia-I Wu -# Copyright (C) 2011 LunarG Inc. -# -# 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. - -ifeq ($(MESA_ENABLE_LLVM),true) - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(C_SOURCES) - -LOCAL_CFLAGS := $(AMDGPU_CFLAGS) - -LOCAL_STATIC_LIBRARIES := libmesa_amdgpu_addrlib libmesa_amd_common - -LOCAL_SHARED_LIBRARIES := libdrm_amdgpu -LOCAL_MODULE := libmesa_winsys_amdgpu - -$(call mesa-build-with-llvm) - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -ifneq ($(HAVE_GALLIUM_RADEONSI),) -$(eval GALLIUM_LIBS += $(LOCAL_MODULE) $(LOCAL_STATIC_LIBRARIES)) -$(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES)) -endif - -endif # MESA_ENABLE_LLVM==true diff --git a/src/gallium/winsys/amdgpu/drm/Makefile.sources b/src/gallium/winsys/amdgpu/drm/Makefile.sources deleted file mode 100644 index cb2f01f162c..00000000000 --- a/src/gallium/winsys/amdgpu/drm/Makefile.sources +++ /dev/null @@ -1,9 +0,0 @@ -C_SOURCES := \ - amdgpu_bo.c \ - amdgpu_bo.h \ - amdgpu_cs.c \ - amdgpu_cs.h \ - amdgpu_public.h \ - amdgpu_surface.c \ - amdgpu_winsys.c \ - amdgpu_winsys.h diff --git a/src/gallium/winsys/etnaviv/drm/Android.mk b/src/gallium/winsys/etnaviv/drm/Android.mk deleted file mode 100644 index 31edabd68d6..00000000000 --- a/src/gallium/winsys/etnaviv/drm/Android.mk +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (C) 2016 Linaro, Ltd, Rob Herring -# -# 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. - -LOCAL_PATH := $(call my-dir) -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(C_SOURCES) - -LOCAL_STATIC_LIBRARIES := libmesa_nir libetnaviv_drm - -LOCAL_MODULE := libmesa_winsys_etnaviv - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/winsys/etnaviv/drm/Makefile.sources b/src/gallium/winsys/etnaviv/drm/Makefile.sources deleted file mode 100644 index f338b0848c4..00000000000 --- a/src/gallium/winsys/etnaviv/drm/Makefile.sources +++ /dev/null @@ -1,3 +0,0 @@ -C_SOURCES := \ - etnaviv_drm_public.h \ - etnaviv_drm_winsys.c diff --git a/src/gallium/winsys/freedreno/drm/Android.mk b/src/gallium/winsys/freedreno/drm/Android.mk deleted file mode 100644 index 66955958354..00000000000 --- a/src/gallium/winsys/freedreno/drm/Android.mk +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (C) 2014 Emil Velikov -# -# 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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(C_SOURCES) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/freedreno/common - -LOCAL_SHARED_LIBRARIES := libdrm_freedreno -LOCAL_STATIC_LIBRARIES := libfreedreno_registers - -LOCAL_MODULE := libmesa_winsys_freedreno - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/winsys/freedreno/drm/Makefile.sources b/src/gallium/winsys/freedreno/drm/Makefile.sources deleted file mode 100644 index f0581dfb337..00000000000 --- a/src/gallium/winsys/freedreno/drm/Makefile.sources +++ /dev/null @@ -1,3 +0,0 @@ -C_SOURCES := \ - freedreno_drm_public.h \ - freedreno_drm_winsys.c diff --git a/src/gallium/winsys/i915/drm/Android.mk b/src/gallium/winsys/i915/drm/Android.mk deleted file mode 100644 index bab3e85c5dd..00000000000 --- a/src/gallium/winsys/i915/drm/Android.mk +++ /dev/null @@ -1,41 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2010-2011 Chia-I Wu -# Copyright (C) 2010-2011 LunarG Inc. -# -# 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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(C_SOURCES) - -LOCAL_SHARED_LIBRARIES := libdrm_intel -LOCAL_MODULE := libmesa_winsys_i915 - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -ifneq ($(HAVE_GALLIUM_I915),) -$(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES)) -endif diff --git a/src/gallium/winsys/i915/drm/Makefile.sources b/src/gallium/winsys/i915/drm/Makefile.sources deleted file mode 100644 index 1e1f56247b1..00000000000 --- a/src/gallium/winsys/i915/drm/Makefile.sources +++ /dev/null @@ -1,7 +0,0 @@ -C_SOURCES := \ - i915_drm_batchbuffer.c \ - i915_drm_buffer.c \ - i915_drm_fence.c \ - i915_drm_public.h \ - i915_drm_winsys.c \ - i915_drm_winsys.h diff --git a/src/gallium/winsys/iris/drm/Android.mk b/src/gallium/winsys/iris/drm/Android.mk deleted file mode 100644 index 820f32c3ecc..00000000000 --- a/src/gallium/winsys/iris/drm/Android.mk +++ /dev/null @@ -1,40 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2018 Intel Corporation -# -# 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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(C_SOURCES) - -LOCAL_WHOLE_STATIC_LIBRARIES := \ - libmesa_isl \ - libmesa_intel_dev - -LOCAL_SHARED_LIBRARIES := libdrm_intel -LOCAL_MODULE := libmesa_winsys_iris - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/winsys/iris/drm/Makefile.sources b/src/gallium/winsys/iris/drm/Makefile.sources deleted file mode 100644 index f5da79876a1..00000000000 --- a/src/gallium/winsys/iris/drm/Makefile.sources +++ /dev/null @@ -1,3 +0,0 @@ -C_SOURCES := \ - iris_drm_public.h \ - iris_drm_winsys.c diff --git a/src/gallium/winsys/kmsro/drm/Android.mk b/src/gallium/winsys/kmsro/drm/Android.mk deleted file mode 100644 index 439d2cc0ea8..00000000000 --- a/src/gallium/winsys/kmsro/drm/Android.mk +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (C) 2014 Emil Velikov -# -# 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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(C_SOURCES) - -LOCAL_MODULE := libmesa_winsys_kmsro - -$(foreach d, $(MESA_BUILD_GALLIUM), $(eval LOCAL_CFLAGS += $(patsubst HAVE_%,-D%,$(d)))) - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/winsys/kmsro/drm/Makefile.sources b/src/gallium/winsys/kmsro/drm/Makefile.sources deleted file mode 100644 index 220b6fc8216..00000000000 --- a/src/gallium/winsys/kmsro/drm/Makefile.sources +++ /dev/null @@ -1,3 +0,0 @@ -C_SOURCES := \ - kmsro_drm_public.h \ - kmsro_drm_winsys.c diff --git a/src/gallium/winsys/lima/drm/Android.mk b/src/gallium/winsys/lima/drm/Android.mk deleted file mode 100644 index cd5e5ad5678..00000000000 --- a/src/gallium/winsys/lima/drm/Android.mk +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (C) 2019 Icenowy Zheng -# -# 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. - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - lima_drm_public.h \ - lima_drm_winsys.c - -LOCAL_MODULE := libmesa_winsys_lima - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/winsys/nouveau/drm/Android.mk b/src/gallium/winsys/nouveau/drm/Android.mk deleted file mode 100644 index b9b8812a372..00000000000 --- a/src/gallium/winsys/nouveau/drm/Android.mk +++ /dev/null @@ -1,37 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2011 Chia-I Wu -# Copyright (C) 2011 LunarG Inc. -# -# 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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(C_SOURCES) - -LOCAL_SHARED_LIBRARIES := libdrm_nouveau -LOCAL_MODULE := libmesa_winsys_nouveau - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/winsys/nouveau/drm/Makefile.sources b/src/gallium/winsys/nouveau/drm/Makefile.sources deleted file mode 100644 index 9f70e9f49da..00000000000 --- a/src/gallium/winsys/nouveau/drm/Makefile.sources +++ /dev/null @@ -1,3 +0,0 @@ -C_SOURCES := \ - nouveau_drm_public.h \ - nouveau_drm_winsys.c diff --git a/src/gallium/winsys/panfrost/drm/Android.mk b/src/gallium/winsys/panfrost/drm/Android.mk deleted file mode 100644 index 5f286856b5a..00000000000 --- a/src/gallium/winsys/panfrost/drm/Android.mk +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (C) 2014 Emil Velikov -# -# 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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(C_SOURCES) - -LOCAL_MODULE := libmesa_winsys_panfrost - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/winsys/panfrost/drm/Makefile.sources b/src/gallium/winsys/panfrost/drm/Makefile.sources deleted file mode 100644 index 24a1073097c..00000000000 --- a/src/gallium/winsys/panfrost/drm/Makefile.sources +++ /dev/null @@ -1,3 +0,0 @@ -C_SOURCES := \ - panfrost_drm_public.h \ - panfrost_drm_winsys.c diff --git a/src/gallium/winsys/radeon/drm/Android.mk b/src/gallium/winsys/radeon/drm/Android.mk deleted file mode 100644 index 2e0c40c0660..00000000000 --- a/src/gallium/winsys/radeon/drm/Android.mk +++ /dev/null @@ -1,37 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2011 Chia-I Wu -# Copyright (C) 2011 LunarG Inc. -# -# 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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(C_SOURCES) - -LOCAL_SHARED_LIBRARIES := libdrm_radeon -LOCAL_MODULE := libmesa_winsys_radeon - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/winsys/radeon/drm/Makefile.sources b/src/gallium/winsys/radeon/drm/Makefile.sources deleted file mode 100644 index 2762c91e216..00000000000 --- a/src/gallium/winsys/radeon/drm/Makefile.sources +++ /dev/null @@ -1,9 +0,0 @@ -C_SOURCES := \ - radeon_drm_bo.c \ - radeon_drm_bo.h \ - radeon_drm_cs.c \ - radeon_drm_cs.h \ - radeon_drm_public.h \ - radeon_drm_surface.c \ - radeon_drm_winsys.c \ - radeon_drm_winsys.h diff --git a/src/gallium/winsys/svga/drm/Android.mk b/src/gallium/winsys/svga/drm/Android.mk deleted file mode 100644 index 67c9f4f46e5..00000000000 --- a/src/gallium/winsys/svga/drm/Android.mk +++ /dev/null @@ -1,42 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2010-2011 Chia-I Wu -# Copyright (C) 2010-2011 LunarG Inc. -# -# 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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(C_SOURCES) - -LOCAL_CFLAGS := -D_FILE_OFFSET_BITS=64 - -LOCAL_C_INCLUDES := \ - $(GALLIUM_TOP)/drivers/svga \ - $(GALLIUM_TOP)/drivers/svga/include - -LOCAL_MODULE := libmesa_winsys_svga - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/winsys/svga/drm/Makefile.sources b/src/gallium/winsys/svga/drm/Makefile.sources deleted file mode 100644 index 191f0b88b4a..00000000000 --- a/src/gallium/winsys/svga/drm/Makefile.sources +++ /dev/null @@ -1,24 +0,0 @@ -C_SOURCES := \ - pb_buffer_simple_fenced.c \ - svga_drm_public.h \ - vmw_buffer.c \ - vmw_buffer.h \ - vmw_context.c \ - vmw_context.h \ - vmw_fence.c \ - vmw_fence.h \ - vmwgfx_drm.h \ - vmw_msg.c \ - vmw_msg.h \ - vmw_screen.c \ - vmw_screen_dri.c \ - vmw_screen.h \ - vmw_screen_ioctl.c \ - vmw_screen_pools.c \ - vmw_screen_svga.c \ - vmw_surface.c \ - vmw_surface.h \ - vmw_shader.c \ - vmw_shader.h \ - vmw_query.c \ - vmw_query.h diff --git a/src/gallium/winsys/sw/dri/Android.mk b/src/gallium/winsys/sw/dri/Android.mk deleted file mode 100644 index 72fb920ff15..00000000000 --- a/src/gallium/winsys/sw/dri/Android.mk +++ /dev/null @@ -1,35 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2015 Chih-Wei Huang -# Copyright (C) 2015 Android-x86 Open Source Project -# -# 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. - -LOCAL_PATH := $(call my-dir) - -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(C_SOURCES) - -LOCAL_MODULE := libmesa_winsys_sw_dri - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/winsys/sw/dri/Makefile.sources b/src/gallium/winsys/sw/dri/Makefile.sources deleted file mode 100644 index 5f9178fdb53..00000000000 --- a/src/gallium/winsys/sw/dri/Makefile.sources +++ /dev/null @@ -1,3 +0,0 @@ -C_SOURCES := \ - dri_sw_winsys.c \ - dri_sw_winsys.h diff --git a/src/gallium/winsys/sw/kms-dri/Android.mk b/src/gallium/winsys/sw/kms-dri/Android.mk deleted file mode 100644 index f5c1ccab12a..00000000000 --- a/src/gallium/winsys/sw/kms-dri/Android.mk +++ /dev/null @@ -1,33 +0,0 @@ -# -# Copyright (C) 2017 Linaro, Ltd., Rob Herring -# -# 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. - -LOCAL_PATH := $(call my-dir) - -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(C_SOURCES) - -LOCAL_MODULE := libmesa_winsys_sw_kms_dri - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/winsys/sw/kms-dri/Makefile.sources b/src/gallium/winsys/sw/kms-dri/Makefile.sources deleted file mode 100644 index 4bf832bdb80..00000000000 --- a/src/gallium/winsys/sw/kms-dri/Makefile.sources +++ /dev/null @@ -1,3 +0,0 @@ -C_SOURCES := \ - kms_dri_sw_winsys.c \ - kms_dri_sw_winsys.h diff --git a/src/gallium/winsys/sw/null/Makefile.sources b/src/gallium/winsys/sw/null/Makefile.sources deleted file mode 100644 index b72310bca14..00000000000 --- a/src/gallium/winsys/sw/null/Makefile.sources +++ /dev/null @@ -1,3 +0,0 @@ -C_SOURCES := \ - null_sw_winsys.c \ - null_sw_winsys.h diff --git a/src/gallium/winsys/sw/wrapper/Makefile.sources b/src/gallium/winsys/sw/wrapper/Makefile.sources deleted file mode 100644 index 742e49b1c37..00000000000 --- a/src/gallium/winsys/sw/wrapper/Makefile.sources +++ /dev/null @@ -1,3 +0,0 @@ -C_SOURCES := \ - wrapper_sw_winsys.c \ - wrapper_sw_winsys.h diff --git a/src/gallium/winsys/sw/xlib/Makefile.sources b/src/gallium/winsys/sw/xlib/Makefile.sources deleted file mode 100644 index fc6a56d4993..00000000000 --- a/src/gallium/winsys/sw/xlib/Makefile.sources +++ /dev/null @@ -1,3 +0,0 @@ -C_SOURCES := \ - xlib_sw_winsys.c \ - xlib_sw_winsys.h diff --git a/src/gallium/winsys/tegra/drm/Makefile.sources b/src/gallium/winsys/tegra/drm/Makefile.sources deleted file mode 100644 index 29a0edc9c43..00000000000 --- a/src/gallium/winsys/tegra/drm/Makefile.sources +++ /dev/null @@ -1,3 +0,0 @@ -C_SOURCES := \ - tegra_drm_public.h \ - tegra_drm_winsys.c diff --git a/src/gallium/winsys/v3d/drm/Android.mk b/src/gallium/winsys/v3d/drm/Android.mk deleted file mode 100644 index 4cdd969c268..00000000000 --- a/src/gallium/winsys/v3d/drm/Android.mk +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (C) 2014 Emil Velikov -# -# 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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(C_SOURCES) - -LOCAL_MODULE := libmesa_winsys_v3d - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/winsys/v3d/drm/Makefile.sources b/src/gallium/winsys/v3d/drm/Makefile.sources deleted file mode 100644 index 1fdeefbcbee..00000000000 --- a/src/gallium/winsys/v3d/drm/Makefile.sources +++ /dev/null @@ -1,3 +0,0 @@ -C_SOURCES := \ - v3d_drm_public.h \ - v3d_drm_winsys.c diff --git a/src/gallium/winsys/vc4/drm/Android.mk b/src/gallium/winsys/vc4/drm/Android.mk deleted file mode 100644 index af5813dd2f0..00000000000 --- a/src/gallium/winsys/vc4/drm/Android.mk +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (C) 2014 Emil Velikov -# -# 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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(C_SOURCES) - -LOCAL_MODULE := libmesa_winsys_vc4 - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/winsys/vc4/drm/Makefile.sources b/src/gallium/winsys/vc4/drm/Makefile.sources deleted file mode 100644 index 19cadf78070..00000000000 --- a/src/gallium/winsys/vc4/drm/Makefile.sources +++ /dev/null @@ -1,3 +0,0 @@ -C_SOURCES := \ - vc4_drm_public.h \ - vc4_drm_winsys.c diff --git a/src/gallium/winsys/virgl/common/Android.mk b/src/gallium/winsys/virgl/common/Android.mk deleted file mode 100644 index c2b25cbe886..00000000000 --- a/src/gallium/winsys/virgl/common/Android.mk +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (C) 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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(C_SOURCES) - -LOCAL_MODULE := libmesa_winsys_virgl_common - -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/winsys/virgl/common/Makefile.sources b/src/gallium/winsys/virgl/common/Makefile.sources deleted file mode 100644 index 09a9ba46d21..00000000000 --- a/src/gallium/winsys/virgl/common/Makefile.sources +++ /dev/null @@ -1,3 +0,0 @@ -C_SOURCES := \ - virgl_resource_cache.h \ - virgl_resource_cache.c diff --git a/src/gallium/winsys/virgl/drm/Android.mk b/src/gallium/winsys/virgl/drm/Android.mk deleted file mode 100644 index f3d9df79c4f..00000000000 --- a/src/gallium/winsys/virgl/drm/Android.mk +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (C) 2014 Emil Velikov -# -# 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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(C_SOURCES) - -LOCAL_MODULE := libmesa_winsys_virgl - -LOCAL_C_INCLUDES := $(MESA_TOP)/src/virtio - -LOCAL_STATIC_LIBRARIES := libmesa_winsys_virgl_common - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/winsys/virgl/drm/Makefile.sources b/src/gallium/winsys/virgl/drm/Makefile.sources deleted file mode 100644 index 0430d4ada4a..00000000000 --- a/src/gallium/winsys/virgl/drm/Makefile.sources +++ /dev/null @@ -1,5 +0,0 @@ -C_SOURCES := \ - virgl_drm_public.h \ - virgl_drm_winsys.c \ - virgl_drm_winsys.h \ - virtgpu_drm.h diff --git a/src/gallium/winsys/virgl/vtest/Android.mk b/src/gallium/winsys/virgl/vtest/Android.mk deleted file mode 100644 index 454d830d042..00000000000 --- a/src/gallium/winsys/virgl/vtest/Android.mk +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (C) 2014 Emil Velikov -# -# 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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(C_SOURCES) - -LOCAL_MODULE := libmesa_winsys_virgl_vtest - -LOCAL_C_INCLUDES := $(MESA_TOP)/src/virtio - -LOCAL_STATIC_LIBRARIES := libmesa_winsys_virgl_common - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/winsys/virgl/vtest/Makefile.sources b/src/gallium/winsys/virgl/vtest/Makefile.sources deleted file mode 100644 index cda28e575a8..00000000000 --- a/src/gallium/winsys/virgl/vtest/Makefile.sources +++ /dev/null @@ -1,5 +0,0 @@ -C_SOURCES := \ - virgl_vtest_public.h \ - virgl_vtest_socket.c \ - virgl_vtest_winsys.c \ - virgl_vtest_winsys.h diff --git a/src/gbm/Android.mk b/src/gbm/Android.mk deleted file mode 100644 index 1fe56524322..00000000000 --- a/src/gbm/Android.mk +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright (C) 2016 Linaro, Ltd., Rob Herring -# -# 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. -# - -LOCAL_PATH := $(call my-dir) - -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(LOCAL_PATH)/main - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/main - -LOCAL_STATIC_LIBRARIES := \ - libmesa_util \ - libmesa_loader - -LOCAL_MODULE := libgbm - -LOCAL_SRC_FILES := \ - $(gbm_core_FILES) \ - $(gbm_dri_FILES) - -include $(MESA_COMMON_MK) -include $(BUILD_SHARED_LIBRARY) diff --git a/src/gbm/Makefile.sources b/src/gbm/Makefile.sources deleted file mode 100644 index 461025c1acf..00000000000 --- a/src/gbm/Makefile.sources +++ /dev/null @@ -1,10 +0,0 @@ -gbm_core_FILES = \ - main/backend.c \ - main/backend.h \ - main/gbm.c \ - main/gbm.h \ - main/gbmint.h - -gbm_dri_FILES = \ - backends/dri/gbm_dri.c \ - backends/dri/gbm_driint.h diff --git a/src/intel/Android.blorp.mk b/src/intel/Android.blorp.mk deleted file mode 100644 index e1aa908706e..00000000000 --- a/src/intel/Android.blorp.mk +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright © 2016 Intel Corporation -# Copyright © 2016 Mauro Rossi -# -# 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. - -# --------------------------------------- -# Build libmesa_blorp -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_blorp - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -LOCAL_SRC_FILES := $(BLORP_FILES) - -LOCAL_C_INCLUDES := \ - $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \ - $(MESA_TOP)/src/gallium/auxiliary \ - $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/mesa \ - $(MESA_TOP)/src/intel - -LOCAL_STATIC_LIBRARIES := libmesa_nir - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/intel/Android.common.mk b/src/intel/Android.common.mk deleted file mode 100644 index 0e1118e6571..00000000000 --- a/src/intel/Android.common.mk +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright © 2016 Intel Corporation -# Copyright © 2016 Mauro Rossi -# -# 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. - -# --------------------------------------- -# Build libmesa_intel_common -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_intel_common - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -LOCAL_SRC_FILES := $(COMMON_FILES) - -LOCAL_C_INCLUDES := \ - external/zlib \ - $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src/gallium/auxiliary \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/mesa \ - $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_git_sha1,,) - -LOCAL_SHARED_LIBRARIES := libz liblog - -# If Android version >=8 MESA should static link libexpat else should dynamic link -ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0) -LOCAL_STATIC_LIBRARIES := \ - libexpat -else -LOCAL_SHARED_LIBRARIES += \ - libexpat -endif - - -LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/intel/Android.compiler.mk b/src/intel/Android.compiler.mk deleted file mode 100644 index c2b01221dfc..00000000000 --- a/src/intel/Android.compiler.mk +++ /dev/null @@ -1,67 +0,0 @@ -# -# Copyright (C) 2011 Intel Corporation -# Copyright (C) 2010-2011 Chia-I Wu -# Copyright (C) 2010-2011 LunarG -# Copyright (C) 2016 Linaro, Ltd., Rob Herring -# -# 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. -# - -# --------------------------------------- -# Build libmesa_intel_compiler -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_intel_compiler -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -LOCAL_SRC_FILES := \ - $(COMPILER_FILES) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/intel \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/mesa \ - $(MESA_TOP)/src/gallium/auxiliary \ - $(MESA_TOP)/src/gallium/include \ - $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_glsl,,)/glsl \ - $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \ - $(MESA_TOP)/src/intel/compiler \ - $(MESA_TOP)/src/compiler/nir - -brw_nir_trig_workarounds_deps := \ - $(LOCAL_PATH)/compiler/brw_nir_trig_workarounds.py \ - $(MESA_TOP)/src/compiler/nir/nir_algebraic.py - -intermediates := $(call local-generated-sources-dir) - -$(intermediates)/compiler/brw_nir_trig_workarounds.c: $(brw_nir_trig_workarounds_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $< -p $(MESA_TOP)/src/compiler/nir > $@ - -LOCAL_STATIC_LIBRARIES = libmesa_genxml - -LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ - $(COMPILER_GENERATED_FILES)) - -LOCAL_GENERATED_SOURCES += $(MESA_GEN_GLSL_H) - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/intel/Android.dev.mk b/src/intel/Android.dev.mk deleted file mode 100644 index 5c7ddd4d35e..00000000000 --- a/src/intel/Android.dev.mk +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright © 2016 Intel Corporation -# Copyright © 2016 Mauro Rossi -# -# 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. - -# --------------------------------------- -# Build libmesa_intel_dev -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_intel_dev - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -LOCAL_STATIC_LIBRARIES := \ - libmesa_git_sha1 - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/include \ - $(MESA_TOP)/src - -LOCAL_SRC_FILES := $(DEV_FILES) - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/intel/Android.genxml.mk b/src/intel/Android.genxml.mk deleted file mode 100644 index e5548e2b7a6..00000000000 --- a/src/intel/Android.genxml.mk +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright © 2016 Intel Corporation -# Copyright © 2016 Mauro Rossi -# -# 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. -# - -# --------------------------------------- -# Build libmesa_genxml -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_genxml - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -intermediates := $(call local-generated-sources-dir) - -# dummy.c source file is generated to meet the build system's rules. -LOCAL_GENERATED_SOURCES += $(intermediates)/dummy.c - -$(intermediates)/dummy.c: - @mkdir -p $(dir $@) - @echo "Gen Dummy: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) touch $@ - -# This is the list of auto-generated files headers -LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, $(GENXML_GENERATED_FILES)) - -define header-gen - @mkdir -p $(dir $@) - @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(PRIVATE_SCRIPT) $(PRIVATE_SCRIPT_FLAGS) $(PRIVATE_XML) > $@ -endef - -$(intermediates)/genxml/genX_bits.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_bits_header.py -$(intermediates)/genxml/genX_bits.h: PRIVATE_SCRIPT_FLAGS := --cpp-guard=GENX_BITS_H -$(intermediates)/genxml/genX_bits.h: PRIVATE_XML := $(addprefix $(LOCAL_PATH)/,$(GENXML_XML_FILES)) -$(intermediates)/genxml/genX_bits.h: $(LOCAL_PATH)/genxml/gen_bits_header.py -$(intermediates)/genxml/genX_bits.h: $(addprefix $(LOCAL_PATH)/,$(GENXML_XML_FILES)) - $(call header-gen) - -$(intermediates)/genxml/gen4_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py -$(intermediates)/genxml/gen4_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen4.xml -$(intermediates)/genxml/gen4_pack.h: $(LOCAL_PATH)/genxml/gen4.xml $(LOCAL_PATH)/genxml/gen_pack_header.py - $(call header-gen) - -$(intermediates)/genxml/gen45_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py -$(intermediates)/genxml/gen45_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen45.xml -$(intermediates)/genxml/gen45_pack.h: $(LOCAL_PATH)/genxml/gen45.xml $(LOCAL_PATH)/genxml/gen_pack_header.py - $(call header-gen) - -$(intermediates)/genxml/gen5_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py -$(intermediates)/genxml/gen5_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen5.xml -$(intermediates)/genxml/gen5_pack.h: $(LOCAL_PATH)/genxml/gen5.xml $(LOCAL_PATH)/genxml/gen_pack_header.py - $(call header-gen) - -$(intermediates)/genxml/gen6_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py -$(intermediates)/genxml/gen6_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen6.xml -$(intermediates)/genxml/gen6_pack.h: $(LOCAL_PATH)/genxml/gen6.xml $(LOCAL_PATH)/genxml/gen_pack_header.py - $(call header-gen) - -$(intermediates)/genxml/gen7_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py -$(intermediates)/genxml/gen7_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen7.xml -$(intermediates)/genxml/gen7_pack.h: $(LOCAL_PATH)/genxml/gen7.xml $(LOCAL_PATH)/genxml/gen_pack_header.py - $(call header-gen) - -$(intermediates)/genxml/gen75_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py -$(intermediates)/genxml/gen75_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen75.xml -$(intermediates)/genxml/gen75_pack.h: $(LOCAL_PATH)/genxml/gen75.xml $(LOCAL_PATH)/genxml/gen_pack_header.py - $(call header-gen) - -$(intermediates)/genxml/gen8_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py -$(intermediates)/genxml/gen8_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen8.xml -$(intermediates)/genxml/gen8_pack.h: $(LOCAL_PATH)/genxml/gen8.xml $(LOCAL_PATH)/genxml/gen_pack_header.py - $(call header-gen) - -$(intermediates)/genxml/gen9_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py -$(intermediates)/genxml/gen9_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen9.xml -$(intermediates)/genxml/gen9_pack.h: $(LOCAL_PATH)/genxml/gen9.xml $(LOCAL_PATH)/genxml/gen_pack_header.py - $(call header-gen) - -$(intermediates)/genxml/gen11_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py -$(intermediates)/genxml/gen11_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen11.xml -$(intermediates)/genxml/gen11_pack.h: $(LOCAL_PATH)/genxml/gen11.xml $(LOCAL_PATH)/genxml/gen_pack_header.py - $(call header-gen) - -$(intermediates)/genxml/gen12_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py -$(intermediates)/genxml/gen12_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen12.xml -$(intermediates)/genxml/gen12_pack.h: $(LOCAL_PATH)/genxml/gen12.xml $(LOCAL_PATH)/genxml/gen_pack_header.py - $(call header-gen) - -$(intermediates)/genxml/gen125_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py -$(intermediates)/genxml/gen125_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen125.xml -$(intermediates)/genxml/gen125_pack.h: $(LOCAL_PATH)/genxml/gen125.xml $(LOCAL_PATH)/genxml/gen_pack_header.py - $(call header-gen) - -$(intermediates)/genxml/genX_xml.h: $(addprefix $(MESA_TOP)/src/intel/,$(GENXML_XML_FILES)) $(MESA_TOP)/src/intel/genxml/gen_zipped_file.py - @mkdir -p $(dir $@) - @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(MESA_PYTHON2) $(MESA_TOP)/src/intel/genxml/gen_zipped_file.py $(addprefix $(MESA_TOP)/src/intel/,$(GENXML_XML_FILES)) > $@ || (rm -f $@; false) - -LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(MESA_TOP)/src/intel \ - $(intermediates) - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/intel/Android.isl.mk b/src/intel/Android.isl.mk deleted file mode 100644 index e1ef62b73fc..00000000000 --- a/src/intel/Android.isl.mk +++ /dev/null @@ -1,326 +0,0 @@ -# Copyright © 2016 Intel Corporation -# Copyright © 2016 Mauro Rossi -# -# 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. -# - -# --------------------------------------- -# libmesa_isl_gen* common variables -# --------------------------------------- - -LIBISL_GENX_COMMON_INCLUDES := \ - $(MESA_TOP)/src/ \ - $(MESA_TOP)/src/gallium/include/ - -# --------------------------------------- -# Build libmesa_isl_gfx4 -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_isl_gfx4 - -LOCAL_SRC_FILES := $(ISL_GFX4_FILES) - -LOCAL_CFLAGS := -DGFX_VERx10=40 - -LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES) - -LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# --------------------------------------- -# Build libmesa_isl_gfx5 -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_isl_gfx5 - -LOCAL_SRC_FILES := $(ISL_GFX5_FILES) - -LOCAL_CFLAGS := -DGFX_VERx10=50 - -LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES) - -LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# --------------------------------------- -# Build libmesa_isl_gfx6 -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_isl_gfx6 - -LOCAL_SRC_FILES := $(ISL_GFX6_FILES) - -LOCAL_CFLAGS := -DGFX_VERx10=60 - -LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES) - -LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# --------------------------------------- -# Build libmesa_isl_gfx7 -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_isl_gfx7 - -LOCAL_SRC_FILES := $(ISL_GFX7_FILES) - -LOCAL_CFLAGS := -DGFX_VERx10=70 - -LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES) - -LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# --------------------------------------- -# Build libmesa_isl_gfx75 -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_isl_gfx75 - -LOCAL_SRC_FILES := $(ISL_GFX75_FILES) - -LOCAL_CFLAGS := -DGFX_VERx10=75 - -LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES) - -LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# --------------------------------------- -# Build libmesa_isl_gfx8 -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_isl_gfx8 - -LOCAL_SRC_FILES := $(ISL_GFX8_FILES) - -LOCAL_CFLAGS := -DGFX_VERx10=80 - -LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES) - -LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# --------------------------------------- -# Build libmesa_isl_gfx9 -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_isl_gfx9 - -LOCAL_SRC_FILES := $(ISL_GFX9_FILES) - -LOCAL_CFLAGS := -DGFX_VERx10=90 - -LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES) - -LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# --------------------------------------- -# Build libmesa_isl_gfx11 -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_isl_gfx11 - -LOCAL_SRC_FILES := $(ISL_GFX11_FILES) - -LOCAL_CFLAGS := -DGFX_VERx10=110 - -LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES) - -LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# --------------------------------------- -# Build libmesa_isl_gfx12 -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_isl_gfx12 - -LOCAL_SRC_FILES := $(ISL_GFX12_FILES) - -LOCAL_CFLAGS := -DGFX_VERx10=120 - -LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES) - -LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# --------------------------------------- -# Build libmesa_isl_gfx125 -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_isl_gfx125 - -LOCAL_SRC_FILES := $(ISL_GFX125_FILES) - -LOCAL_CFLAGS := -DGFX_VERx10=125 - -LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES) - -LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# --------------------------------------- -# Build libmesa_isl_tiled_memcpy -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_isl_tiled_memcpy - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/mesa - -LOCAL_SRC_FILES := $(ISL_TILED_MEMCPY_FILES) - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# --------------------------------------- -# Build libmesa_isl_tiled_memcpy_sse41 -# --------------------------------------- - -ifeq ($(ARCH_X86_HAVE_SSE4_1),true) -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_isl_tiled_memcpy_sse41 - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/mesa - -LOCAL_SRC_FILES := $(ISL_TILED_MEMCPY_SSE41_FILES) - -LOCAL_CFLAGS += \ - -DUSE_SSE41 -msse4.1 -mstackrealign - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) -endif - -# --------------------------------------- -# Build libmesa_isl -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_isl - -LOCAL_SRC_FILES := $(ISL_FILES) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src/gallium/auxiliary \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/mesa \ - $(MESA_TOP)/src/intel - -LOCAL_EXPORT_C_INCLUDE_DIRS := $(MESA_TOP)/src/intel - -LOCAL_WHOLE_STATIC_LIBRARIES := \ - libmesa_isl_gfx4 \ - libmesa_isl_gfx5 \ - libmesa_isl_gfx6 \ - libmesa_isl_gfx7 \ - libmesa_isl_gfx75 \ - libmesa_isl_gfx8 \ - libmesa_isl_gfx9 \ - libmesa_isl_gfx11 \ - libmesa_isl_gfx12 \ - libmesa_isl_gfx125 \ - libmesa_genxml \ - libmesa_isl_tiled_memcpy - -ifeq ($(ARCH_X86_HAVE_SSE4_1),true) -LOCAL_CFLAGS += \ - -DUSE_SSE41 -LOCAL_WHOLE_STATIC_LIBRARIES += \ - libmesa_isl_tiled_memcpy_sse41 -endif - -# Autogenerated sources - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -intermediates := $(call local-generated-sources-dir) - -LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, $(ISL_GENERATED_FILES)) - -define bash-gen - @mkdir -p $(dir $@) - @echo "Gen Bash: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(PRIVATE_SCRIPT) --csv $(PRIVATE_CSV) --out $@ -endef - -isl_format_layout_deps := \ - $(LOCAL_PATH)/isl/gen_format_layout.py \ - $(LOCAL_PATH)/isl/isl_format_layout.csv - -$(intermediates)/isl/isl_format_layout.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/isl/gen_format_layout.py -$(intermediates)/isl/isl_format_layout.c: PRIVATE_CSV := $(LOCAL_PATH)/isl/isl_format_layout.csv -$(intermediates)/isl/isl_format_layout.c: $(isl_format_layout_deps) - $(call bash-gen) - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/intel/Android.mk b/src/intel/Android.mk deleted file mode 100644 index 96498141dd2..00000000000 --- a/src/intel/Android.mk +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright © 2016 Intel Corporation -# Copyright © 2016 Mauro Rossi -# -# 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. -# - -LOCAL_PATH := $(call my-dir) - -# Import variables -include $(LOCAL_PATH)/Makefile.sources - -include $(LOCAL_PATH)/Android.blorp.mk -include $(LOCAL_PATH)/Android.common.mk -include $(LOCAL_PATH)/Android.compiler.mk -include $(LOCAL_PATH)/Android.dev.mk -include $(LOCAL_PATH)/Android.genxml.mk -include $(LOCAL_PATH)/Android.isl.mk -include $(LOCAL_PATH)/Android.perf.mk -include $(LOCAL_PATH)/Android.vulkan.mk diff --git a/src/intel/Android.perf.mk b/src/intel/Android.perf.mk deleted file mode 100644 index 4e5f04a7ddf..00000000000 --- a/src/intel/Android.perf.mk +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright © 2018 Intel Corporation -# -# 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. -# - -# --------------------------------------- -# Build libmesa_intel_perf -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_intel_perf - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -intermediates := $(call local-generated-sources-dir) - -LOCAL_C_INCLUDES := $(MESA_TOP)/include/drm-uapi - -LOCAL_SRC_FILES := $(INTEL_PERF_FILES) - -LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ - $(INTEL_PERF_GENERATED_FILES)) - -$(intermediates)/perf/intel_perf_metrics.c: $(LOCAL_PATH)/perf/gen_perf.py $(addprefix $(MESA_TOP)/src/intel/,$(INTEL_PERF_XML_FILES)) - @echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))" - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $< \ - --code=$@ \ - --header=$(@:%.c=%.h) \ - $(addprefix $(MESA_TOP)/src/intel/,$(INTEL_PERF_XML_FILES)) - -$(intermediates)/perf/intel_perf_metrics.h: $(intermediates)/perf/intel_perf_metrics.c - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk deleted file mode 100644 index 81ced17e27d..00000000000 --- a/src/intel/Android.vulkan.mk +++ /dev/null @@ -1,318 +0,0 @@ -# Copyright © 2017 Intel Corporation -# -# 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. - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -include $(LOCAL_PATH)/Makefile.sources - -VK_ENTRYPOINTS_GEN_SCRIPT := $(MESA_TOP)/src/vulkan/util/vk_entrypoints_gen.py -VULKAN_API_XML := $(MESA_TOP)/src/vulkan/registry/vk.xml - -VULKAN_COMMON_INCLUDES := \ - $(MESA_TOP)/include \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/gallium/auxiliary \ - $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src/mesa \ - $(MESA_TOP)/src/vulkan/wsi \ - $(MESA_TOP)/src/vulkan/util \ - $(MESA_TOP)/src/intel \ - $(MESA_TOP)/src/intel/vulkan \ - frameworks/native/vulkan/include - -ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0) -VULKAN_COMMON_INCLUDES += \ - frameworks/native/vulkan/include \ - frameworks/native/libs/nativebase/include \ - frameworks/native/libs/nativewindow/include \ - frameworks/native/libs/arect/include - -VULKAN_COMMON_HEADER_LIBRARIES := \ - libcutils_headers \ - libhardware_headers -endif - -ANV_STATIC_LIBRARIES := \ - libmesa_vulkan_util \ - libmesa_vulkan_common \ - libmesa_genxml \ - libmesa_nir - -ANV_SHARED_LIBRARIES := libdrm - -ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),) -ANV_SHARED_LIBRARIES += libnativewindow -endif - -# -# libanv for gfx7 -# - -include $(CLEAR_VARS) -LOCAL_MODULE := libmesa_anv_gfx7 -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -LOCAL_SRC_FILES := $(VULKAN_GFX7_FILES) -LOCAL_CFLAGS := -DGFX_VERx10=70 - -LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES) - -LOCAL_STATIC_LIBRARIES := $(ANV_STATIC_LIBRARIES) - -LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) -LOCAL_HEADER_LIBRARIES += $(VULKAN_COMMON_HEADER_LIBRARIES) - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# -# libanv for gfx75 -# - -include $(CLEAR_VARS) -LOCAL_MODULE := libmesa_anv_gfx75 -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -LOCAL_SRC_FILES := $(VULKAN_GFX75_FILES) -LOCAL_CFLAGS := -DGFX_VERx10=75 - -LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES) - -LOCAL_STATIC_LIBRARIES := $(ANV_STATIC_LIBRARIES) - -LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) -LOCAL_HEADER_LIBRARIES += $(VULKAN_COMMON_HEADER_LIBRARIES) - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# -# libanv for gfx8 -# - -include $(CLEAR_VARS) -LOCAL_MODULE := libmesa_anv_gfx8 -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -LOCAL_SRC_FILES := $(VULKAN_GFX8_FILES) -LOCAL_CFLAGS := -DGFX_VERx10=80 - -LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES) - -LOCAL_STATIC_LIBRARIES := $(ANV_STATIC_LIBRARIES) - -LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) -LOCAL_HEADER_LIBRARIES += $(VULKAN_COMMON_HEADER_LIBRARIES) - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# -# libanv for gfx9 -# - -include $(CLEAR_VARS) -LOCAL_MODULE := libmesa_anv_gfx9 -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -LOCAL_SRC_FILES := $(VULKAN_GFX9_FILES) -LOCAL_CFLAGS := -DGFX_VERx10=90 - -LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES) - -LOCAL_STATIC_LIBRARIES := $(ANV_STATIC_LIBRARIES) - -LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) -LOCAL_HEADER_LIBRARIES += $(VULKAN_COMMON_HEADER_LIBRARIES) - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# -# libanv for gfx11 -# - -include $(CLEAR_VARS) -LOCAL_MODULE := libmesa_anv_gfx11 -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -LOCAL_SRC_FILES := $(VULKAN_GFX11_FILES) -LOCAL_CFLAGS := -DGFX_VERx10=110 - -LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES) - -LOCAL_STATIC_LIBRARIES := $(ANV_STATIC_LIBRARIES) - -LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) -LOCAL_HEADER_LIBRARIES += $(VULKAN_COMMON_HEADER_LIBRARIES) - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# -# libanv for gfx12 -# - -include $(CLEAR_VARS) -LOCAL_MODULE := libmesa_anv_gfx12 -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -LOCAL_SRC_FILES := $(VULKAN_GFX12_FILES) -LOCAL_CFLAGS := -DGFX_VERx10=120 - -LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES) - -LOCAL_STATIC_LIBRARIES := $(ANV_STATIC_LIBRARIES) - -LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) -LOCAL_HEADER_LIBRARIES += $(VULKAN_COMMON_HEADER_LIBRARIES) - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# -# libanv for gfx125 -# - -include $(CLEAR_VARS) -LOCAL_MODULE := libmesa_anv_gfx125 -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -LOCAL_SRC_FILES := $(VULKAN_GFX125_FILES) -LOCAL_CFLAGS := -DGFX_VERx10=125 - -LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES) - -LOCAL_STATIC_LIBRARIES := $(ANV_STATIC_LIBRARIES) - -LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) -LOCAL_HEADER_LIBRARIES += $(VULKAN_COMMON_HEADER_LIBRARIES) - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - - -# -# libmesa_vulkan_common -# - -include $(CLEAR_VARS) -LOCAL_MODULE := libmesa_vulkan_common -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -intermediates := $(call local-generated-sources-dir) - -LOCAL_SRC_FILES := $(VULKAN_FILES) - -LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)/vulkan - -LOCAL_C_INCLUDES := \ - $(LOCAL_EXPORT_C_INCLUDE_DIRS) \ - $(VULKAN_COMMON_INCLUDES) - -LOCAL_STATIC_LIBRARIES := \ - libmesa_nir \ - libmesa_genxml \ - libmesa_git_sha1 \ - libmesa_vulkan_util \ - libmesa_util - -LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/,$(VULKAN_GENERATED_FILES)) - -ANV_VK_ENTRYPOINTS_GEN_ARGS= \ - --proto --weak --prefix anv \ - --device-prefix gfx7 --device-prefix gfx75 \ - --device-prefix gfx8 --device-prefix gfx9 \ - --device-prefix gfx11 --device-prefix gfx12 \ - --device-prefix gfx125 - -$(intermediates)/vulkan/anv_entrypoints.c: $(VK_ENTRYPOINTS_GEN_SCRIPT) \ - $(VULKAN_API_XML) - @mkdir -p $(dir $@) - $(MESA_PYTHON2) $(VK_ENTRYPOINTS_GEN_SCRIPT) \ - --xml $(VULKAN_API_XML) \ - $(ANV_VK_ENTRYPOINTS_GEN_ARGS) \ - --out-c $@ --out-h $(dir $@)/anv_entrypoints.h - -$(intermediates)/vulkan/anv_entrypoints.h: $(intermediates)/vulkan/anv_entrypoints.c - -LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) -LOCAL_HEADER_LIBRARIES += $(VULKAN_COMMON_HEADER_LIBRARIES) - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - - -# -# libvulkan_intel -# - -include $(CLEAR_VARS) - -LOCAL_MODULE := vulkan.$(TARGET_BOARD_PLATFORM) -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_PROPRIETARY_MODULE := true -LOCAL_MODULE_RELATIVE_PATH := hw - -LOCAL_LDFLAGS += -Wl,--build-id=sha1 - -LOCAL_SRC_FILES := \ - $(VULKAN_GEM_FILES) \ - $(VULKAN_ANDROID_FILES) - -LOCAL_C_INCLUDES := \ - $(VULKAN_COMMON_INCLUDES) \ - -LOCAL_WHOLE_STATIC_LIBRARIES := \ - libmesa_nir \ - libmesa_isl \ - libmesa_glsl \ - libmesa_util \ - libmesa_blorp \ - libmesa_compiler \ - libmesa_intel_common \ - libmesa_intel_dev \ - libmesa_intel_perf \ - libmesa_vulkan_common \ - libmesa_vulkan_util \ - libmesa_anv_gfx7 \ - libmesa_anv_gfx75 \ - libmesa_anv_gfx8 \ - libmesa_anv_gfx9 \ - libmesa_anv_gfx11 \ - libmesa_anv_gfx12 \ - libmesa_anv_gfx125 \ - libmesa_intel_compiler - -LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) libz libsync liblog libcutils -LOCAL_HEADER_LIBRARIES += $(VULKAN_COMMON_HEADER_LIBRARIES) - -# If Android version >=8 MESA should static link libexpat else should dynamic link -ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0) -LOCAL_STATIC_LIBRARIES := \ - libexpat -else - LOCAL_SHARED_LIBRARIES += \ - libexpat -endif - -include $(MESA_COMMON_MK) -include $(BUILD_SHARED_LIBRARY) diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources deleted file mode 100644 index 019ae19d24f..00000000000 --- a/src/intel/Makefile.sources +++ /dev/null @@ -1,384 +0,0 @@ -BLORP_FILES = \ - blorp/blorp.c \ - blorp/blorp.h \ - blorp/blorp_blit.c \ - blorp/blorp_clear.c \ - blorp/blorp_nir_builder.h \ - blorp/blorp_genX_exec.h \ - blorp/blorp_priv.h - -COMMON_FILES = \ - common/intel_aux_map.c \ - common/intel_aux_map.h \ - common/intel_buffer_alloc.h \ - common/intel_clflush.h \ - common/intel_batch_decoder.c \ - common/intel_decoder.c \ - common/intel_decoder.h \ - common/intel_disasm.c \ - common/intel_disasm.h \ - common/intel_defines.h \ - common/intel_gem.c \ - common/intel_gem.h \ - common/intel_guardband.h \ - common/intel_l3_config.c \ - common/intel_l3_config.h \ - common/intel_urb_config.c \ - common/intel_sample_positions.c \ - common/intel_sample_positions.h \ - common/intel_uuid.c \ - common/intel_uuid.h \ - common/intel_measure.c \ - common/intel_measure.h - -COMPILER_FILES = \ - compiler/brw_cfg.cpp \ - compiler/brw_cfg.h \ - compiler/brw_clip.h \ - compiler/brw_clip_line.c \ - compiler/brw_clip_point.c \ - compiler/brw_clip_tri.c \ - compiler/brw_clip_unfilled.c \ - compiler/brw_clip_util.c \ - compiler/brw_compile_clip.c \ - compiler/brw_compile_ff_gs.c \ - compiler/brw_compile_sf.c \ - compiler/brw_compiler.c \ - compiler/brw_compiler.h \ - compiler/brw_dead_control_flow.cpp \ - compiler/brw_dead_control_flow.h \ - compiler/brw_debug_recompile.c \ - compiler/brw_disasm.c \ - compiler/brw_disasm_info.c \ - compiler/brw_disasm_info.h \ - compiler/brw_eu.cpp \ - compiler/brw_eu_compact.c \ - compiler/brw_eu_defines.h \ - compiler/brw_eu_emit.c \ - compiler/brw_eu.h \ - compiler/brw_eu_util.c \ - compiler/brw_eu_validate.c \ - compiler/brw_fs_builder.h \ - compiler/brw_fs_bank_conflicts.cpp \ - compiler/brw_fs_cmod_propagation.cpp \ - compiler/brw_fs_combine_constants.cpp \ - compiler/brw_fs_copy_propagation.cpp \ - compiler/brw_fs.cpp \ - compiler/brw_fs_cse.cpp \ - compiler/brw_fs_dead_code_eliminate.cpp \ - compiler/brw_fs_generator.cpp \ - compiler/brw_fs.h \ - compiler/brw_fs_live_variables.cpp \ - compiler/brw_fs_live_variables.h \ - compiler/brw_fs_lower_pack.cpp \ - compiler/brw_fs_lower_regioning.cpp \ - compiler/brw_fs_nir.cpp \ - compiler/brw_fs_reg_allocate.cpp \ - compiler/brw_fs_register_coalesce.cpp \ - compiler/brw_fs_saturate_propagation.cpp \ - compiler/brw_fs_scoreboard.cpp \ - compiler/brw_fs_sel_peephole.cpp \ - compiler/brw_fs_validate.cpp \ - compiler/brw_fs_visitor.cpp \ - compiler/brw_inst.h \ - compiler/brw_interpolation_map.c \ - compiler/brw_ir_allocator.h \ - compiler/brw_ir_fs.h \ - compiler/brw_ir_performance.h \ - compiler/brw_ir_performance.cpp \ - compiler/brw_ir_vec4.h \ - compiler/brw_nir.h \ - compiler/brw_nir.c \ - compiler/brw_nir_analyze_boolean_resolves.c \ - compiler/brw_nir_analyze_ubo_ranges.c \ - compiler/brw_nir_clamp_image_1d_2d_array_sizes.c \ - compiler/brw_nir_attribute_workarounds.c \ - compiler/brw_nir_lower_alpha_to_coverage.c \ - compiler/brw_nir_lower_conversions.c \ - compiler/brw_nir_lower_cs_intrinsics.c \ - compiler/brw_nir_lower_image_load_store.c \ - compiler/brw_nir_lower_intersection_shader.c \ - compiler/brw_nir_lower_mem_access_bit_sizes.c \ - compiler/brw_nir_lower_rt_intrinsics.c \ - compiler/brw_nir_lower_scoped_barriers.c \ - compiler/brw_nir_lower_shader_calls.c \ - compiler/brw_nir_opt_peephole_ffma.c \ - compiler/brw_nir_rt.h \ - compiler/brw_nir_rt.c \ - compiler/brw_nir_rt_builder.h \ - compiler/brw_nir_tcs_workarounds.c \ - compiler/brw_packed_float.c \ - compiler/brw_predicated_break.cpp \ - compiler/brw_reg.h \ - compiler/brw_reg_type.c \ - compiler/brw_reg_type.h \ - compiler/brw_rt.h \ - compiler/brw_schedule_instructions.cpp \ - compiler/brw_shader.cpp \ - compiler/brw_shader.h \ - compiler/brw_vec4_builder.h \ - compiler/brw_vec4_cmod_propagation.cpp \ - compiler/brw_vec4_copy_propagation.cpp \ - compiler/brw_vec4.cpp \ - compiler/brw_vec4_cse.cpp \ - compiler/brw_vec4_dead_code_eliminate.cpp \ - compiler/brw_vec4_generator.cpp \ - compiler/brw_vec4_gs_visitor.cpp \ - compiler/brw_vec4_gs_visitor.h \ - compiler/brw_vec4.h \ - compiler/brw_vec4_live_variables.cpp \ - compiler/brw_vec4_live_variables.h \ - compiler/brw_vec4_nir.cpp \ - compiler/brw_vec4_gs_nir.cpp \ - compiler/brw_vec4_reg_allocate.cpp \ - compiler/brw_vec4_surface_builder.cpp \ - compiler/brw_vec4_surface_builder.h \ - compiler/brw_vec4_tcs.cpp \ - compiler/brw_vec4_tcs.h \ - compiler/brw_vec4_tes.cpp \ - compiler/brw_vec4_tes.h \ - compiler/brw_vec4_visitor.cpp \ - compiler/brw_vec4_vs_visitor.cpp \ - compiler/brw_vec4_vs.h \ - compiler/brw_vue_map.c \ - compiler/brw_wm_iz.cpp \ - compiler/gfx6_gs_visitor.cpp \ - compiler/gfx6_gs_visitor.h - -COMPILER_GENERATED_FILES = \ - compiler/brw_nir_trig_workarounds.c - -DEV_FILES = \ - dev/intel_debug.c \ - dev/intel_debug.h \ - dev/intel_device_info.c \ - dev/intel_device_info.h - -GENXML_XML_FILES = \ - genxml/gen4.xml \ - genxml/gen45.xml \ - genxml/gen5.xml \ - genxml/gen6.xml \ - genxml/gen7.xml \ - genxml/gen75.xml \ - genxml/gen8.xml \ - genxml/gen9.xml \ - genxml/gen11.xml \ - genxml/gen12.xml \ - genxml/gen125.xml - -GENXML_GENERATED_PACK_FILES = \ - genxml/gen4_pack.h \ - genxml/gen45_pack.h \ - genxml/gen5_pack.h \ - genxml/gen6_pack.h \ - genxml/gen7_pack.h \ - genxml/gen75_pack.h \ - genxml/gen8_pack.h \ - genxml/gen9_pack.h \ - genxml/gen11_pack.h \ - genxml/gen12_pack.h \ - genxml/gen125_pack.h - -GENXML_GENERATED_FILES = \ - $(GENXML_GENERATED_PACK_FILES) \ - genxml/genX_bits.h \ - genxml/genX_xml.h - -ISL_FILES = \ - isl/isl.c \ - isl/isl.h \ - isl/isl_aux_info.c \ - isl/isl_drm.c \ - isl/isl_format.c \ - isl/isl_genX_priv.h \ - isl/isl_priv.h \ - isl/isl_storage_image.c - -ISL_GFX4_FILES = \ - isl/isl_gfx4.c \ - isl/isl_gfx4.h \ - isl/isl_emit_depth_stencil.c \ - isl/isl_surface_state.c - -ISL_GFX5_FILES = \ - isl/isl_emit_depth_stencil.c \ - isl/isl_surface_state.c - -ISL_GFX6_FILES = \ - isl/isl_gfx6.c \ - isl/isl_gfx6.h \ - isl/isl_emit_depth_stencil.c \ - isl/isl_surface_state.c - -ISL_GFX7_FILES = \ - isl/isl_gfx7.c \ - isl/isl_gfx7.h \ - isl/isl_emit_depth_stencil.c \ - isl/isl_surface_state.c - -ISL_GFX75_FILES = \ - isl/isl_emit_depth_stencil.c \ - isl/isl_surface_state.c - -ISL_GFX8_FILES = \ - isl/isl_gfx8.c \ - isl/isl_gfx8.h \ - isl/isl_emit_depth_stencil.c \ - isl/isl_surface_state.c - -ISL_GFX9_FILES = \ - isl/isl_gfx9.c \ - isl/isl_gfx9.h \ - isl/isl_emit_depth_stencil.c \ - isl/isl_surface_state.c - -ISL_GFX11_FILES = \ - isl/isl_emit_depth_stencil.c \ - isl/isl_surface_state.c - -ISL_GFX12_FILES = \ - isl/isl_gfx12.c \ - isl/isl_gfx12.h \ - isl/isl_emit_depth_stencil.c \ - isl/isl_surface_state.c - -ISL_GFX125_FILES = \ - isl/isl_emit_depth_stencil.c \ - isl/isl_surface_state.c - -ISL_GENERATED_FILES = \ - isl/isl_format_layout.c - -ISL_TILED_MEMCPY_FILES = \ - isl/isl_tiled_memcpy_normal.c - -ISL_TILED_MEMCPY_SSE41_FILES = \ - isl/isl_tiled_memcpy_sse41.c - -ISL_TILED_MEMCPY_DEP_FILES = \ - isl/isl_tiled_memcpy.c - -VULKAN_FILES := \ - vulkan/anv_allocator.c \ - vulkan/anv_android.h \ - vulkan/anv_batch_chain.c \ - vulkan/anv_blorp.c \ - vulkan/anv_cmd_buffer.c \ - vulkan/anv_descriptor_set.c \ - vulkan/anv_device.c \ - vulkan/anv_formats.c \ - vulkan/anv_genX.h \ - vulkan/anv_image.c \ - vulkan/anv_measure.c \ - vulkan/anv_measure.h \ - vulkan/anv_nir.h \ - vulkan/anv_nir_add_base_work_group_id.c \ - vulkan/anv_nir_apply_pipeline_layout.c \ - vulkan/anv_nir_compute_push_layout.c \ - vulkan/anv_nir_lower_multiview.c \ - vulkan/anv_nir_lower_ubo_loads.c \ - vulkan/anv_nir_lower_ycbcr_textures.c \ - vulkan/anv_pass.c \ - vulkan/anv_perf.c \ - vulkan/anv_pipeline.c \ - vulkan/anv_pipeline_cache.c \ - vulkan/anv_private.h \ - vulkan/anv_queue.c \ - vulkan/anv_util.c \ - vulkan/anv_wsi.c - -VULKAN_NON_ANDROID_FILES := \ - vulkan/anv_android_stubs.c - -VULKAN_ANDROID_FILES := \ - vulkan/anv_android.c - -VULKAN_WSI_WAYLAND_FILES := \ - vulkan/anv_wsi_wayland.c - -VULKAN_WSI_X11_FILES := \ - vulkan/anv_wsi_x11.c - -VULKAN_WSI_DISPLAY_FILES := \ - vulkan/anv_wsi_display.c - -VULKAN_GEM_FILES := \ - vulkan/anv_gem.c - -VULKAN_GEM_STUB_FILES := \ - vulkan/anv_gem_stubs.c - -VULKAN_GENERATED_FILES := \ - vulkan/anv_entrypoints.c \ - vulkan/anv_entrypoints.h - -VULKAN_GENX_FILES := \ - vulkan/genX_blorp_exec.c \ - vulkan/genX_cmd_buffer.c \ - vulkan/genX_gpu_memcpy.c \ - vulkan/genX_pipeline.c \ - vulkan/genX_query.c \ - vulkan/genX_state.c - -VULKAN_GFX7_FILES := \ - vulkan/gfx7_cmd_buffer.c \ - $(VULKAN_GENX_FILES) - -VULKAN_GFX75_FILES := \ - vulkan/gfx7_cmd_buffer.c \ - $(VULKAN_GENX_FILES) - -VULKAN_GFX8_FILES := \ - vulkan/gfx8_cmd_buffer.c \ - $(VULKAN_GENX_FILES) - -VULKAN_GFX9_FILES := \ - vulkan/gfx8_cmd_buffer.c \ - $(VULKAN_GENX_FILES) - -VULKAN_GFX11_FILES := \ - vulkan/gfx8_cmd_buffer.c \ - $(VULKAN_GENX_FILES) - -VULKAN_GFX12_FILES := \ - vulkan/gfx8_cmd_buffer.c \ - $(VULKAN_GENX_FILES) - -VULKAN_GFX125_FILES := \ - vulkan/gfx8_cmd_buffer.c \ - $(VULKAN_GENX_FILES) - -INTEL_PERF_XML_FILES = \ - perf/oa-hsw.xml \ - perf/oa-bdw.xml \ - perf/oa-chv.xml \ - perf/oa-sklgt2.xml \ - perf/oa-sklgt3.xml \ - perf/oa-sklgt4.xml \ - perf/oa-bxt.xml \ - perf/oa-kblgt2.xml \ - perf/oa-kblgt3.xml \ - perf/oa-glk.xml \ - perf/oa-cflgt2.xml \ - perf/oa-cflgt3.xml \ - perf/oa-icl.xml \ - perf/oa-ehl.xml \ - perf/oa-tglgt1.xml \ - perf/oa-tglgt2.xml \ - perf/oa-rkl.xml \ - perf/oa-dg1.xml \ - perf/oa-adl.xml - -INTEL_PERF_FILES = \ - perf/intel_perf.c \ - perf/intel_perf.h \ - perf/intel_perf_mdapi.c \ - perf/intel_perf_mdapi.h \ - perf/intel_perf_private.h \ - perf/intel_perf_query.h \ - perf/intel_perf_query.c - -INTEL_PERF_GENERATED_FILES = \ - perf/intel_perf_metrics.c \ - perf/intel_perf_metrics.h diff --git a/src/loader/Android.mk b/src/loader/Android.mk deleted file mode 100644 index 6aaaa1dac85..00000000000 --- a/src/loader/Android.mk +++ /dev/null @@ -1,45 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2014 Emil Velikov -# -# 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. - -LOCAL_PATH := $(call my-dir) - -include $(LOCAL_PATH)/Makefile.sources - -# --------------------------------------- -# Build libmesa_loader -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(LOADER_C_FILES) - -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) - -ifneq ($(HAVE_GALLIUM_IRIS),) -LOCAL_CFLAGS += -DPREFER_IRIS -endif - -LOCAL_MODULE := libmesa_loader - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/loader/Makefile.sources b/src/loader/Makefile.sources deleted file mode 100644 index 6627222ac30..00000000000 --- a/src/loader/Makefile.sources +++ /dev/null @@ -1,7 +0,0 @@ -LOADER_C_FILES := \ - loader_dri_helper.c \ - loader_dri_helper.h \ - loader.c \ - loader.h \ - pci_id_driver_map.c \ - pci_id_driver_map.h diff --git a/src/mapi/Android.mk b/src/mapi/Android.mk deleted file mode 100644 index 9405d2ac3d5..00000000000 --- a/src/mapi/Android.mk +++ /dev/null @@ -1,81 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2010-2011 Chia-I Wu -# Copyright (C) 2010-2011 LunarG Inc. -# -# 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 glapi - -LOCAL_PATH := $(call my-dir) - -mapi_abi_headers := - -# --------------------------------------- -# Build libglapi -# --------------------------------------- - -include $(CLEAR_VARS) - -abi_header := shared-glapi/glapi_mapi_tmp.h - -LOCAL_SRC_FILES := \ - entry.c \ - mapi_glapi.c \ - stub.c \ - table.c \ - u_current.c \ - u_execmem.c - -LOCAL_CFLAGS := \ - -DMAPI_MODE_GLAPI \ - -DMAPI_ABI_HEADER=\"$(abi_header)\" - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/mapi - -LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(MESA_TOP)/src/mapi - -LOCAL_MODULE := libglapi - -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -intermediates := $(call local-generated-sources-dir) -abi_header := $(intermediates)/$(abi_header) -LOCAL_GENERATED_SOURCES := $(abi_header) - -$(abi_header): PRIVATE_PRINTER := shared-glapi - -mapi_abi_headers += $(abi_header) - -include $(MESA_COMMON_MK) -include $(BUILD_SHARED_LIBRARY) - - -mapi_abi_deps := \ - $(wildcard $(LOCAL_PATH)/glapi/gen/*.py) \ - $(wildcard $(LOCAL_PATH)/glapi/gen/*.xml) \ - $(LOCAL_PATH)/mapi_abi.py - -$(mapi_abi_headers): PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/mapi_abi.py -$(mapi_abi_headers): PRIVATE_APIXML := $(LOCAL_PATH)/glapi/gen/gl_and_es_API.xml -$(mapi_abi_headers): $(mapi_abi_deps) - @mkdir -p $(dir $@) - @echo "target $(PRIVATE_PRINTER): $(PRIVATE_MODULE) <= $(PRIVATE_APIXML)" - $(hide) $(PRIVATE_SCRIPT) --printer $(PRIVATE_PRINTER) $(PRIVATE_APIXML) > $@ diff --git a/src/mapi/Makefile.sources b/src/mapi/Makefile.sources deleted file mode 100644 index 4b83caa8ed2..00000000000 --- a/src/mapi/Makefile.sources +++ /dev/null @@ -1,38 +0,0 @@ -# src/mapi/Makefile.sources -# -# mapi may be used in several ways -# -# - In util mode, mapi provides utility functions for use with glapi. To use -# this mode, compile MAPI_UTIL_FILES with MAPI_MODE_UTIL defined. -# -# - In glapi mode, mapi implements the interface defined by glapi.h. To use -# this mode, compile MAPI_GLAPI_FILES with MAPI_MODE_GLAPI defined. -# -# - In bridge mode, mapi provides entry points calling into glapi. To use -# this mode, compile MAPI_BRIDGE_FILES with MAPI_MODE_BRIDGE defined. - -MAPI_UTIL_FILES = \ - u_current.c \ - u_current.h \ - u_execmem.c \ - u_execmem.h - -MAPI_BRIDGE_FILES = \ - entry.c \ - entry.h \ - entry_x86-64_tls.h \ - entry_x86_tls.h \ - entry_x86_tsd.h \ - entry_ppc64le_tls.h \ - entry_ppc64le_tsd.h \ - mapi_tmp.h - -MAPI_GLAPI_FILES = \ - entry.c \ - mapi_glapi.c \ - stub.c \ - stub.h \ - table.c \ - table.h \ - $(MAPI_UTIL_FILES) - diff --git a/src/mesa/Android.gen.mk b/src/mesa/Android.gen.mk deleted file mode 100644 index d6a6499628b..00000000000 --- a/src/mesa/Android.gen.mk +++ /dev/null @@ -1,177 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2010-2011 Chia-I Wu -# Copyright (C) 2010-2011 LunarG Inc. -# -# 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. - -# included by core mesa Android.mk for source generation - -ifeq ($(LOCAL_MODULE_CLASS),) -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -endif - -intermediates := $(call local-generated-sources-dir) - -# This is the list of auto-generated files: sources and headers -sources := \ - main/enums.c \ - main/api_exec.c \ - main/dispatch.h \ - main/format_fallback.c \ - main/format_info.h \ - main/remap_helper.h \ - main/get_hash.h \ - main/marshal_generated0.c \ - main/marshal_generated1.c \ - main/marshal_generated2.c \ - main/marshal_generated3.c \ - main/marshal_generated4.c \ - main/marshal_generated5.c \ - main/marshal_generated6.c \ - main/marshal_generated7.c \ - main/marshal_generated.h - -LOCAL_SRC_FILES := $(filter-out $(sources), $(LOCAL_SRC_FILES)) - -LOCAL_C_INCLUDES += $(intermediates)/main - -sources := $(addprefix $(intermediates)/, $(sources)) - -LOCAL_GENERATED_SOURCES += $(sources) - -glapi := $(MESA_TOP)/src/mapi/glapi/gen - -dispatch_deps := \ - $(wildcard $(glapi)/*.py) \ - $(wildcard $(glapi)/*.xml) - -define es-gen - @mkdir -p $(dir $@) - @echo "Gen ES: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(PRIVATE_SCRIPT) $(1) $(PRIVATE_XML) > $@ -endef - -$(intermediates)/main/dispatch.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_table.py -$(intermediates)/main/dispatch.h: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml - -$(intermediates)/main/dispatch.h: $(dispatch_deps) - $(call es-gen, $* -m remap_table) - -$(intermediates)/main/remap_helper.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/remap_helper.py -$(intermediates)/main/remap_helper.h: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml - -$(intermediates)/main/remap_helper.h: $(dispatch_deps) - $(call es-gen, $*) - -$(intermediates)/main/enums.c: PRIVATE_SCRIPT :=$(MESA_PYTHON2) $(glapi)/gl_enums.py -$(intermediates)/main/enums.c: PRIVATE_XML := -f $(glapi)/../registry/gl.xml - -$(intermediates)/main/enums.c: $(dispatch_deps) - $(call es-gen) - -$(intermediates)/main/api_exec.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_genexec.py -$(intermediates)/main/api_exec.c: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml - -$(intermediates)/main/api_exec.c: $(dispatch_deps) - $(call es-gen) - -$(intermediates)/main/marshal_generated0.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_marshal.py -$(intermediates)/main/marshal_generated0.c: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml -i 0 -n 8 - -$(intermediates)/main/marshal_generated0.c: $(dispatch_deps) - $(call es-gen) - -$(intermediates)/main/marshal_generated1.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_marshal.py -$(intermediates)/main/marshal_generated1.c: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml -i 1 -n 8 - -$(intermediates)/main/marshal_generated1.c: $(dispatch_deps) - $(call es-gen) - -$(intermediates)/main/marshal_generated2.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_marshal.py -$(intermediates)/main/marshal_generated2.c: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml -i 2 -n 8 - -$(intermediates)/main/marshal_generated2.c: $(dispatch_deps) - $(call es-gen) - -$(intermediates)/main/marshal_generated3.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_marshal.py -$(intermediates)/main/marshal_generated3.c: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml -i 3 -n 8 - -$(intermediates)/main/marshal_generated3.c: $(dispatch_deps) - $(call es-gen) - -$(intermediates)/main/marshal_generated4.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_marshal.py -$(intermediates)/main/marshal_generated4.c: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml -i 4 -n 8 - -$(intermediates)/main/marshal_generated4.c: $(dispatch_deps) - $(call es-gen) - -$(intermediates)/main/marshal_generated5.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_marshal.py -$(intermediates)/main/marshal_generated5.c: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml -i 5 -n 8 - -$(intermediates)/main/marshal_generated5.c: $(dispatch_deps) - $(call es-gen) - -$(intermediates)/main/marshal_generated6.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_marshal.py -$(intermediates)/main/marshal_generated6.c: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml -i 6 -n 8 - -$(intermediates)/main/marshal_generated6.c: $(dispatch_deps) - $(call es-gen) - -$(intermediates)/main/marshal_generated7.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_marshal.py -$(intermediates)/main/marshal_generated7.c: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml -i 7 -n 8 - -$(intermediates)/main/marshal_generated7.c: $(dispatch_deps) - $(call es-gen) - -$(intermediates)/main/marshal_generated.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_marshal_h.py -$(intermediates)/main/marshal_generated.h: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml - -$(intermediates)/main/marshal_generated.h: $(dispatch_deps) - $(call es-gen) - -GET_HASH_GEN := $(LOCAL_PATH)/main/get_hash_generator.py - -$(intermediates)/main/get_hash.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(GET_HASH_GEN) -$(intermediates)/main/get_hash.h: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml -$(intermediates)/main/get_hash.h: $(glapi)/gl_and_es_API.xml \ - $(LOCAL_PATH)/main/get_hash_params.py $(GET_HASH_GEN) - $(call es-gen) - -FORMAT_FALLBACK := $(LOCAL_PATH)/main/format_fallback.py -format_fallback_deps := \ - $(LOCAL_PATH)/main/formats.csv \ - $(LOCAL_PATH)/main/format_parser.py \ - $(FORMAT_FALLBACK) - -$(intermediates)/main/format_fallback.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(FORMAT_FALLBACK) -$(intermediates)/main/format_fallback.c: PRIVATE_XML := -$(intermediates)/main/format_fallback.c: $(format_fallback_deps) - $(call es-gen, $< /dev/stdout) - -FORMAT_INFO := $(LOCAL_PATH)/main/format_info.py -format_info_deps := \ - $(LOCAL_PATH)/main/formats.csv \ - $(LOCAL_PATH)/main/format_parser.py \ - $(FORMAT_INFO) - -$(intermediates)/main/format_info.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(FORMAT_INFO) -$(intermediates)/main/format_info.h: PRIVATE_XML := -$(intermediates)/main/format_info.h: $(format_info_deps) - $(call es-gen, $<) diff --git a/src/mesa/Android.libmesa_dricore.mk b/src/mesa/Android.libmesa_dricore.mk deleted file mode 100644 index 8eb6aabe836..00000000000 --- a/src/mesa/Android.libmesa_dricore.mk +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 2012 Intel Corporation -# Copyright (C) 2010-2011 Chia-I Wu -# Copyright (C) 2010-2011 LunarG Inc. -# -# 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. - -# ---------------------------------------------------------------------- -# libmesa_dricore.a -# ---------------------------------------------------------------------- - -LOCAL_PATH := $(call my-dir) - -# Import the following variables: -# MESA_FILES -# X86_FILES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_dricore -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -LOCAL_SRC_FILES := \ - $(MESA_FILES) - -ifeq ($(TARGET_ARCH),x86) - LOCAL_SRC_FILES += $(X86_FILES) -endif # x86 - -ifeq ($(ARCH_X86_HAVE_SSE4_1),true) -LOCAL_WHOLE_STATIC_LIBRARIES := \ - libmesa_sse41 -LOCAL_CFLAGS := \ - -msse4.1 -mstackrealign \ - -DUSE_SSE41 -endif - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/mesa/main \ - $(MESA_TOP)/src/compiler/nir \ - $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src/gallium/auxiliary \ - $(dir $(MESA_GEN_GLSL_H)) - -LOCAL_GENERATED_SOURCES += \ - $(MESA_GEN_GLSL_H) - -LOCAL_STATIC_LIBRARIES += \ - libmesa_nir - -LOCAL_WHOLE_STATIC_LIBRARIES += \ - libmesa_program \ - libmesa_git_sha1 - -include $(LOCAL_PATH)/Android.gen.mk -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/mesa/Android.libmesa_git_sha1.mk b/src/mesa/Android.libmesa_git_sha1.mk deleted file mode 100644 index fbbbf2fe094..00000000000 --- a/src/mesa/Android.libmesa_git_sha1.mk +++ /dev/null @@ -1,54 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2017 Mauro Rossi -# -# 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. - -# ---------------------------------------------------------------------- -# libmesa_git_sha1 -# ---------------------------------------------------------------------- - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_git_sha1 - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -intermediates := $(call local-generated-sources-dir) - -# dummy.c source file is generated to meet the build system's rules. -LOCAL_GENERATED_SOURCES += $(intermediates)/dummy.c - -$(intermediates)/dummy.c: - @mkdir -p $(dir $@) - @echo "Gen Dummy: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) touch $@ - -LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, git_sha1.h) - -$(intermediates)/git_sha1.h: $(wildcard $(MESA_TOP)/.git/logs/HEAD) - @mkdir -p $(dir $@) - @echo "GIT-SHA1: $(PRIVATE_MODULE) <= git" - $(hide) $(MESA_PYTHON2) $(MESA_TOP)/bin/git_sha1_gen.py --output $@ - -LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/mesa/Android.libmesa_glsl_utils.mk b/src/mesa/Android.libmesa_glsl_utils.mk deleted file mode 100644 index 66b6ef13a61..00000000000 --- a/src/mesa/Android.libmesa_glsl_utils.mk +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 2012 Intel Corporation -# Copyright (C) 2010-2011 Chia-I Wu -# Copyright (C) 2010-2011 LunarG Inc. -# -# 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. - -LOCAL_PATH := $(call my-dir) - -# -# The libmesa_glsl_utils libraries allow us to avoid a circular dependency -# between core mesa and glsl. -# - -# --------------------------------------- -# libmesa_glsl_utils.a for target -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_glsl_utils - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/compiler/nir \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src/gallium/auxiliary - -LOCAL_SRC_FILES := \ - main/extensions_table.c \ - program/symbol_table.c \ - program/dummy_errors.c - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# --------------------------------------- -# libmesa_glsl_utils.a for host -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_glsl_utils -LOCAL_IS_HOST_MODULE := true -LOCAL_CFLAGS := -D_POSIX_C_SOURCE=199309L - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/compiler/nir \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src/gallium/auxiliary - -LOCAL_SRC_FILES := \ - main/extensions_table.c \ - program/symbol_table.c \ - program/dummy_errors.c - -include $(MESA_COMMON_MK) -include $(BUILD_HOST_STATIC_LIBRARY) diff --git a/src/mesa/Android.libmesa_sse41.mk b/src/mesa/Android.libmesa_sse41.mk deleted file mode 100644 index de19a1fb48b..00000000000 --- a/src/mesa/Android.libmesa_sse41.mk +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2012 Intel Corporation -# Copyright (C) 2010-2011 Chia-I Wu -# Copyright (C) 2010-2011 LunarG Inc. -# -# 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. - -ifeq ($(ARCH_X86_HAVE_SSE4_1),true) - -LOCAL_PATH := $(call my-dir) - -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_sse41 - -LOCAL_SRC_FILES += \ - $(X86_SSE41_FILES) - -LOCAL_CFLAGS := \ - -msse4.1 -mstackrealign - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src/gallium/auxiliary - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -endif diff --git a/src/mesa/Android.libmesa_st_mesa.mk b/src/mesa/Android.libmesa_st_mesa.mk deleted file mode 100644 index 16153a3c5bd..00000000000 --- a/src/mesa/Android.libmesa_st_mesa.mk +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 2012 Intel Corporation -# Copyright (C) 2010-2011 Chia-I Wu -# Copyright (C) 2010-2011 LunarG Inc. -# -# 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. - -# ---------------------------------------------------------------------- -# libmesa_st_mesa.a -# ---------------------------------------------------------------------- - -LOCAL_PATH := $(call my-dir) - -# Import variables: -# MESA_GALLIUM_FILES. -# X86_FILES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_st_mesa - -LOCAL_SRC_FILES := \ - $(MESA_GALLIUM_FILES) - -LOCAL_GENERATED_SOURCES := \ - $(MESA_GEN_GLSL_H) \ - $(MESA_GEN_NIR_H) - -ifeq ($(TARGET_ARCH),x86) - LOCAL_SRC_FILES += $(X86_FILES) -endif # x86 - -ifeq ($(ARCH_X86_HAVE_SSE4_1),true) -LOCAL_WHOLE_STATIC_LIBRARIES := \ - libmesa_sse41 -LOCAL_CFLAGS := \ - -DUSE_SSE41 -endif - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/mesa/main \ - $(MESA_TOP)/src/compiler/nir \ - $(MESA_TOP)/src/gallium/auxiliary \ - $(MESA_TOP)/src/gallium/include - -LOCAL_WHOLE_STATIC_LIBRARIES += \ - libmesa_program \ - libmesa_git_sha1 - -LOCAL_STATIC_LIBRARIES += libmesa_nir libmesa_glsl - -include $(LOCAL_PATH)/Android.gen.mk -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/mesa/Android.mk b/src/mesa/Android.mk deleted file mode 100644 index a740c2d2220..00000000000 --- a/src/mesa/Android.mk +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2012 Intel Corporation -# -# 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. - -LOCAL_PATH := $(call my-dir) - -include $(LOCAL_PATH)/Android.libmesa_glsl_utils.mk -include $(LOCAL_PATH)/Android.libmesa_dricore.mk -include $(LOCAL_PATH)/Android.libmesa_st_mesa.mk -include $(LOCAL_PATH)/Android.libmesa_sse41.mk -include $(LOCAL_PATH)/Android.libmesa_git_sha1.mk - -include $(LOCAL_PATH)/program/Android.mk diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources deleted file mode 100644 index 53242281db2..00000000000 --- a/src/mesa/Makefile.sources +++ /dev/null @@ -1,709 +0,0 @@ -### Lists of source files, included by Makefiles - -# this is part of MAIN_FILES -MAIN_ES_FILES = \ - main/es1_conversion.c \ - main/es1_conversion.h - -MAIN_FILES = \ - main/accum.c \ - main/accum.h \ - main/api_arrayelt.c \ - main/api_arrayelt.h \ - main/api_exec.c \ - main/api_exec.h \ - main/arbprogram.c \ - main/arbprogram.h \ - main/arrayobj.c \ - main/arrayobj.h \ - main/atifragshader.c \ - main/atifragshader.h \ - main/attrib.c \ - main/attrib.h \ - main/barrier.c \ - main/barrier.h \ - main/bbox.c \ - main/bbox.h \ - main/blend.c \ - main/blend.h \ - main/blit.c \ - main/blit.h \ - main/bufferobj.c \ - main/bufferobj.h \ - main/buffers.c \ - main/buffers.h \ - main/clear.c \ - main/clear.h \ - main/clip.c \ - main/clip.h \ - main/colormac.h \ - main/colortab.c \ - main/colortab.h \ - main/compute.c \ - main/compute.h \ - main/condrender.c \ - main/condrender.h \ - main/config.h \ - main/conservativeraster.c \ - main/conservativeraster.h \ - main/context.c \ - main/context.h \ - main/convolve.c \ - main/convolve.h \ - main/copyimage.c \ - main/copyimage.h \ - main/cpuinfo.c \ - main/cpuinfo.h \ - main/dd.h \ - main/debug.c \ - main/debug.h \ - main/debug_output.c \ - main/debug_output.h \ - main/depth.c \ - main/depth.h \ - main/dlist.c \ - main/dlist.h \ - main/draw.c \ - main/draw.h \ - main/drawpix.c \ - main/drawpix.h \ - main/drawtex.c \ - main/drawtex.h \ - main/draw_validate.c \ - main/draw_validate.h \ - main/enable.c \ - main/enable.h \ - main/enums.c \ - main/enums.h \ - main/errors.c \ - main/errors.h \ - main/eval.c \ - main/eval.h \ - main/execmem.c \ - main/execmem.h \ - main/extensions.c \ - main/extensions.h \ - main/extensions_table.c \ - main/extensions_table.h \ - main/externalobjects.c \ - main/externalobjects.h \ - main/fbobject.c \ - main/fbobject.h \ - main/feedback.c \ - main/feedback.h \ - main/ff_fragment_shader.cpp \ - main/ffvertex_prog.c \ - main/ffvertex_prog.h \ - main/fog.c \ - main/fog.h \ - main/format_fallback.c \ - main/format_info.h \ - main/format_pack.h \ - main/format_unpack.h \ - main/formatquery.c \ - main/formatquery.h \ - main/formats.c \ - main/formats.h \ - main/format_utils.c \ - main/format_utils.h \ - main/framebuffer.c \ - main/framebuffer.h \ - main/get.c \ - main/get.h \ - main/get_hash.h \ - main/genmipmap.c \ - main/genmipmap.h \ - main/getstring.c \ - main/glformats.c \ - main/glformats.h \ - main/glspirv.c \ - main/glspirv.h \ - main/glthread.c \ - main/glthread.h \ - main/glthread_bufferobj.c \ - main/glthread_draw.c \ - main/glthread_get.c \ - main/glthread_marshal.h \ - main/glthread_shaderobj.c \ - main/glthread_varray.c \ - main/glheader.h \ - main/hash.c \ - main/hash.h \ - main/hint.c \ - main/hint.h \ - main/histogram.c \ - main/histogram.h \ - main/image.c \ - main/image.h \ - main/mesa_private.h \ - main/light.c \ - main/light.h \ - main/lines.c \ - main/lines.h \ - main/macros.h \ - main/marshal_generated0.c \ - main/marshal_generated1.c \ - main/marshal_generated2.c \ - main/marshal_generated3.c \ - main/marshal_generated4.c \ - main/marshal_generated5.c \ - main/marshal_generated6.c \ - main/marshal_generated7.c \ - main/marshal_generated.h \ - main/matrix.c \ - main/matrix.h \ - main/mipmap.c \ - main/mipmap.h \ - main/menums.h \ - main/mtypes.h \ - main/multisample.c \ - main/multisample.h \ - main/objectlabel.c \ - main/objectlabel.h \ - main/objectpurge.c \ - main/objectpurge.h \ - main/pack.c \ - main/pack.h \ - main/pbo.c \ - main/pbo.h \ - main/performance_monitor.c \ - main/performance_monitor.h \ - main/performance_query.c \ - main/performance_query.h \ - main/pipelineobj.c \ - main/pipelineobj.h \ - main/pixel.c \ - main/pixel.h \ - main/pixelstore.c \ - main/pixelstore.h \ - main/pixeltransfer.c \ - main/pixeltransfer.h \ - main/points.c \ - main/points.h \ - main/polygon.c \ - main/polygon.h \ - main/program_binary.c \ - main/program_binary.h \ - main/program_resource.c \ - main/program_resource.h \ - main/querymatrix.c \ - main/querymatrix.h \ - main/queryobj.c \ - main/queryobj.h \ - main/rastpos.c \ - main/rastpos.h \ - main/readpix.c \ - main/readpix.h \ - main/remap.c \ - main/remap.h \ - main/renderbuffer.c \ - main/renderbuffer.h \ - main/robustness.c \ - main/samplerobj.c \ - main/samplerobj.h \ - main/scissor.c \ - main/scissor.h \ - main/shaderapi.c \ - main/shaderapi.h \ - main/shaderimage.c \ - main/shaderimage.h \ - main/shaderobj.c \ - main/shaderobj.h \ - main/shader_query.cpp \ - main/shared.c \ - main/shared.h \ - main/spirv_extensions.c \ - main/spirv_extensions.h \ - main/state.c \ - main/state.h \ - main/stencil.c \ - main/stencil.h \ - main/syncobj.c \ - main/syncobj.h \ - main/texcompress.c \ - main/texcompress_astc.cpp \ - main/texcompress_astc.h \ - main/texcompress_bptc.c \ - main/texcompress_bptc.h \ - main/texcompress_bptc_tmp.h \ - main/texcompress_cpal.c \ - main/texcompress_cpal.h \ - main/texcompress_etc.c \ - main/texcompress_etc.h \ - main/texcompress_etc_tmp.h \ - main/texcompress_fxt1.c \ - main/texcompress_fxt1.h \ - main/texcompress.h \ - main/texcompress_rgtc.c \ - main/texcompress_rgtc.h \ - main/texcompress_s3tc.c \ - main/texcompress_s3tc.h \ - main/texcompress_s3tc_tmp.h \ - main/texenv.c \ - main/texenv.h \ - main/texenvprogram.h \ - main/texformat.c \ - main/texformat.h \ - main/texgen.c \ - main/texgen.h \ - main/texgetimage.c \ - main/texgetimage.h \ - main/teximage.c \ - main/teximage.h \ - main/texobj.c \ - main/texobj.h \ - main/texparam.c \ - main/texparam.h \ - main/texstate.c \ - main/texstate.h \ - main/texstorage.c \ - main/texstorage.h \ - main/texstore.c \ - main/texstore.h \ - main/texturebindless.c \ - main/texturebindless.h \ - main/textureview.c \ - main/textureview.h \ - main/transformfeedback.c \ - main/transformfeedback.h \ - main/uniform_query.cpp \ - main/uniforms.c \ - main/uniforms.h \ - main/varray.c \ - main/varray.h \ - main/vdpau.c \ - main/vdpau.h \ - main/version.c \ - main/version.h \ - main/viewport.c \ - main/viewport.h \ - main/vtxfmt.c \ - main/vtxfmt.h \ - $(MAIN_ES_FILES) - -MATH_FILES = \ - math/m_debug.h \ - math/m_debug_clip.c \ - math/m_debug_norm.c \ - math/m_debug_util.h \ - math/m_debug_xform.c \ - math/m_eval.c \ - math/m_eval.h \ - math/m_matrix.c \ - math/m_matrix.h \ - math/m_trans_tmp.h \ - math/m_translate.c \ - math/m_translate.h \ - math/m_vector.c \ - math/m_vector.h - -MATH_XFORM_FILES = \ - math/m_clip_tmp.h \ - math/m_copy_tmp.h \ - math/m_dotprod_tmp.h \ - math/m_norm_tmp.h \ - math/m_xform.c \ - math/m_xform.h \ - math/m_xform_tmp.h - -SWRAST_FILES = \ - swrast/s_aaline.c \ - swrast/s_aaline.h \ - swrast/s_aalinetemp.h \ - swrast/s_aatriangle.c \ - swrast/s_aatriangle.h \ - swrast/s_aatritemp.h \ - swrast/s_alpha.c \ - swrast/s_alpha.h \ - swrast/s_atifragshader.c \ - swrast/s_atifragshader.h \ - swrast/s_bitmap.c \ - swrast/s_blend.c \ - swrast/s_blend.h \ - swrast/s_blit.c \ - swrast/s_chan.h \ - swrast/s_clear.c \ - swrast/s_context.c \ - swrast/s_context.h \ - swrast/s_copypix.c \ - swrast/s_depth.c \ - swrast/s_depth.h \ - swrast/s_drawpix.c \ - swrast_setup/ss_tritmp.h \ - swrast_setup/ss_vb.h \ - swrast_setup/swrast_setup.h \ - swrast/s_feedback.c \ - swrast/s_feedback.h \ - swrast/s_fog.c \ - swrast/s_fog.h \ - swrast/s_fragprog.c \ - swrast/s_fragprog.h \ - swrast/s_lines.c \ - swrast/s_lines.h \ - swrast/s_linetemp.h \ - swrast/s_logic.c \ - swrast/s_logic.h \ - swrast/s_masking.c \ - swrast/s_masking.h \ - swrast/s_points.c \ - swrast/s_points.h \ - swrast/s_renderbuffer.c \ - swrast/s_renderbuffer.h \ - swrast/s_span.c \ - swrast/s_span.h \ - swrast/s_stencil.c \ - swrast/s_stencil.h \ - swrast/s_texcombine.c \ - swrast/s_texcombine.h \ - swrast/s_texfetch.c \ - swrast/s_texfetch.h \ - swrast/s_texfetch_tmp.h \ - swrast/s_texfilter.c \ - swrast/s_texfilter.h \ - swrast/s_texrender.c \ - swrast/s_texture.c \ - swrast/s_triangle.c \ - swrast/s_triangle.h \ - swrast/s_tritemp.h \ - swrast/swrast.h \ - swrast/s_zoom.c \ - swrast/s_zoom.h - -SWRAST_SETUP_FILES = \ - swrast_setup/ss_context.c \ - swrast_setup/ss_context.h \ - swrast_setup/ss_triangle.c \ - swrast_setup/ss_triangle.h - -TNL_FILES = \ - tnl/t_context.c \ - tnl/t_context.h \ - tnl/t_draw.c \ - tnl/tnl.h \ - tnl/t_pipeline.c \ - tnl/t_pipeline.h \ - tnl/t_rebase.c \ - tnl/t_rebase.h \ - tnl/t_split.c \ - tnl/t_split_copy.c \ - tnl/t_split.h \ - tnl/t_split_inplace.c \ - tnl/t_vb_cliptmp.h \ - tnl/t_vb_fog.c \ - tnl/t_vb_light.c \ - tnl/t_vb_lighttmp.h \ - tnl/t_vb_normals.c \ - tnl/t_vb_points.c \ - tnl/t_vb_program.c \ - tnl/t_vb_render.c \ - tnl/t_vb_rendertmp.h \ - tnl/t_vb_texgen.c \ - tnl/t_vb_texmat.c \ - tnl/t_vb_vertex.c \ - tnl/t_vertex.c \ - tnl/t_vertex_generic.c \ - tnl/t_vertex.h \ - tnl/t_vertex_sse.c \ - tnl/t_vp_build.c \ - tnl/t_vp_build.h - -VBO_FILES = \ - vbo/vbo_attrib.h \ - vbo/vbo_attrib_tmp.h \ - vbo/vbo_context.c \ - vbo/vbo_exec_api.c \ - vbo/vbo_exec.c \ - vbo/vbo_exec_draw.c \ - vbo/vbo_exec_eval.c \ - vbo/vbo_exec.h \ - vbo/vbo.h \ - vbo/vbo_init_tmp.h \ - vbo/vbo_minmax_index.c \ - vbo/vbo_noop.c \ - vbo/vbo_noop.h \ - vbo/vbo_private.h \ - vbo/vbo_save_api.c \ - vbo/vbo_save.c \ - vbo/vbo_save_draw.c \ - vbo/vbo_save.h \ - vbo/vbo_save_loopback.c \ - vbo/vbo_util.h - -STATETRACKER_FILES = \ - state_tracker/st_atifs_to_nir.c \ - state_tracker/st_atifs_to_nir.h \ - state_tracker/st_atom_array.c \ - state_tracker/st_atom_atomicbuf.c \ - state_tracker/st_atom_blend.c \ - state_tracker/st_atom.c \ - state_tracker/st_atom_clip.c \ - state_tracker/st_atom_constbuf.c \ - state_tracker/st_atom_constbuf.h \ - state_tracker/st_atom_depth.c \ - state_tracker/st_atom_framebuffer.c \ - state_tracker/st_atom.h \ - state_tracker/st_atom_list.h \ - state_tracker/st_atom_image.c \ - state_tracker/st_atom_msaa.c \ - state_tracker/st_atom_pixeltransfer.c \ - state_tracker/st_atom_rasterizer.c \ - state_tracker/st_atom_sampler.c \ - state_tracker/st_atom_scissor.c \ - state_tracker/st_atom_shader.c \ - state_tracker/st_atom_stipple.c \ - state_tracker/st_atom_storagebuf.c \ - state_tracker/st_atom_tess.c \ - state_tracker/st_atom_texture.c \ - state_tracker/st_atom_viewport.c \ - state_tracker/st_cb_bitmap.c \ - state_tracker/st_cb_bitmap.h \ - state_tracker/st_cb_bitmap_shader.c \ - state_tracker/st_cb_blit.c \ - state_tracker/st_cb_blit.h \ - state_tracker/st_cb_bufferobjects.c \ - state_tracker/st_cb_bufferobjects.h \ - state_tracker/st_cb_clear.c \ - state_tracker/st_cb_clear.h \ - state_tracker/st_cb_compute.c \ - state_tracker/st_cb_compute.h \ - state_tracker/st_cb_condrender.c \ - state_tracker/st_cb_condrender.h \ - state_tracker/st_cb_copyimage.c \ - state_tracker/st_cb_copyimage.h \ - state_tracker/st_cb_drawpixels.c \ - state_tracker/st_cb_drawpixels.h \ - state_tracker/st_cb_drawpixels_shader.c \ - state_tracker/st_cb_drawtex.c \ - state_tracker/st_cb_drawtex.h \ - state_tracker/st_cb_eglimage.c \ - state_tracker/st_cb_eglimage.h \ - state_tracker/st_cb_fbo.c \ - state_tracker/st_cb_fbo.h \ - state_tracker/st_cb_feedback.c \ - state_tracker/st_cb_feedback.h \ - state_tracker/st_cb_flush.c \ - state_tracker/st_cb_flush.h \ - state_tracker/st_cb_memoryobjects.c \ - state_tracker/st_cb_memoryobjects.h \ - state_tracker/st_cb_msaa.c \ - state_tracker/st_cb_msaa.h \ - state_tracker/st_cb_perfmon.c \ - state_tracker/st_cb_perfmon.h \ - state_tracker/st_cb_perfquery.c \ - state_tracker/st_cb_perfquery.h \ - state_tracker/st_cb_program.c \ - state_tracker/st_cb_program.h \ - state_tracker/st_cb_queryobj.c \ - state_tracker/st_cb_queryobj.h \ - state_tracker/st_cb_rasterpos.c \ - state_tracker/st_cb_rasterpos.h \ - state_tracker/st_cb_readpixels.c \ - state_tracker/st_cb_readpixels.h \ - state_tracker/st_cb_semaphoreobjects.c \ - state_tracker/st_cb_semaphoreobjects.h \ - state_tracker/st_cb_strings.c \ - state_tracker/st_cb_strings.h \ - state_tracker/st_cb_syncobj.c \ - state_tracker/st_cb_syncobj.h \ - state_tracker/st_cb_texturebarrier.c \ - state_tracker/st_cb_texturebarrier.h \ - state_tracker/st_cb_texture.c \ - state_tracker/st_cb_texture.h \ - state_tracker/st_cb_viewport.c \ - state_tracker/st_cb_viewport.h \ - state_tracker/st_cb_xformfb.c \ - state_tracker/st_cb_xformfb.h \ - state_tracker/st_context.c \ - state_tracker/st_context.h \ - state_tracker/st_copytex.c \ - state_tracker/st_copytex.h \ - state_tracker/st_debug.c \ - state_tracker/st_debug.h \ - state_tracker/st_draw.c \ - state_tracker/st_draw_feedback.c \ - state_tracker/st_draw.h \ - state_tracker/st_extensions.c \ - state_tracker/st_extensions.h \ - state_tracker/st_format.c \ - state_tracker/st_format.h \ - state_tracker/st_gen_mipmap.c \ - state_tracker/st_gen_mipmap.h \ - state_tracker/st_gl_api.h \ - state_tracker/st_glsl_to_ir.cpp \ - state_tracker/st_glsl_to_ir.h \ - state_tracker/st_glsl_to_nir.cpp \ - state_tracker/st_glsl_to_tgsi.cpp \ - state_tracker/st_glsl_to_tgsi.h \ - state_tracker/st_glsl_to_tgsi_array_merge.cpp \ - state_tracker/st_glsl_to_tgsi_array_merge.h \ - state_tracker/st_glsl_to_tgsi_private.cpp \ - state_tracker/st_glsl_to_tgsi_private.h \ - state_tracker/st_glsl_to_tgsi_temprename.cpp \ - state_tracker/st_glsl_to_tgsi_temprename.h \ - state_tracker/st_manager.c \ - state_tracker/st_manager.h \ - state_tracker/st_nir.h \ - state_tracker/st_nir_builtins.c \ - state_tracker/st_nir_lower_builtin.c \ - state_tracker/st_nir_lower_tex_src_plane.c \ - state_tracker/st_pbo.c \ - state_tracker/st_pbo.h \ - state_tracker/st_program.c \ - state_tracker/st_program.h \ - state_tracker/st_sampler_view.c \ - state_tracker/st_sampler_view.h \ - state_tracker/st_scissor.c \ - state_tracker/st_scissor.h \ - state_tracker/st_shader_cache.c \ - state_tracker/st_shader_cache.h \ - state_tracker/st_texture.c \ - state_tracker/st_texture.h \ - state_tracker/st_tgsi_lower_depth_clamp.c \ - state_tracker/st_tgsi_lower_depth_clamp.h \ - state_tracker/st_tgsi_lower_yuv.c \ - state_tracker/st_tgsi_lower_yuv.h \ - state_tracker/st_util.h \ - state_tracker/st_vdpau.c \ - state_tracker/st_vdpau.h - -PROGRAM_FILES = \ - program/arbprogparse.c \ - program/arbprogparse.h \ - program/ir_to_mesa.cpp \ - program/ir_to_mesa.h \ - program/lex.yy.c \ - program/prog_cache.c \ - program/prog_cache.h \ - program/prog_execute.c \ - program/prog_execute.h \ - program/prog_instruction.c \ - program/prog_instruction.h \ - program/prog_noise.c \ - program/prog_noise.h \ - program/prog_opt_constant_fold.c \ - program/prog_optimize.c \ - program/prog_optimize.h \ - program/prog_parameter.c \ - program/prog_parameter.h \ - program/prog_parameter_layout.c \ - program/prog_parameter_layout.h \ - program/prog_print.c \ - program/prog_print.h \ - program/program.c \ - program/program.h \ - program/programopt.c \ - program/programopt.h \ - program/program_parse_extra.c \ - program/program_parse.tab.c \ - program/program_parse.tab.h \ - program/program_parser.h \ - program/prog_statevars.c \ - program/prog_statevars.h \ - program/symbol_table.c \ - program/symbol_table.h - -PROGRAM_NIR_FILES = \ - program/prog_to_nir.c \ - program/prog_to_nir.h - -ASM_C_FILES = \ - x86/common_x86.c \ - x86/x86_xform.c \ - x86/3dnow.c \ - x86/sse.c \ - x86/rtasm/x86sse.c \ - x86/rtasm/x86sse.h \ - sparc/sparc.c \ - x86-64/x86-64.c - -X86_FILES = \ - x86/assyntax.h \ - x86/clip_args.h \ - x86/norm_args.h \ - x86/xform_args.h \ - x86/common_x86_asm.S \ - x86/common_x86_asm.h \ - x86/common_x86_features.h \ - x86/x86_xform.h \ - x86/x86_xform2.S \ - x86/x86_xform3.S \ - x86/x86_xform4.S \ - x86/x86_cliptest.S \ - x86/mmx.h \ - x86/mmx_blend.S \ - x86/mmx_blendtmp.h \ - x86/3dnow.h \ - x86/3dnow_xform1.S \ - x86/3dnow_xform2.S \ - x86/3dnow_xform3.S \ - x86/3dnow_xform4.S \ - x86/sse.h \ - x86/sse_xform1.S \ - x86/sse_xform2.S \ - x86/sse_xform3.S \ - x86/sse_xform4.S \ - x86/sse_normal.S \ - x86/read_rgba_span_x86.S - -X86_64_FILES = \ - x86-64/x86-64.h \ - x86-64/xform4.S - -X86_SSE41_FILES = \ - main/streaming-load-memcpy.c \ - main/streaming-load-memcpy.h \ - main/sse_minmax.c \ - main/sse_minmax.h - -SPARC_FILES = \ - sparc/sparc.h \ - sparc/sparc_clip.S \ - sparc/sparc_matrix.h \ - sparc/norm.S \ - sparc/xform.S - -COMMON_DRIVER_FILES = \ - drivers/common/driverfuncs.c \ - drivers/common/driverfuncs.h \ - drivers/common/meta_blit.c \ - drivers/common/meta_generate_mipmap.c \ - drivers/common/meta.c \ - drivers/common/meta.h - - -# Sources for building non-Gallium drivers -MESA_FILES = \ - $(MAIN_FILES) \ - $(MATH_FILES) \ - $(MATH_XFORM_FILES) \ - $(VBO_FILES) \ - $(TNL_FILES) \ - $(SWRAST_FILES) \ - $(SWRAST_SETUP_FILES) \ - $(COMMON_DRIVER_FILES)\ - $(ASM_C_FILES) - -# Sources for building Gallium drivers -MESA_GALLIUM_FILES = \ - $(MAIN_FILES) \ - $(MATH_FILES) \ - $(VBO_FILES) \ - $(STATETRACKER_FILES) \ - x86/common_x86.c - -### Include directories - -INCLUDE_DIRS = \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/src \ - -I$(top_srcdir)/src \ - -I$(top_builddir)/src/compiler/glsl \ - -I$(top_builddir)/src/compiler/nir \ - -I$(top_builddir)/src/mesa \ - -I$(top_srcdir)/src/mesa \ - -I$(top_builddir)/src/mesa/main \ - -I$(top_srcdir)/src/mesa/main \ - -I$(top_builddir)/src/mapi \ - -I$(top_srcdir)/src/mapi \ - -I$(top_srcdir)/src/gallium/include \ - -I$(top_srcdir)/src/gallium/auxiliary diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk deleted file mode 100644 index fb7d97f1acf..00000000000 --- a/src/mesa/drivers/dri/Android.mk +++ /dev/null @@ -1,70 +0,0 @@ -# -# Copyright (C) 2011 Intel Corporation -# -# 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. -# - -LOCAL_PATH := $(call my-dir) - -# Import mesa_dri_common_INCLUDES. -include $(LOCAL_PATH)/common/Makefile.sources - -#----------------------------------------------- -# Variables common to all DRI drivers - -MESA_DRI_CFLAGS := \ - -DHAVE_ANDROID_PLATFORM - -MESA_DRI_C_INCLUDES := \ - $(addprefix $(MESA_TOP)/, $(mesa_dri_common_INCLUDES)) \ - $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src/gallium/auxiliary \ - external/expat/lib - -MESA_DRI_WHOLE_STATIC_LIBRARIES := \ - libmesa_glsl \ - libmesa_compiler \ - libmesa_nir \ - libmesa_megadriver_stub \ - libmesa_dri_common \ - libmesa_dricore \ - libmesa_util - -MESA_DRI_SHARED_LIBRARIES := \ - libcutils \ - libdl \ - libglapi \ - liblog \ - libsync \ - libz - -# If Android version >=8 MESA should static link libexpat else should dynamic link -ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0) -MESA_DRI_WHOLE_STATIC_LIBRARIES += \ - libexpat -else -MESA_DRI_SHARED_LIBRARIES += \ - libexpat -endif - -#----------------------------------------------- -# Build drivers and libmesa_dri_common - -SUBDIRS := common i915 i965 -include $(foreach d, $(SUBDIRS), $(LOCAL_PATH)/$(d)/Android.mk) diff --git a/src/mesa/drivers/dri/common/Android.mk b/src/mesa/drivers/dri/common/Android.mk deleted file mode 100644 index f15a3b9c786..00000000000 --- a/src/mesa/drivers/dri/common/Android.mk +++ /dev/null @@ -1,69 +0,0 @@ -# -# Mesa 3-D graphics library -# -# Copyright (C) 2011 Intel Corporation -# -# 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. -# - -# -# Build libmesa_dri_common -# - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -include $(LOCAL_PATH)/Makefile.sources - -LOCAL_MODULE := libmesa_dri_common -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -intermediates := $(call local-generated-sources-dir) - -LOCAL_C_INCLUDES := \ - $(MESA_DRI_C_INCLUDES) - -LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(LOCAL_PATH) \ - $(intermediates) - -LOCAL_SRC_FILES := \ - $(DRI_COMMON_FILES) - -LOCAL_STATIC_LIBRARIES := libmesa_util - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# -# Build libmesa_megadriver_stub -# - -include $(CLEAR_VARS) -include $(LOCAL_PATH)/Makefile.sources - -LOCAL_MODULE := libmesa_megadriver_stub -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_C_INCLUDES := \ - $(MESA_DRI_C_INCLUDES) - -LOCAL_SRC_FILES := $(megadriver_stub_FILES) - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/mesa/drivers/dri/common/Makefile.sources b/src/mesa/drivers/dri/common/Makefile.sources deleted file mode 100644 index d592e99b879..00000000000 --- a/src/mesa/drivers/dri/common/Makefile.sources +++ /dev/null @@ -1,18 +0,0 @@ -DRI_COMMON_FILES := \ - utils.c \ - utils.h \ - dri_util.c \ - dri_util.h - -# Paths are relative to MESA_TOP. -mesa_dri_common_INCLUDES := \ - include \ - src/egl/drivers/dri \ - src/egl/main \ - src/mapi \ - src/mesa \ - src/mesa/drivers/dri/common \ - src/util - -megadriver_stub_FILES := \ - megadriver_stub.c diff --git a/src/mesa/drivers/dri/i915/Android.mk b/src/mesa/drivers/dri/i915/Android.mk deleted file mode 100644 index b1054aa6e28..00000000000 --- a/src/mesa/drivers/dri/i915/Android.mk +++ /dev/null @@ -1,57 +0,0 @@ -# -# Copyright (C) 2011 Intel Corporation -# Copyright (C) 2010-2011 Chia-I Wu -# Copyright (C) 2010-2011 LunarG -# -# 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. -# - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE := i915_dri -LOCAL_MODULE_RELATIVE_PATH := $(MESA_DRI_MODULE_REL_PATH) -LOCAL_LDFLAGS += $(MESA_DRI_LDFLAGS) - -# Import variables i915_FILES. -include $(LOCAL_PATH)/Makefile.sources - -LOCAL_CFLAGS := \ - $(MESA_DRI_CFLAGS) \ - -DI915 - -LOCAL_C_INCLUDES := \ - $(MESA_DRI_C_INCLUDES) - -LOCAL_SRC_FILES := \ - $(i915_FILES) - -LOCAL_WHOLE_STATIC_LIBRARIES := \ - $(MESA_DRI_WHOLE_STATIC_LIBRARIES) - -LOCAL_SHARED_LIBRARIES := \ - $(MESA_DRI_SHARED_LIBRARIES) \ - libdrm_intel - -LOCAL_GENERATED_SOURCES := \ - $(MESA_DRI_OPTIONS_H) \ - $(MESA_GEN_NIR_H) - -include $(MESA_COMMON_MK) -include $(BUILD_SHARED_LIBRARY) diff --git a/src/mesa/drivers/dri/i915/Makefile.sources b/src/mesa/drivers/dri/i915/Makefile.sources deleted file mode 100644 index d28ac8852e9..00000000000 --- a/src/mesa/drivers/dri/i915/Makefile.sources +++ /dev/null @@ -1,64 +0,0 @@ -i915_FILES = \ - i830_context.c \ - i830_context.h \ - i830_reg.h \ - i830_state.c \ - i830_texblend.c \ - i830_texstate.c \ - i830_vtbl.c \ - i915_context.c \ - i915_context.h \ - i915_debug_fp.c \ - i915_debug.h \ - i915_fragprog.c \ - i915_program.c \ - i915_program.h \ - i915_reg.h \ - i915_state.c \ - i915_tex_layout.c \ - i915_texstate.c \ - i915_vtbl.c \ - intel_batchbuffer.c \ - intel_batchbuffer.h \ - intel_blit.c \ - intel_blit.h \ - intel_buffer_objects.c \ - intel_buffer_objects.h \ - intel_buffers.c \ - intel_buffers.h \ - intel_chipset.h \ - intel_clear.c \ - intel_clear.h \ - intel_context.c \ - intel_context.h \ - intel_extensions.c \ - intel_extensions.h \ - intel_fbo.c \ - intel_fbo.h \ - intel_mipmap_tree.c \ - intel_mipmap_tree.h \ - intel_pixel_bitmap.c \ - intel_pixel.c \ - intel_pixel_copy.c \ - intel_pixel_draw.c \ - intel_pixel.h \ - intel_pixel_read.c \ - intel_reg.h \ - intel_regions.c \ - intel_regions.h \ - intel_render.c \ - intel_screen.c \ - intel_screen.h \ - intel_state.c \ - intel_syncobj.c \ - intel_tex.c \ - intel_tex_copy.c \ - intel_tex.h \ - intel_tex_image.c \ - intel_tex_layout.c \ - intel_tex_layout.h \ - intel_tex_obj.h \ - intel_tex_subimage.c \ - intel_tex_validate.c \ - intel_tris.c \ - intel_tris.h diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk deleted file mode 100644 index 81649258108..00000000000 --- a/src/mesa/drivers/dri/i965/Android.mk +++ /dev/null @@ -1,306 +0,0 @@ -# -# Copyright (C) 2011 Intel Corporation -# Copyright (C) 2010-2011 Chia-I Wu -# Copyright (C) 2010-2011 LunarG -# -# 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. -# - -LOCAL_PATH := $(call my-dir) - -# Import variables i965_FILES. -include $(LOCAL_PATH)/Makefile.sources - -I965_PERGEN_COMMON_INCLUDES := \ - $(MESA_DRI_C_INCLUDES) \ - $(MESA_TOP)/src/intel \ - $(MESA_TOP)/include - -I965_PERGEN_SHARED_LIBRARIES := \ - $(MESA_DRI_SHARED_LIBRARIES) - -I965_PERGEN_STATIC_LIBRARIES := \ - libmesa_genxml \ - libmesa_nir - -I965_PERGEN_LIBS := \ - libmesa_i965_gfx4 \ - libmesa_i965_gfx45 \ - libmesa_i965_gfx5 \ - libmesa_i965_gfx6 \ - libmesa_i965_gfx7 \ - libmesa_i965_gfx75 \ - libmesa_i965_gfx8 \ - libmesa_i965_gfx9 \ - libmesa_i965_gfx11 - -# --------------------------------------- -# Build libmesa_i965_gfx4 -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_i965_gfx4 - -LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES) - -LOCAL_SRC_FILES := $(i965_gfx4_FILES) - -LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES) - -LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES) - -LOCAL_CFLAGS := -DGFX_VERx10=40 - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# --------------------------------------- -# Build libmesa_i965_gfx45 -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_i965_gfx45 - -LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES) - -LOCAL_SRC_FILES := $(i965_gfx45_FILES) - -LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES) - -LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES) - -LOCAL_CFLAGS := -DGFX_VERx10=45 - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# --------------------------------------- -# Build libmesa_i965_gfx5 -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_i965_gfx5 - -LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES) - -LOCAL_SRC_FILES := $(i965_gfx5_FILES) - -LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES) - -LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES) - -LOCAL_CFLAGS := -DGFX_VERx10=50 - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# --------------------------------------- -# Build libmesa_i965_gfx6 -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_i965_gfx6 - -LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES) - -LOCAL_SRC_FILES := $(i965_gfx6_FILES) - -LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES) - -LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES) - -LOCAL_CFLAGS := -DGFX_VERx10=60 - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# --------------------------------------- -# Build libmesa_i965_gfx7 -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_i965_gfx7 - -LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES) - -LOCAL_SRC_FILES := $(i965_gfx7_FILES) - -LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES) - -LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES) - -LOCAL_CFLAGS := -DGFX_VERx10=70 - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# --------------------------------------- -# Build libmesa_i965_gfx75 -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_i965_gfx75 - -LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES) - -LOCAL_SRC_FILES := $(i965_gfx75_FILES) - -LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES) - -LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES) - -LOCAL_CFLAGS := -DGFX_VERx10=75 - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# --------------------------------------- -# Build libmesa_i965_gfx8 -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_i965_gfx8 - -LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES) - -LOCAL_SRC_FILES := $(i965_gfx8_FILES) - -LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES) - -LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES) - -LOCAL_CFLAGS := -DGFX_VERx10=80 - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# --------------------------------------- -# Build libmesa_i965_gfx9 -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_i965_gfx9 - -LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES) - -LOCAL_SRC_FILES := $(i965_gfx9_FILES) - -LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES) - -LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES) - -LOCAL_CFLAGS := -DGFX_VERx10=90 - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# --------------------------------------- -# Build libmesa_i965_gfx11 -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_i965_gfx11 - -LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES) - -LOCAL_SRC_FILES := $(i965_gfx11_FILES) - -LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES) - -LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES) - -LOCAL_CFLAGS := -DGFX_VERx10=110 - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# --------------------------------------- -# Build i965_dri -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_MODULE := i965_dri -LOCAL_MODULE_RELATIVE_PATH := $(MESA_DRI_MODULE_REL_PATH) -LOCAL_LDFLAGS += $(MESA_DRI_LDFLAGS) - -LOCAL_CFLAGS := \ - $(MESA_DRI_CFLAGS) - -LOCAL_C_INCLUDES := \ - $(MESA_DRI_C_INCLUDES) \ - $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_glsl,,) \ - $(MESA_TOP)/include - -LOCAL_SRC_FILES := \ - $(i965_FILES) - -LOCAL_WHOLE_STATIC_LIBRARIES := \ - $(MESA_DRI_WHOLE_STATIC_LIBRARIES) \ - $(I965_PERGEN_LIBS) \ - libmesa_intel_dev \ - libmesa_intel_common \ - libmesa_isl \ - libmesa_blorp \ - libmesa_intel_compiler \ - libmesa_intel_perf - -ifeq ($(ARCH_X86_HAVE_SSE4_1),true) -LOCAL_CFLAGS += \ - -DUSE_SSE41 -endif - -LOCAL_SHARED_LIBRARIES := \ - $(MESA_DRI_SHARED_LIBRARIES) - -LOCAL_GENERATED_SOURCES := \ - $(MESA_DRI_OPTIONS_H) \ - $(MESA_GEN_NIR_H) - -LOCAL_MODULE_CLASS := SHARED_LIBRARIES - -intermediates := $(call local-generated-sources-dir) - -LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ - $(i965_oa_GENERATED_FILES)) - -i965_oa_xml_FILES := $(addprefix $(MESA_TOP)/src/mesa/drivers/dri/i965/, \ - $(i965_oa_xml_FILES)) - -$(intermediates)/brw_oa_metrics.c: $(LOCAL_PATH)/brw_oa.py $(i965_oa_xml_FILES) - @echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))" - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $< \ - --code=$@ \ - --header=$(call generated-sources-dir-for,SHARED_LIBRARIES,i965_dri,,)/brw_oa_metrics.h \ - $(i965_oa_xml_FILES) - -$(intermediates)/brw_oa_metrics.h: $(intermediates)/brw_oa_metrics.c - -include $(MESA_COMMON_MK) -include $(BUILD_SHARED_LIBRARY) diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources deleted file mode 100644 index c6870d84cbe..00000000000 --- a/src/mesa/drivers/dri/i965/Makefile.sources +++ /dev/null @@ -1,164 +0,0 @@ -i965_FILES = \ - brw_binding_tables.c \ - brw_blorp.c \ - brw_blorp.h \ - brw_bufmgr.c \ - brw_bufmgr.h \ - brw_clear.c \ - brw_clip.c \ - brw_compute.c \ - brw_conditional_render.c \ - brw_context.c \ - brw_context.h \ - brw_cs.c \ - brw_cs.h \ - brw_curbe.c \ - brw_defines.h \ - brw_disk_cache.c \ - brw_draw.c \ - brw_draw.h \ - brw_draw_upload.c \ - brw_ff_gs.c \ - brw_ff_gs.h \ - brw_formatquery.c \ - brw_generate_mipmap.c \ - brw_gs.c \ - brw_gs.h \ - brw_gs_surface_state.c \ - brw_link.cpp \ - brw_meta_util.c \ - brw_meta_util.h \ - brw_misc_state.c \ - brw_multisample_state.h \ - brw_nir_uniforms.cpp \ - brw_object_purgeable.c \ - brw_pipe_control.c \ - brw_pipe_control.h \ - brw_performance_query.c \ - brw_program.c \ - brw_program.h \ - brw_program_binary.c \ - brw_program_cache.c \ - brw_primitive_restart.c \ - brw_queryobj.c \ - brw_reset.c \ - brw_sf.c \ - brw_state.h \ - brw_state_upload.c \ - brw_structs.h \ - brw_surface_formats.c \ - brw_sync.c \ - brw_tcs.c \ - brw_tcs_surface_state.c \ - brw_tes.c \ - brw_tes_surface_state.c \ - brw_urb.c \ - brw_util.c \ - brw_util.h \ - brw_vs.c \ - brw_vs.h \ - brw_vs_surface_state.c \ - brw_wm.c \ - brw_wm.h \ - brw_wm_surface_state.c \ - gfx4_blorp_exec.h \ - gfx6_clip_state.c \ - gfx6_constant_state.c \ - gfx6_multisample_state.c \ - gfx6_queryobj.c \ - gfx6_sampler_state.c \ - gfx6_sol.c \ - gfx6_urb.c \ - gfx7_l3_state.c \ - gfx7_sol_state.c \ - gfx7_urb.c \ - gfx8_depth_state.c \ - gfx8_multisample_state.c \ - hsw_queryobj.c \ - hsw_sol.c \ - brw_batch.c \ - brw_batch.h \ - brw_blit.c \ - brw_blit.h \ - brw_buffer_objects.c \ - brw_buffer_objects.h \ - brw_buffers.c \ - brw_buffers.h \ - brw_copy_image.c \ - brw_extensions.c \ - brw_fbo.c \ - brw_fbo.h \ - brw_image.h \ - brw_mipmap_tree.c \ - brw_mipmap_tree.h \ - brw_pixel_bitmap.c \ - brw_pixel.c \ - brw_pixel_copy.c \ - brw_pixel_draw.c \ - brw_pixel.h \ - brw_pixel_read.c \ - brw_screen.c \ - brw_screen.h \ - brw_state.c \ - brw_tex.c \ - brw_tex_copy.c \ - brw_tex.h \ - brw_tex_image.c \ - brw_tex_obj.h \ - brw_tex_validate.c \ - brw_upload.c \ - libdrm_macros.h - -i965_gfx4_FILES = \ - genX_blorp_exec.c \ - genX_boilerplate.h \ - genX_pipe_control.c \ - genX_state_upload.c - -i965_gfx45_FILES = \ - genX_blorp_exec.c \ - genX_boilerplate.h \ - genX_pipe_control.c \ - genX_state_upload.c - -i965_gfx5_FILES = \ - genX_blorp_exec.c \ - genX_boilerplate.h \ - genX_pipe_control.c \ - genX_state_upload.c - -i965_gfx6_FILES = \ - genX_blorp_exec.c \ - genX_boilerplate.h \ - genX_pipe_control.c \ - genX_state_upload.c - -i965_gfx7_FILES = \ - genX_blorp_exec.c \ - genX_boilerplate.h \ - genX_pipe_control.c \ - genX_state_upload.c - -i965_gfx75_FILES = \ - genX_blorp_exec.c \ - genX_boilerplate.h \ - genX_pipe_control.c \ - genX_state_upload.c - -i965_gfx8_FILES = \ - genX_blorp_exec.c \ - genX_boilerplate.h \ - genX_pipe_control.c \ - genX_state_upload.c - -i965_gfx9_FILES = \ - genX_blorp_exec.c \ - genX_boilerplate.h \ - genX_pipe_control.c \ - genX_state_upload.c - -i965_gfx11_FILES = \ - genX_blorp_exec.c \ - genX_boilerplate.h \ - genX_pipe_control.c \ - genX_state_upload.c diff --git a/src/mesa/drivers/dri/nouveau/Makefile.sources b/src/mesa/drivers/dri/nouveau/Makefile.sources deleted file mode 100644 index 3eff3b8c2b5..00000000000 --- a/src/mesa/drivers/dri/nouveau/Makefile.sources +++ /dev/null @@ -1,62 +0,0 @@ -NOUVEAU_DRIVER_FILES = \ - nouveau_array.c \ - nouveau_array.h \ - nouveau_bufferobj.c \ - nouveau_bufferobj.h \ - nouveau_context.c \ - nouveau_context.h \ - nouveau_driver.c \ - nouveau_driver.h \ - nouveau_fbo.c \ - nouveau_fbo.h \ - nouveau_gldefs.h \ - nouveau_local.h \ - nouveau_render.h \ - nouveau_scratch.c \ - nouveau_scratch.h \ - nouveau_screen.c \ - nouveau_screen.h \ - nouveau_span.c \ - nouveau_state.c \ - nouveau_state.h \ - nouveau_surface.c \ - nouveau_surface.h \ - nouveau_texture.c \ - nouveau_texture.h \ - nouveau_util.h \ - nv01_2d.xml.h \ - nv04_3d.xml.h \ - nv04_context.c \ - nv04_context.h \ - nv04_driver.h \ - nv04_render.c \ - nv04_state_fb.c \ - nv04_state_frag.c \ - nv04_state_raster.c \ - nv04_state_tex.c \ - nv04_surface.c \ - nv10_3d.xml.h \ - nv10_context.c \ - nv10_driver.h \ - nv10_render.c \ - nv10_state_fb.c \ - nv10_state_frag.c \ - nv10_state_polygon.c \ - nv10_state_raster.c \ - nv10_state_tex.c \ - nv10_state_tnl.c \ - nv20_3d.xml.h \ - nv20_context.c \ - nv20_driver.h \ - nv20_render.c \ - nv20_state_fb.c \ - nv20_state_frag.c \ - nv20_state_polygon.c \ - nv20_state_raster.c \ - nv20_state_tex.c \ - nv20_state_tnl.c \ - nv_m2mf.xml.h \ - nv_object.xml.h - -NOUVEAU_C_FILES = \ - $(NOUVEAU_DRIVER_FILES) diff --git a/src/mesa/drivers/dri/r200/Makefile.sources b/src/mesa/drivers/dri/r200/Makefile.sources deleted file mode 100644 index dbcb9af4884..00000000000 --- a/src/mesa/drivers/dri/r200/Makefile.sources +++ /dev/null @@ -1,60 +0,0 @@ -R200_COMMON_FILES = \ - radeon_buffer_objects.c \ - radeon_buffer_objects.h \ - radeon_cmdbuf.h \ - radeon_common.c \ - radeon_common.h \ - radeon_common_context.c \ - radeon_common_context.h \ - radeon_debug.c \ - radeon_debug.h \ - radeon_dma.c \ - radeon_dma.h \ - radeon_fbo.c \ - radeon_fog.c \ - radeon_fog.h \ - radeon_mipmap_tree.c \ - radeon_mipmap_tree.h \ - radeon_pixel_read.c \ - radeon_queryobj.c \ - radeon_queryobj.h \ - radeon_span.c \ - radeon_span.h \ - radeon_tex_copy.c \ - radeon_texture.c \ - radeon_texture.h \ - radeon_tile.c \ - radeon_tile.h - -DRIVER_FILES = \ - r200_blit.c \ - r200_blit.h \ - r200_cmdbuf.c \ - r200_context.c \ - r200_context.h \ - r200_fragshader.c \ - r200_ioctl.c \ - r200_ioctl.h \ - r200_maos.c \ - r200_maos.h \ - r200_reg.h \ - r200_sanity.c \ - r200_sanity.h \ - r200_state.c \ - r200_state.h \ - r200_state_init.c \ - r200_swtcl.c \ - r200_swtcl.h \ - r200_tcl.c \ - r200_tcl.h \ - r200_tex.c \ - r200_tex.h \ - r200_texstate.c \ - r200_vertprog.c \ - r200_vertprog.h \ - radeon_chipset.h \ - radeon_screen.c \ - radeon_screen.h \ - server/radeon_reg.h - -R200_C_FILES = $(R200_COMMON_FILES) $(DRIVER_FILES) diff --git a/src/mesa/drivers/dri/radeon/Makefile.sources b/src/mesa/drivers/dri/radeon/Makefile.sources deleted file mode 100644 index 261b62f45f8..00000000000 --- a/src/mesa/drivers/dri/radeon/Makefile.sources +++ /dev/null @@ -1,58 +0,0 @@ -RADEON_COMMON_FILES = \ - radeon_buffer_objects.c \ - radeon_buffer_objects.h \ - radeon_cmdbuf.h \ - radeon_common.c \ - radeon_common_context.c \ - radeon_common_context.h \ - radeon_common.h \ - radeon_debug.c \ - radeon_debug.h \ - radeon_dma.c \ - radeon_dma.h \ - radeon_fbo.c \ - radeon_fog.c \ - radeon_fog.h \ - radeon_mipmap_tree.c \ - radeon_mipmap_tree.h \ - radeon_pixel_read.c \ - radeon_queryobj.c \ - radeon_queryobj.h \ - radeon_span.c \ - radeon_span.h \ - radeon_tex_copy.c \ - radeon_texture.c \ - radeon_texture.h \ - radeon_tile.c \ - radeon_tile.h - -DRIVER_FILES = \ - radeon_blit.c \ - radeon_blit.h \ - radeon_context.c \ - radeon_context.h \ - radeon_chipset.h \ - radeon_ioctl.c \ - radeon_ioctl.h \ - radeon_maos.c \ - radeon_maos.h \ - radeon_maos_vbtmp.h \ - radeon_sanity.c \ - radeon_sanity.h \ - radeon_screen.c \ - radeon_screen.h \ - radeon_state.c \ - radeon_state.h \ - radeon_state_init.c \ - radeon_swtcl.c \ - radeon_swtcl.h \ - radeon_tcl.c \ - radeon_tcl.h \ - radeon_tex.c \ - radeon_tex.h \ - radeon_texstate.c \ - server/radeon_reg.h - -RADEON_C_FILES = \ - $(RADEON_COMMON_FILES) \ - $(DRIVER_FILES) diff --git a/src/mesa/program/Android.mk b/src/mesa/program/Android.mk deleted file mode 100644 index 6b4e1916747..00000000000 --- a/src/mesa/program/Android.mk +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 2012 Intel Corporation -# -# 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. - -LOCAL_PATH := $(call my-dir) - -define local-l-to-c - @mkdir -p $(dir $@) - @echo "Mesa Lex: $(PRIVATE_MODULE) <= $<" - $(hide) $(MESA_LEX) -o$@ $< -endef - -define mesa_local-y-to-c-and-h - @mkdir -p $(dir $@) - @echo "Mesa Yacc: $(PRIVATE_MODULE) <= $<" - $(hide) $(YACC) -o $@ -p "_mesa_program_" $< -endef - -# ---------------------------------------------------------------------- -# libmesa_program.a -# ---------------------------------------------------------------------- - -# Import the following variables: -# PROGRAM_FILES -include $(MESA_TOP)/src/mesa/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_program -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -LOCAL_STATIC_LIBRARIES := libmesa_nir \ - libmesa_glsl - -intermediates := $(call local-generated-sources-dir) - -# TODO(chadv): In Makefile.sources, move these vars to a different list so we can -# remove this kludge. -generated_sources_basenames := \ - lex.yy.c \ - program_parse.tab.c \ - program_parse.tab.h - -LOCAL_SRC_FILES := \ - $(filter-out $(generated_sources_basenames),$(subst program/,,$(PROGRAM_FILES))) \ - $(subst program/,,$(PROGRAM_NIR_FILES)) - -LOCAL_GENERATED_SOURCES := \ - $(addprefix $(intermediates)/program/,$(generated_sources_basenames)) - -$(intermediates)/program/program_parse.tab.c: $(LOCAL_PATH)/program_parse.y - $(mesa_local-y-to-c-and-h) - -$(intermediates)/program/program_parse.tab.h: $(intermediates)/program/program_parse.tab.c - @ - -$(intermediates)/program/lex.yy.c: $(LOCAL_PATH)/program_lexer.l - $(local-l-to-c) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/mesa \ - $(MESA_TOP)/src/compiler/nir \ - $(MESA_TOP)/src/gallium/auxiliary \ - $(MESA_TOP)/src/gallium/include - -LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) - -LOCAL_GENERATED_SOURCES += $(MESA_GEN_NIR_H) \ - $(MESA_GEN_GLSL_H) - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/panfrost/Android.bifrost.mk b/src/panfrost/Android.bifrost.mk deleted file mode 100644 index 89caa17f52b..00000000000 --- a/src/panfrost/Android.bifrost.mk +++ /dev/null @@ -1,140 +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. - -# build libpanfrost_bifrost_disasm -include $(CLEAR_VARS) - -LOCAL_MODULE := libpanfrost_bifrost_disasm - -LOCAL_SRC_FILES := \ - $(bifrost_disasm_FILES) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/include \ - $(MESA_TOP)/src/compiler/nir/ \ - $(MESA_TOP)/src/gallium/auxiliary/ \ - $(MESA_TOP)/src/gallium/include/ \ - $(MESA_TOP)/src/mapi/ \ - $(MESA_TOP)/src/mesa/ \ - $(MESA_TOP)/src/panfrost/bifrost/ \ - $(MESA_TOP)/src/panfrost/include/ - -LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(MESA_TOP)/src/panfrost/bifrost/ \ - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -intermediates := $(call local-generated-sources-dir) - -LOCAL_GENERATED_SOURCES := \ - $(intermediates)/bifrost_gen_disasm.c - -bifrost_gen_disasm_gen := $(LOCAL_PATH)/bifrost/gen_disasm.py -bifrost_gen_disasm_deps := $(LOCAL_PATH)/bifrost/ISA.xml $(LOCAL_PATH)/bifrost/bifrost_isa.py - -$(intermediates)/bifrost_gen_disasm.c: $(bifrost_gen_disasm_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON3) $(bifrost_gen_disasm_gen) $< > $@ - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# build libpanfrost_bifrost -include $(CLEAR_VARS) - -LOCAL_MODULE := libpanfrost_bifrost -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -intermediates := $(call local-generated-sources-dir) - -LOCAL_SRC_FILES := \ - $(bifrost_FILES) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/include \ - $(MESA_TOP)/src/compiler/nir/ \ - $(MESA_TOP)/src/gallium/auxiliary/ \ - $(MESA_TOP)/src/gallium/include/ \ - $(MESA_TOP)/src/mapi/ \ - $(MESA_TOP)/src/mesa/ \ - $(MESA_TOP)/src/panfrost/bifrost/ \ - $(MESA_TOP)/src/panfrost/include/ - -LOCAL_STATIC_LIBRARIES := \ - libmesa_glsl \ - libmesa_nir \ - libmesa_st_mesa \ - libpanfrost_lib - -LOCAL_GENERATED_SOURCES := \ - $(intermediates)/bifrost_nir_algebraic.c \ - $(intermediates)/bi_builder.h \ - $(intermediates)/bi_opcodes.c \ - $(intermediates)/bi_opcodes.h \ - $(intermediates)/bi_packer.c \ - $(intermediates)/bi_printer.c \ - $(MESA_GEN_GLSL_H) - -bifrost_nir_algebraic_gen := $(LOCAL_PATH)/bifrost/bifrost_nir_algebraic.py -bifrost_nir_algebraic_deps := \ - $(MESA_TOP)/src/compiler/nir/ - -$(intermediates)/bifrost_nir_algebraic.c: $(bifrost_nir_algebraic_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON3) $(bifrost_nir_algebraic_gen) -p $< > $@ - -bi_builder_h_gen := $(LOCAL_PATH)/bifrost/bi_builder.h.py -bi_builder_h_deps := $(LOCAL_PATH)/bifrost/ISA.xml $(LOCAL_PATH)/bifrost/bifrost_isa.py - -$(intermediates)/bi_builder.h: $(bi_builder_h_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON3) $(bi_builder_h_gen) $< > $@ - -bi_opcodes_c_gen := $(LOCAL_PATH)/bifrost/bi_opcodes.c.py -bi_opcodes_c_deps := $(LOCAL_PATH)/bifrost/ISA.xml $(LOCAL_PATH)/bifrost/bifrost_isa.py - -$(intermediates)/bi_opcodes.c: $(bi_opcodes_c_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON3) $(bi_opcodes_c_gen) $< > $@ - -bi_opcodes_h_gen := $(LOCAL_PATH)/bifrost/bi_opcodes.h.py -bi_opcodes_h_deps := $(LOCAL_PATH)/bifrost/ISA.xml $(LOCAL_PATH)/bifrost/bifrost_isa.py - -$(intermediates)/bi_opcodes.h: $(bi_opcodes_h_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON3) $(bi_opcodes_h_gen) $< > $@ - -bi_packer_c_gen := $(LOCAL_PATH)/bifrost/bi_packer.c.py -bi_packer_c_deps := $(LOCAL_PATH)/bifrost/ISA.xml $(LOCAL_PATH)/bifrost/bifrost_isa.py - -$(intermediates)/bi_packer.c: $(bi_packer_c_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON3) $(bi_packer_c_gen) $< > $@ - -bi_printer_c_gen := $(LOCAL_PATH)/bifrost/bi_printer.c.py -bi_printer_c_deps := $(LOCAL_PATH)/bifrost/ISA.xml $(LOCAL_PATH)/bifrost/bifrost_isa.py - -$(intermediates)/bi_printer.c: $(bi_printer_c_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON3) $(bi_printer_c_gen) $< > $@ - -LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(MESA_TOP)/src/panfrost/bifrost/ \ - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/panfrost/Android.lib.mk b/src/panfrost/Android.lib.mk deleted file mode 100644 index b39f7123374..00000000000 --- a/src/panfrost/Android.lib.mk +++ /dev/null @@ -1,56 +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_lib -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -intermediates := $(call local-generated-sources-dir) - -LOCAL_SRC_FILES := \ - $(lib_FILES) - -LOCAL_GENERATED_SOURCES := \ - $(intermediates)/panfrost/lib/midgard_pack.h - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/gallium/auxiliary/ \ - $(MESA_TOP)/src/gallium/include/ \ - $(MESA_TOP)/src/panfrost/lib/ \ - $(MESA_TOP)/src/panfrost/include/ \ - $(intermediates)/panfrost/lib/ - -LOCAL_STATIC_LIBRARIES := \ - libmesa_nir - -midgard_pack_gen := $(LOCAL_PATH)/lib/gen_pack.py -midgard_pack_deps := $(LOCAL_PATH)/lib/midgard.xml - -$(intermediates)/panfrost/lib/midgard_pack.h: $(midgard_pack_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON3) $(midgard_pack_gen) $< > $@ - -LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(MESA_TOP)/src/panfrost/lib/ \ - $(intermediates)/panfrost/lib/ \ - $(intermediates) - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/panfrost/Android.midgard.mk b/src/panfrost/Android.midgard.mk deleted file mode 100644 index a5c1040ffd2..00000000000 --- a/src/panfrost/Android.midgard.mk +++ /dev/null @@ -1,88 +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. - -# build libpanfrost_midgard_disasm -include $(CLEAR_VARS) - -LOCAL_MODULE := libpanfrost_midgard_disasm - -LOCAL_SRC_FILES := \ - $(midgard_disasm_FILES) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/include \ - $(MESA_TOP)/src/compiler/nir/ \ - $(MESA_TOP)/src/gallium/auxiliary/ \ - $(MESA_TOP)/src/gallium/include/ \ - $(MESA_TOP)/src/mapi/ \ - $(MESA_TOP)/src/mesa/ \ - $(MESA_TOP)/src/panfrost/include/ \ - $(MESA_TOP)/src/panfrost/midgard/ - -LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(MESA_TOP)/src/panfrost/midgard/ \ - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# build libpanfrost_midgard -include $(CLEAR_VARS) - -LOCAL_MODULE := libpanfrost_midgard -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -intermediates := $(call local-generated-sources-dir) - -LOCAL_SRC_FILES := \ - $(midgard_FILES) - -LOCAL_GENERATED_SOURCES := \ - $(MESA_GEN_GLSL_H) \ - $(intermediates)/midgard_nir_algebraic.c - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/include \ - $(MESA_TOP)/src/compiler/nir/ \ - $(MESA_TOP)/src/gallium/auxiliary/ \ - $(MESA_TOP)/src/gallium/include/ \ - $(MESA_TOP)/src/mapi/ \ - $(MESA_TOP)/src/mesa/ \ - $(MESA_TOP)/src/panfrost/include/ \ - $(MESA_TOP)/src/panfrost/midgard/ - -LOCAL_STATIC_LIBRARIES := \ - libmesa_glsl \ - libmesa_nir \ - libmesa_st_mesa \ - libpanfrost_util \ - libpanfrost_midgard_disasm - -midgard_nir_algebraic_gen := $(LOCAL_PATH)/midgard/midgard_nir_algebraic.py -midgard_nir_algebraic_deps := \ - $(MESA_TOP)/src/compiler/nir/ - -$(intermediates)/midgard_nir_algebraic.c: $(midgard_nir_algebraic_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON3) $(midgard_nir_algebraic_gen) -p $< > $@ - -LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(MESA_TOP)/src/panfrost/midgard/ \ - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/panfrost/Android.mk b/src/panfrost/Android.mk deleted file mode 100644 index 0681651ab2b..00000000000 --- a/src/panfrost/Android.mk +++ /dev/null @@ -1,32 +0,0 @@ -# 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 libpanfrost_* - -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.lib.mk -include $(LOCAL_PATH)/Android.midgard.mk -include $(LOCAL_PATH)/Android.shared.mk diff --git a/src/panfrost/Android.shared.mk b/src/panfrost/Android.shared.mk deleted file mode 100644 index 81024607eeb..00000000000 --- a/src/panfrost/Android.shared.mk +++ /dev/null @@ -1,48 +0,0 @@ -# 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 libpanfrost_shared.a - -# --------------------------------------- -# Build libpanfrost_shared -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(shared_FILES) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/gallium/auxiliary/ \ - $(MESA_TOP)/src/gallium/include/ - -LOCAL_STATIC_LIBRARIES := \ - -LOCAL_MODULE := libpanfrost_shared - -LOCAL_GENERATED_SOURCES := \ - -LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(MESA_TOP)/src/panfrost/shared/ \ - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/panfrost/Android.util.mk b/src/panfrost/Android.util.mk deleted file mode 100644 index 19731a733f2..00000000000 --- a/src/panfrost/Android.util.mk +++ /dev/null @@ -1,50 +0,0 @@ -# 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 libpanfrost_util.a - -# --------------------------------------- -# Build libpanfrost_util -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(util_FILES) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/panfrost/include/ \ - $(MESA_TOP)/src/gallium/auxiliary/ \ - $(MESA_TOP)/src/gallium/include/ - -LOCAL_STATIC_LIBRARIES := \ - libmesa_nir \ - -LOCAL_MODULE := libpanfrost_util - -LOCAL_GENERATED_SOURCES := \ - -LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(MESA_TOP)/src/panfrost/util/ \ - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/panfrost/Makefile.sources b/src/panfrost/Makefile.sources deleted file mode 100644 index 080a91fa6de..00000000000 --- a/src/panfrost/Makefile.sources +++ /dev/null @@ -1,123 +0,0 @@ -bifrost_FILES := \ - bifrost/bifrost.h \ - bifrost/bifrost_compile.c \ - bifrost/bifrost_compile.h \ - bifrost/bi_layout.c \ - bifrost/bi_liveness.c \ - bifrost/bi_lower_divergent_indirects.c \ - bifrost/bi_lower_swizzle.c \ - bifrost/bi_schedule.c \ - bifrost/bi_scoreboard.c \ - bifrost/bi_pack.c \ - bifrost/bi_print.c \ - bifrost/bi_print.h \ - bifrost/bi_ra.c \ - bifrost/bi_opt_constant_fold.c \ - bifrost/bi_opt_copy_prop.c \ - bifrost/bi_opt_dce.c \ - bifrost/bi_opt_push_ubo.c \ - bifrost/bi_quirks.h \ - bifrost/bi_test_pack.c \ - bifrost/bir.c \ - bifrost/compiler.h \ - bifrost/cmdline.c - -bifrost_disasm_FILES := \ - bifrost/disassemble.c \ - bifrost/disassemble.h \ - bifrost/bi_print_common.c \ - bifrost/bi_print_common.h - -lib_FILES := \ - lib/decode_common.c \ - lib/decode.c \ - lib/pan_afbc.c \ - lib/pan_attributes.c \ - lib/pan_bo.c \ - lib/pan_bo.h \ - lib/pan_blend.c \ - lib/pan_blend.h \ - lib/pan_blitter.c \ - lib/pan_blitter.h \ - lib/pan_cs.c \ - lib/pan_cs.h \ - lib/pan_device.h \ - lib/pan_encoder.h \ - lib/pan_format.c \ - lib/pan_indirect_dispatch.c \ - lib/pan_indirect_dispatch.h \ - lib/pan_indirect_draw.c \ - lib/pan_indirect_draw.h \ - lib/pan_invocation.c \ - lib/pan_pool.c \ - lib/pan_pool.h \ - lib/pan_props.c \ - lib/pan_sampler.c \ - lib/pan_samples.c \ - lib/pan_shader.c \ - lib/pan_shader.h \ - 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 \ - midgard/disassemble.c \ - midgard/disassemble.h \ - midgard/helpers.h \ - midgard/midgard_address.c \ - midgard/midgard_compile.c \ - midgard/midgard_compile.h \ - midgard/midgard_derivatives.c \ - midgard/midgard_emit.c \ - midgard/midgard.h \ - midgard/midgard_liveness.c \ - midgard/midgard_nir_lower_helper_writes.c \ - midgard/midgard_helper_invocations.c \ - midgard/midgard_nir.h \ - midgard/midgard_nir_lower_image_bitsize.c \ - midgard/midgard_ops.c \ - midgard/midgard_ops.h \ - midgard/midgard_opt_copy_prop.c \ - midgard/midgard_opt_dce.c \ - midgard/midgard_opt_perspective.c \ - midgard/midgard-parse.h \ - midgard/midgard_print.c \ - midgard/midgard_ra.c \ - midgard/midgard_ra_pipeline.c \ - midgard/midgard_schedule.c \ - midgard/midgard_errata_lod.c \ - midgard/mir.c \ - midgard/mir_promote_uniforms.c \ - midgard/mir_squeeze.c \ - midgard/nir_fuse_io_16.c \ - -midgard_disasm_FILES := \ - midgard/disassemble.c \ - midgard/disassemble.h \ - midgard/midgard_ops.c \ - midgard/midgard_ops.h \ - midgard/midgard_print_constant.c - -shared_FILES := \ - shared/pan_minmax_cache.c \ - shared/pan_tiling.c \ - shared/pan_minmax_cache.h \ - shared/pan_tiling.h \ - -util_FILES := \ - util/lcra.c \ - util/lcra.h \ - util/nir_mod_helpers.c \ - util/pan_ir.c \ - util/pan_ir.h \ - util/pan_liveness.c \ - util/pan_lower_framebuffer.c \ - util/pan_lower_helper_invocation.c \ - util/pan_lower_sample_position.c \ - util/pan_lower_writeout.c \ - util/pan_lower_64bit_intrin.c \ - util/pan_sysval.c \ diff --git a/src/util/Android.mk b/src/util/Android.mk deleted file mode 100644 index 3866610cf81..00000000000 --- a/src/util/Android.mk +++ /dev/null @@ -1,101 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2014 Tomasz Figa -# -# 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. - -LOCAL_PATH := $(call my-dir) - -include $(LOCAL_PATH)/Makefile.sources - -# --------------------------------------- -# Build libmesa_util -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(MESA_UTIL_FILES) \ - $(XMLCONFIG_FILES) - -LOCAL_MODULE := libmesa_util - -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -intermediates := $(call local-generated-sources-dir) - -LOCAL_C_INCLUDES := \ - external/zlib \ - $(MESA_TOP)/src/mesa \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src/gallium/auxiliary \ - $(MESA_TOP)/src/util/format \ - $(intermediates)/util/format \ - $(intermediates) - -LOCAL_CFLAGS := -DNO_FORMAT_ASM - -# If Android version >=8 MESA should static link libexpat else should dynamic link -ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0) -LOCAL_STATIC_LIBRARIES := \ - libexpat -else -LOCAL_SHARED_LIBRARIES := \ - libexpat -endif - -LOCAL_SHARED_LIBRARIES += liblog libsync libcutils - -# Generated sources - -LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) - -# Some sources do require "util/format/u_format_pack.h" generated header -UTIL_GENERATED_SOURCES := $(addprefix $(intermediates)/,$(subst format/u_format_pack.h,util/format/u_format_pack.h,$(MESA_UTIL_GENERATED_FILES))) -LOCAL_GENERATED_SOURCES := $(UTIL_GENERATED_SOURCES) - -driconf_static_gen := $(LOCAL_PATH)/driconf_static.py -driconf_static_deps := $(LOCAL_PATH)/00-mesa-defaults.conf - -$(intermediates)/driconf_static.h: $(driconf_static_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $(driconf_static_gen) $^ $@ - -format_srgb_gen := $(LOCAL_PATH)/format_srgb.py - -$(intermediates)/format_srgb.c: $(format_srgb_gen) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $(format_srgb_gen) $< > $@ - -u_format_gen := $(LOCAL_PATH)/format/u_format_table.py -u_format_deps := $(LOCAL_PATH)/format/u_format.csv \ - $(LOCAL_PATH)/format/u_format_pack.py \ - $(LOCAL_PATH)/format/u_format_parse.py - -$(intermediates)/util/format/u_format_pack.h: $(u_format_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $(u_format_gen) --header $< > $@ - -$(intermediates)/format/u_format_table.c: $(u_format_deps) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $(u_format_gen) $< > $@ - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources deleted file mode 100644 index 58605de5c96..00000000000 --- a/src/util/Makefile.sources +++ /dev/null @@ -1,159 +0,0 @@ -MESA_UTIL_FILES := \ - anon_file.h \ - anon_file.c \ - bigmath.h \ - bitscan.c \ - bitscan.h \ - bitset.h \ - blob.c \ - blob.h \ - build_id.c \ - build_id.h \ - cnd_monotonic.h \ - compiler.h \ - compress.c \ - compress.h \ - crc32.c \ - crc32.h \ - dag.c \ - dag.h \ - debug.c \ - debug.h \ - disk_cache.c \ - disk_cache.h \ - disk_cache_os.c \ - disk_cache_os.h \ - double.c \ - double.h \ - enum_operators.h \ - fast_idiv_by_const.c \ - fast_idiv_by_const.h \ - format/u_format.c \ - format/u_format.h \ - format/u_format_bptc.c \ - format/u_format_bptc.h \ - format/u_format_etc.c \ - format/u_format_etc.h \ - format/u_format_fxt1.c \ - format/u_format_fxt1.h \ - format/u_format_latc.c \ - format/u_format_latc.h \ - format/u_format_other.c \ - format/u_format_other.h \ - format/u_format_rgtc.c \ - format/u_format_rgtc.h \ - format/u_format_s3tc.c \ - format/u_format_s3tc.h \ - format/u_format_tests.c \ - format/u_format_tests.h \ - format/u_format_yuv.c \ - format/u_format_yuv.h \ - format/u_format_zs.c \ - format/u_format_zs.h \ - format_r11g11b10f.h \ - format_rgb9e5.h \ - format_srgb.h \ - fossilize_db.c \ - fossilize_db.h \ - futex.h \ - half_float.c \ - half_float.h \ - hash_table.c \ - hash_table.h \ - u_idalloc.c \ - u_idalloc.h \ - list.h \ - log.c \ - log.h \ - macros.h \ - memstream.c \ - memstream.h \ - mesa-sha1.c \ - mesa-sha1.h \ - os_time.c \ - os_time.h \ - os_file.c \ - os_file.h \ - os_socket.c \ - os_socket.h \ - os_misc.c \ - os_misc.h \ - u_process.c \ - u_process.h \ - u_qsort.cpp \ - u_qsort.h \ - sha1/sha1.c \ - sha1/sha1.h \ - ralloc.c \ - ralloc.h \ - rand_xor.c \ - rand_xor.h \ - rb_tree.c \ - rb_tree.h \ - register_allocate.c \ - register_allocate.h \ - rgtc.c \ - rgtc.h \ - rounding.h \ - set.c \ - set.h \ - simple_list.h \ - simple_mtx.h \ - slab.c \ - slab.h \ - softfloat.c \ - softfloat.h \ - sparse_array.c \ - sparse_array.h \ - string_buffer.c \ - string_buffer.h \ - strndup.h \ - strtod.c \ - strtod.h \ - texcompress_rgtc_tmp.h \ - timespec.h \ - u_atomic.c \ - u_atomic.h \ - u_dynarray.h \ - u_endian.h \ - u_math.c \ - u_math.h \ - u_queue.c \ - u_queue.h \ - u_string.h \ - u_thread.h \ - u_vector.c \ - u_vector.h \ - u_debug.c \ - u_debug.h \ - u_debug_memory.c \ - u_debug_stack.c \ - u_debug_stack.h \ - u_debug_symbol.c \ - u_debug_symbol.h \ - u_cpu_detect.c \ - u_cpu_detect.h \ - u_printf.cpp \ - u_printf.h \ - os_memory_aligned.h \ - os_memory_debug.h \ - os_memory_stdc.h \ - os_memory.h \ - u_memory.h \ - u_memset.h \ - u_mm.h \ - u_mm.c \ - vma.c \ - vma.h \ - xxhash.h - - -MESA_UTIL_GENERATED_FILES = \ - driconf_static.h \ - format_srgb.c \ - format/u_format_table.c \ - format/u_format_pack.h - -XMLCONFIG_FILES := \ - xmlconfig.c \ - xmlconfig.h diff --git a/src/vulkan/Android.mk b/src/vulkan/Android.mk deleted file mode 100644 index 295c57d3cab..00000000000 --- a/src/vulkan/Android.mk +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright © 2017 Mauro Rossi -# Copyright © 2017 Intel Corporation -# -# 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 (including the next -# paragraph) 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. - -LOCAL_PATH := $(call my-dir) - -# Import variables -include $(LOCAL_PATH)/Makefile.sources - -# -# libmesa_vulkan_util -# - -include $(CLEAR_VARS) -LOCAL_MODULE := libmesa_vulkan_util -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -intermediates := $(call local-generated-sources-dir) - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/include/vulkan \ - $(MESA_TOP)/src/vulkan/util \ - $(MESA_TOP)/src/gallium/include \ - $(intermediates)/util \ - -ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0) -LOCAL_C_INCLUDES += \ - frameworks/native/libs/nativebase/include \ - frameworks/native/libs/nativewindow/include \ - frameworks/native/libs/arect/include -LOCAL_HEADER_LIBRARIES += libcutils_headers libsystem_headers -endif - -LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/, \ - $(VULKAN_UTIL_GENERATED_FILES)) - -LOCAL_SRC_FILES := $(VULKAN_UTIL_FILES) $(VULKAN_WSI_FILES) - -vulkan_api_xml = $(MESA_TOP)/src/vulkan/registry/vk.xml - -$(intermediates)/util/vk_enum_to_str.c: $(MESA_TOP)/src/vulkan/util/gen_enum_to_str.py \ - $(vulkan_api_xml) - @echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))" - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $< \ - --xml $(vulkan_api_xml) \ - --outdir $(dir $@) - -$(intermediates)/util/vk_enum_to_str.h: $(intermediates)/util/vk_enum_to_str.c - -$(intermediates)/util/vk_common_entrypoints.c: $(MESA_TOP)/src/vulkan/util/vk_entrypoints_gen.py \ - $(vulkan_api_xml) - @echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))" - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $< \ - --xml $(vulkan_api_xml) \ - --proto --weak --prefix vk_common \ - --out-c $@ --out-h $(dir $@)/vk_common_entrypoints.h - -$(intermediates)/util/vk_common_entrypoints.h: $(intermediates)/util/vk_common_entrypoints.c - -$(intermediates)/util/vk_dispatch_table.c: $(MESA_TOP)/src/vulkan/util/vk_dispatch_table_gen.py \ - $(vulkan_api_xml) - @echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))" - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $< \ - --xml $(vulkan_api_xml) \ - --out-c $@ - -$(intermediates)/util/vk_dispatch_table.h: $(MESA_TOP)/src/vulkan/util/vk_dispatch_table_gen.py \ - $(vulkan_api_xml) - @echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))" - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $< \ - --xml $(vulkan_api_xml) \ - --out-h $@ - -$(intermediates)/util/vk_extensions.c: $(MESA_TOP)/src/vulkan/util/vk_extensions_gen.py \ - $(vulkan_api_xml) - @echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))" - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $< \ - --xml $(vulkan_api_xml) \ - --out-c $@ - -$(intermediates)/util/vk_extensions.h: $(MESA_TOP)/src/vulkan/util/vk_extensions_gen.py \ - $(vulkan_api_xml) - @echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))" - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $< \ - --xml $(vulkan_api_xml) \ - --out-h $@ - -LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)/util - -ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),) -LOCAL_SHARED_LIBRARIES += libnativewindow -endif - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/vulkan/Makefile.sources b/src/vulkan/Makefile.sources deleted file mode 100644 index ebaa43d6c3b..00000000000 --- a/src/vulkan/Makefile.sources +++ /dev/null @@ -1,58 +0,0 @@ - -VULKAN_WSI_FILES := \ - wsi/wsi_common.c \ - wsi/wsi_common.h \ - wsi/wsi_common_private.h \ - wsi/wsi_common_queue.h - -VULKAN_WSI_WAYLAND_FILES := \ - wsi/wsi_common_wayland.c \ - wsi/wsi_common_wayland.h - -VULKAN_WSI_WAYLAND_GENERATED_FILES := \ - wsi/wayland-drm-protocol.c \ - wsi/wayland-drm-client-protocol.h \ - wsi/linux-dmabuf-unstable-v1-protocol.c \ - wsi/linux-dmabuf-unstable-v1-client-protocol.h - -VULKAN_WSI_X11_FILES := \ - wsi/wsi_common_x11.c \ - wsi/wsi_common_x11.h - -VULKAN_WSI_DISPLAY_FILES := \ - wsi/wsi_common_display.c \ - wsi/wsi_common_display.h - -VULKAN_UTIL_FILES := \ - util/vk_alloc.h \ - util/vk_cmd_copy.c \ - util/vk_debug_report.c \ - util/vk_debug_report.h \ - util/vk_deferred_operation.c \ - util/vk_deferred_operation.h \ - util/vk_descriptors.c \ - util/vk_descriptors.h \ - util/vk_device.c \ - util/vk_device.h \ - util/vk_format.c \ - util/vk_instance.c \ - util/vk_instance.h \ - util/vk_object.c \ - util/vk_object.h \ - util/vk_physical_device.c \ - util/vk_physical_device.h \ - util/vk_render_pass.c \ - util/vk_shader_module.c \ - util/vk_shader_module.h \ - util/vk_util.c \ - util/vk_util.h - -VULKAN_UTIL_GENERATED_FILES := \ - util/vk_enum_to_str.c \ - util/vk_enum_to_str.h \ - util/vk_common_entrypoints.c \ - util/vk_common_entrypoints.h \ - util/vk_dispatch_table.c \ - util/vk_dispatch_table.h \ - util/vk_extensions.c \ - util/vk_extensions.h