From 59100e76955cb3ed2835bc5eff0df0c04aa38119 Mon Sep 17 00:00:00 2001 From: "Chen, Tianmi" Date: Wed, 3 Mar 2021 15:59:32 +0800 Subject: [PATCH 1/3] Generated Android.mk for gmmlib Q4 release Generated Android.mk for gmmlib Q4 release. Tracked-On: OAM-96033 Signed-off-by: Chen, Tianmi --- Android.mk | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 Android.mk diff --git a/Android.mk b/Android.mk new file mode 100644 index 0000000..e83edac --- /dev/null +++ b/Android.mk @@ -0,0 +1,113 @@ +# Copyright(c) 2021 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) + +LOCAL_MODULE := libgmm_umd +LOCAL_PROPRIETARY_MODULE := true +LOCAL_SRC_FILES = \ + Source/GmmLib/CachePolicy/GmmCachePolicy.cpp \ + Source/GmmLib/CachePolicy/GmmCachePolicyCommon.cpp \ + Source/GmmLib/CachePolicy/GmmGen10CachePolicy.cpp \ + Source/GmmLib/CachePolicy/GmmGen11CachePolicy.cpp \ + Source/GmmLib/CachePolicy/GmmGen12CachePolicy.cpp \ + Source/GmmLib/CachePolicy/GmmGen12dGPUCachePolicy.cpp \ + Source/GmmLib/CachePolicy/GmmGen8CachePolicy.cpp \ + Source/GmmLib/CachePolicy/GmmGen9CachePolicy.cpp \ + Source/GmmLib/GlobalInfo/GmmClientContext.cpp \ + Source/GmmLib/GlobalInfo/GmmInfo.cpp \ + Source/GmmLib/GlobalInfo/GmmLibDllMain.cpp \ + Source/GmmLib/GlobalInfo/GmmOldApi.cpp \ + Source/GmmLib/Platform/GmmGen10Platform.cpp \ + Source/GmmLib/Platform/GmmGen11Platform.cpp \ + Source/GmmLib/Platform/GmmGen12Platform.cpp \ + Source/GmmLib/Platform/GmmGen8Platform.cpp \ + Source/GmmLib/Platform/GmmGen9Platform.cpp \ + Source/GmmLib/Platform/GmmPlatform.cpp \ + Source/GmmLib/Resource/GmmResourceInfo.cpp \ + Source/GmmLib/Resource/GmmResourceInfoCommon.cpp \ + Source/GmmLib/Resource/GmmResourceInfoCommonEx.cpp \ + Source/GmmLib/Resource/GmmRestrictions.cpp \ + Source/GmmLib/Resource/Linux/GmmResourceInfoLinCWrapper.cpp \ + Source/GmmLib/Texture/GmmGen10Texture.cpp \ + Source/GmmLib/Texture/GmmGen11Texture.cpp \ + Source/GmmLib/Texture/GmmGen12Texture.cpp \ + Source/GmmLib/Texture/GmmGen7Texture.cpp \ + Source/GmmLib/Texture/GmmGen8Texture.cpp \ + Source/GmmLib/Texture/GmmGen9Texture.cpp \ + Source/GmmLib/Texture/GmmTexture.cpp \ + Source/GmmLib/Texture/GmmTextureAlloc.cpp \ + Source/GmmLib/Texture/GmmTextureOffset.cpp \ + Source/GmmLib/Texture/GmmTextureSpecialCases.cpp \ + Source/GmmLib/TranslationTable/GmmAuxTable.cpp \ + Source/GmmLib/TranslationTable/GmmPageTableMgr.cpp \ + Source/GmmLib/TranslationTable/GmmUmdTranslationTable.cpp \ + Source/GmmLib/Utility/CpuSwizzleBlt/CpuSwizzleBlt.c \ + Source/GmmLib/Utility/GmmLibObject.cpp \ + Source/GmmLib/Utility/GmmLog/GmmLog.cpp \ + Source/GmmLib/Utility/GmmUtility.cpp \ + Source/Common/AssertTracer/AssertTracer.cpp \ + +LOCAL_CFLAGS = \ + -Wno-error \ + -Wno-unused-parameter \ + -DGMM_LIB_DLL \ + -DGMM_LIB_DLL_EXPORTS \ + -DGMM_UNIFIED_LIB \ + -DGMM_UNIFY_DAF_API \ + -DISTDLIB_UMD \ + -DSMALL_POOL_ALLOC \ + -DUNUSED_ISTDLIB_MT \ + -D_ATL_NO_WIN_SUPPORT \ + -D_X64 \ + -D__GFX_MACRO_C__ \ + -D__GMM \ + -D__STDC_CONSTANT_MACROS \ + -D__STDC_LIMIT_MACROS \ + -D__UMD \ + -Digfx_gmmumd_dll_EXPORTS + +LOCAL_CPPFLAGS = \ + -fexceptions \ + -std=c++11 + +LOCAL_C_INCLUDES = \ + $(LOCAL_PATH)/Source/GmmLib \ + $(LOCAL_PATH)/Source/OpenGL/source/os/linux/oskl \ + $(LOCAL_PATH)/Source/GmmLib/Utility/GmmLog \ + $(LOCAL_PATH)/Source/GmmLib/inc \ + $(LOCAL_PATH)/Source/GmmLib/Utility \ + $(LOCAL_PATH)/Source/GmmLib/GlobalInfo \ + $(LOCAL_PATH)/Source/GmmLib/Texture \ + $(LOCAL_PATH)/Source/GmmLib/Resource \ + $(LOCAL_PATH)/Source/GmmLib/Platform \ + $(LOCAL_PATH)/Source/util \ + $(LOCAL_PATH)/Source/inc \ + $(LOCAL_PATH)/Source/inc/common \ + $(LOCAL_PATH)/Source/inc/umKmInc \ + $(LOCAL_PATH)/Source/install + +LOCAL_EXPORT_C_INCLUDE_DIRS = \ + $(LOCAL_PATH)/Source/GmmLib/inc \ + $(LOCAL_PATH)/Source/inc \ + $(LOCAL_PATH)/Source/inc/common \ + +include $(BUILD_STATIC_LIBRARY) From af111a7f4f1e1f6b76c9f5effe1d9e128cefc526 Mon Sep 17 00:00:00 2001 From: "Chen, Tianmi" Date: Mon, 8 Nov 2021 16:02:01 +0800 Subject: [PATCH 2/3] Update gmmlib to 21.3.1 Rebase gmmlib to 21.3.1 and make it compiled and run on Android. Tracked-On: OAM-100026 Signed-off-by: Chen, Tianmi --- Android.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Android.mk b/Android.mk index e83edac..806c092 100644 --- a/Android.mk +++ b/Android.mk @@ -66,7 +66,7 @@ LOCAL_SRC_FILES = \ Source/GmmLib/Utility/GmmUtility.cpp \ Source/Common/AssertTracer/AssertTracer.cpp \ -LOCAL_CFLAGS = \ +LOCAL_CFLAGS := \ -Wno-error \ -Wno-unused-parameter \ -DGMM_LIB_DLL \ @@ -85,13 +85,12 @@ LOCAL_CFLAGS = \ -D__UMD \ -Digfx_gmmumd_dll_EXPORTS -LOCAL_CPPFLAGS = \ +LOCAL_CPPFLAGS := \ -fexceptions \ -std=c++11 LOCAL_C_INCLUDES = \ $(LOCAL_PATH)/Source/GmmLib \ - $(LOCAL_PATH)/Source/OpenGL/source/os/linux/oskl \ $(LOCAL_PATH)/Source/GmmLib/Utility/GmmLog \ $(LOCAL_PATH)/Source/GmmLib/inc \ $(LOCAL_PATH)/Source/GmmLib/Utility \ From c3d146fe169ba9bf841ba28670490a15fb8b28c1 Mon Sep 17 00:00:00 2001 From: neeraj solanki Date: Mon, 17 Jan 2022 15:36:30 +0530 Subject: [PATCH 3/3] Changes (mentioned below) for Codec2 enable & OneVPL integration with CiC-cloud - Added "-msse" flags in "LOCAL_CFLAGS" to resolve build errors with Clang-11. - Added "no-pragma-pack-suspicious-include" in LOCAL_CPPFLAGS to resolve build errors with Clang-11. Tracked-On: OAM-100436 Signed-off-by: neeraj solanki --- Android.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index 806c092..478f8a4 100644 --- a/Android.mk +++ b/Android.mk @@ -83,11 +83,19 @@ LOCAL_CFLAGS := \ -D__STDC_CONSTANT_MACROS \ -D__STDC_LIMIT_MACROS \ -D__UMD \ - -Digfx_gmmumd_dll_EXPORTS + -Digfx_gmmumd_dll_EXPORTS \ + -msse \ + -msse2 \ + -msse3 \ + -mssse3 \ + -msse4 \ + -msse4.1 \ + -msse4.2 \ LOCAL_CPPFLAGS := \ -fexceptions \ - -std=c++11 + -std=c++11 \ + -Wno-pragma-pack-suspicious-include LOCAL_C_INCLUDES = \ $(LOCAL_PATH)/Source/GmmLib \