From 072810163a05080d88e1b918efd66baafd226476 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Fri, 20 Sep 2019 14:18:56 +0000 Subject: [PATCH] Relax Linux checks for the code works on any non-Windows platform MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In file included from Source/GmmLib/CachePolicy/GmmCachePolicy.cpp:23: In file included from Source/GmmLib/inc/Internal/Common/GmmLibInc.h:58: In file included from Source/GmmLib/inc/External/Common/GmmResourceInfo.h:91: In file included from Source/GmmLib/inc/External/Common/../Linux/GmmResourceInfoLin.h:26: In file included from Source/GmmLib/inc/External/Common/../Linux/../Common/GmmResourceInfoCommon.h:32: Source/GmmLib/inc/External/Common/GmmClientContext.h:59:5: error: unknown type name 'GMM_DEVICE_CALLBACKS_INT' GMM_DEVICE_CALLBACKS_INT *pDeviceCb; ^ Source/GmmLib/inc/External/Common/GmmClientContext.h:85:9: error: unknown type name 'GMM_DEVICE_CALLBACKS_INT' GMM_DEVICE_CALLBACKS_INT DeviceCB; //OS-specific defn: Will be used by Clients to send as input arguments. ^ Source/GmmLib/inc/External/Common/GmmClientContext.h:139:80: error: unknown type name 'GMM_DEVICE_CALLBACKS_INT' GMM_VIRTUAL GMM_PAGETABLE_MGR* GMM_STDCALL CreatePageTblMgrObject(GMM_DEVICE_CALLBACKS_INT* pDevCb, uint32_t TTFlags); ^ Source/GmmLib/inc/External/Common/GmmClientContext.h:154:57: error: unknown type name 'GMM_DEVICE_CALLBACKS_INT' GMM_DEVICE_CALLBACKS_INT* pDevCb, ^ In file included from Source/GmmLib/CachePolicy/GmmCachePolicy.cpp:23: In file included from Source/GmmLib/inc/Internal/Common/GmmLibInc.h:62: Source/GmmLib/inc/External/Common/GmmPageTableMgr.h:56:5: error: unknown type name 'GMM_UMD_SYNCCONTEXT'; did you mean 'GMM_UMD_CONTEXT'? GMM_UMD_SYNCCONTEXT * UmdContext; // [in] pointer to thread-specific data, specifying BBQHandle/Fence etc ^~~~~~~~~~~~~~~~~~~ GMM_UMD_CONTEXT Source/GmmLib/inc/External/Common/GmmInfo.h:58:3: note: 'GMM_UMD_CONTEXT' declared here } GMM_UMD_CONTEXT; ^ In file included from Source/GmmLib/CachePolicy/GmmCachePolicy.cpp:23: In file included from Source/GmmLib/inc/Internal/Common/GmmLibInc.h:62: Source/GmmLib/inc/External/Common/GmmPageTableMgr.h:72:9: error: unknown type name 'HANDLE' HANDLE BBQueueHandle; ^ Source/GmmLib/inc/External/Common/GmmPageTableMgr.h:75:21: error: unknown type name 'HANDLE' SyncInfoLin(HANDLE Handle, uint64_t Fence) {} ^ Source/GmmLib/inc/External/Common/GmmPageTableMgr.h:115:9: error: unknown type name 'GMM_DEVICE_CALLBACKS' GMM_DEVICE_CALLBACKS DeviceCb; //OS-specific defn: Will be used by Clients to send as input arguments for TR-TT APIs ^ Source/GmmLib/inc/External/Common/GmmPageTableMgr.h:116:9: error: unknown type name 'GMM_DEVICE_CALLBACKS_INT' GMM_DEVICE_CALLBACKS_INT DeviceCbInt; //OS-specific defn: Will be used internally GMM lib ^ Source/GmmLib/inc/External/Common/GmmPageTableMgr.h:117:9: error: unknown type name 'GMM_TRANSLATIONTABLE_CALLBACKS' GMM_TRANSLATIONTABLE_CALLBACKS TTCb; //OS-specific defn ^ Source/GmmLib/inc/External/Common/GmmPageTableMgr.h:118:9: error: unknown type name 'HANDLE' HANDLE hCsr; // OCL per-device command stream receiver handle for aubcapture ^ Source/GmmLib/inc/External/Common/GmmPageTableMgr.h:121:25: error: unknown type name 'GMM_DEVICE_CALLBACKS_INT' GmmPageTableMgr(GMM_DEVICE_CALLBACKS_INT *, uint32_t TTFlags, GmmClientContext *pClientContextIn); // Allocates memory for indicate TT’s root-tables, initializes common node-pool ^ Source/GmmLib/inc/External/Common/GmmPageTableMgr.h:128:60: error: unknown type name 'HANDLE' GMM_VIRTUAL GMM_STATUS InitContextAuxTableRegister(HANDLE initialBBHandle, GMM_ENGINE_TYPE engType); //Clients call it to update Aux-Table pointer in context-image, engType reqd. if @ context level ^ Source/GmmLib/inc/External/Common/GmmPageTableMgr.h:133:46: error: unknown type name 'GMM_UMD_SYNCCONTEXT'; did you mean 'GMM_UMD_CONTEXT'? GMM_VIRTUAL void __ReleaseUnusedPool(GMM_UMD_SYNCCONTEXT *UmdContext); ^~~~~~~~~~~~~~~~~~~ GMM_UMD_CONTEXT Source/GmmLib/inc/External/Common/GmmInfo.h:58:3: note: 'GMM_UMD_CONTEXT' declared here } GMM_UMD_CONTEXT; ^ --- Source/Common/AssertTracer/AssertTracer.cpp | 2 +- Source/Common/AssertTracer/AssertTracer.h | 2 +- Source/GmmLib/CachePolicy/GmmGen8CachePolicy.h | 2 +- Source/GmmLib/Resource/Linux/GmmResourceInfoLinCWrapper.cpp | 4 ++-- Source/GmmLib/Texture/GmmTextureAlloc.cpp | 2 +- Source/GmmLib/TranslationTable/GmmPageTableMgr.cpp | 6 +++--- Source/GmmLib/TranslationTable/GmmUmdTranslationTable.cpp | 2 +- Source/GmmLib/TranslationTable/GmmUmdTranslationTable.h | 4 ++-- Source/GmmLib/ULT/GmmAuxTableULT.cpp | 4 ++-- Source/GmmLib/ULT/GmmAuxTableULT.h | 4 ++-- Source/GmmLib/Utility/GmmLog/GmmLog.cpp | 5 +---- Source/GmmLib/Utility/GmmLog/spdlog/tweakme.h | 2 +- Source/GmmLib/inc/External/Common/GmmCommonExt.h | 2 +- Source/GmmLib/inc/External/Common/GmmPageTableMgr.h | 6 +++--- Source/GmmLib/inc/External/Common/GmmResourceInfoExt.h | 2 +- Source/GmmLib/inc/External/Linux/GmmResourceInfoLinExt.h | 4 ++-- Source/GmmLib/inc/Internal/Linux/GmmResourceInfoLinInt.h | 4 ++-- Source/util/gfxDebug.h | 2 +- 18 files changed, 28 insertions(+), 31 deletions(-) diff --git a/Source/Common/AssertTracer/AssertTracer.cpp b/Source/Common/AssertTracer/AssertTracer.cpp index e9f33a4..cfd9528 100644 --- a/Source/Common/AssertTracer/AssertTracer.cpp +++ b/Source/Common/AssertTracer/AssertTracer.cpp @@ -180,7 +180,7 @@ void __stdcall ReportAssertETW( const unsigned short compId, #endif } -#elif defined( __linux__ ) && defined( _RELEASE_INTERNAL ) && !defined( __ANDROID__ ) +#elif defined( _RELEASE_INTERNAL ) && !defined( _WIN32 ) && !defined( __ANDROID__ ) #include #include #include diff --git a/Source/Common/AssertTracer/AssertTracer.h b/Source/Common/AssertTracer/AssertTracer.h index 5b21afa..6472796 100644 --- a/Source/Common/AssertTracer/AssertTracer.h +++ b/Source/Common/AssertTracer/AssertTracer.h @@ -91,7 +91,7 @@ void __stdcall ReportAssertETW(const unsigned short compId, } #endif -#elif defined( __linux__ ) && defined( _RELEASE_INTERNAL ) && !defined( __ANDROID__ ) +#elif defined( _RELEASE_INTERNAL ) && !defined( _WIN32 ) && !defined( __ANDROID__ ) // do while() is missing ";" at the end and this is intentional // As invoking assert looks like this: assert(expr); So semicolon will // be stuck to do.. while() and that way sorting out possible diff --git a/Source/GmmLib/CachePolicy/GmmGen8CachePolicy.h b/Source/GmmLib/CachePolicy/GmmGen8CachePolicy.h index 112aacf..24dbe57 100755 --- a/Source/GmmLib/CachePolicy/GmmGen8CachePolicy.h +++ b/Source/GmmLib/CachePolicy/GmmGen8CachePolicy.h @@ -145,7 +145,7 @@ DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_SURFACE_REF_ENCODE DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_SURFACE_HME_DOWNSAMPLED_ENCODE , 1 , 1 , 1 , 0 , 1); DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_SURFACE_HME_DOWNSAMPLED_ENCODE_DST , 1 , 1 , 0 , 0 , 1); DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_SURFACE_ME_DISTORTION_ENCODE , 1 , 1 , 1 , 0 , 1); -#if defined(__linux__) && !defined(ANDROID) +#if !defined(_WIN32) && !defined(ANDROID) DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_SURFACE_MV_DATA_ENCODE , 1 , 1 , 0 , 0 , 1); DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_SURFACE_BRC_ME_DISTORTION_ENCODE , 1 , 1 , 0 , 0 , 1); DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_PAK_OBJECT_ENCODE , 1 , 1 , 0 , 0 , 1); diff --git a/Source/GmmLib/Resource/Linux/GmmResourceInfoLinCWrapper.cpp b/Source/GmmLib/Resource/Linux/GmmResourceInfoLinCWrapper.cpp index 546815f..ee41b17 100644 --- a/Source/GmmLib/Resource/Linux/GmmResourceInfoLinCWrapper.cpp +++ b/Source/GmmLib/Resource/Linux/GmmResourceInfoLinCWrapper.cpp @@ -22,7 +22,7 @@ OTHER DEALINGS IN THE SOFTWARE. #include "Internal/Common/GmmLibInc.h" -#if defined(__linux__) && !LHDM +#if !defined(_WIN32) && !LHDM #include "Internal/Linux/GmmResourceInfoLinInt.h" ///////////////////////////////////////////////////////////////////////////////////// @@ -176,4 +176,4 @@ GMM_TRANSLATIONTABLE_CALLBACKS DummyTTCB = { .pfWriteL3Adr = DummyWriteL3Adr, }; -#endif /*__linux__*/ +#endif /*!_WIN32*/ diff --git a/Source/GmmLib/Texture/GmmTextureAlloc.cpp b/Source/GmmLib/Texture/GmmTextureAlloc.cpp index 9c1f247..a97eb55 100644 --- a/Source/GmmLib/Texture/GmmTextureAlloc.cpp +++ b/Source/GmmLib/Texture/GmmTextureAlloc.cpp @@ -777,7 +777,7 @@ GMM_STATUS GmmLib::GmmTextureCalc::FillTexPitchAndSize(GMM_TEXTURE_INFO * pTexIn } else { -#if defined(__GMM_KMD__) || defined(__linux__) +#if defined(__GMM_KMD__) || !defined(_WIN32) GMM_ASSERTDPF(0, "Surface too large!"); #endif Status = GMM_ERROR; diff --git a/Source/GmmLib/TranslationTable/GmmPageTableMgr.cpp b/Source/GmmLib/TranslationTable/GmmPageTableMgr.cpp index 28e3b24..f9ea3de 100644 --- a/Source/GmmLib/TranslationTable/GmmPageTableMgr.cpp +++ b/Source/GmmLib/TranslationTable/GmmPageTableMgr.cpp @@ -28,7 +28,7 @@ Description: UMD-TT manager (manages both TR-TT and AUX-TT in user mode space) #include "../TranslationTable/GmmUmdTranslationTable.h" #include "External/Common/GmmClientContext.h" -#if defined(__linux__) +#if !defined(_WIN32) #include "Internal/Linux/GmmResourceInfoLinInt.h" #endif @@ -44,7 +44,7 @@ Description: UMD-TT manager (manages both TR-TT and AUX-TT in user mode space) LeaveCriticalSection(&PoolLock); \ } extern GMM_MA_LIB_CONTEXT *pGmmMALibContext; -#if defined(__linux__) +#if !defined(_WIN32) GMM_STATUS GmmLib::__GmmDeviceAlloc(GmmClientContext * pClientContext, GMM_DEVICE_CALLBACKS_INT *pDeviceCbInt, GMM_DEVICE_ALLOC * pAlloc) @@ -609,7 +609,7 @@ GMM_STATUS GmmLib::GmmPageTableMgr::UpdateAuxTable(const GMM_DDI_UPDATEAUXTABLE return GMM_SUCCESS; } -#if defined(__linux__) && !_WIN32 +#if !defined(_WIN32) ///////////////////////////////////////////////////////////////////////////////////// /// Gets size of PageTable buffer object (BOs) list /// diff --git a/Source/GmmLib/TranslationTable/GmmUmdTranslationTable.cpp b/Source/GmmLib/TranslationTable/GmmUmdTranslationTable.cpp index cb852b1..0c44f68 100644 --- a/Source/GmmLib/TranslationTable/GmmUmdTranslationTable.cpp +++ b/Source/GmmLib/TranslationTable/GmmUmdTranslationTable.cpp @@ -31,7 +31,7 @@ Description: Contains functions of internal classes #if !defined(__GMM_KMD) -#if defined(__linux__) +#if !defined(_WIN32) #include "Internal/Linux/GmmResourceInfoLinInt.h" #define _aligned_free(ptr) free(ptr) diff --git a/Source/GmmLib/TranslationTable/GmmUmdTranslationTable.h b/Source/GmmLib/TranslationTable/GmmUmdTranslationTable.h index 0be1685..dbc2ea9 100644 --- a/Source/GmmLib/TranslationTable/GmmUmdTranslationTable.h +++ b/Source/GmmLib/TranslationTable/GmmUmdTranslationTable.h @@ -27,7 +27,7 @@ Description: This file contains the class definitions for GmmPageTablePool #pragma once #include "External/Common/GmmPageTableMgr.h" -#ifdef __linux__ +#ifndef _WIN32 #include #include @@ -445,7 +445,7 @@ namespace GmmLib public: #ifdef _WIN32 CRITICAL_SECTION TTLock; //synchronized access of PageTable obj -#elif defined __linux__ +#else pthread_mutex_t TTLock; #endif diff --git a/Source/GmmLib/ULT/GmmAuxTableULT.cpp b/Source/GmmLib/ULT/GmmAuxTableULT.cpp index c6a9b53..567f1f3 100644 --- a/Source/GmmLib/ULT/GmmAuxTableULT.cpp +++ b/Source/GmmLib/ULT/GmmAuxTableULT.cpp @@ -20,7 +20,7 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ============================================================================*/ -#if defined (__linux__) && !defined(__i386__) +#if !defined (_WIN32) && !defined(__i386__) #include "GmmAuxTableULT.h" @@ -262,4 +262,4 @@ TEST_F(CTestAuxTable, TestAuxTableContent) pGmmULTClientContext->DestroyPageTblMgrObject(mgr); } -#endif /* __linux__ */ +#endif /* !_WIN32 */ diff --git a/Source/GmmLib/ULT/GmmAuxTableULT.h b/Source/GmmLib/ULT/GmmAuxTableULT.h index 2a7dcb1..1ecbc45 100644 --- a/Source/GmmLib/ULT/GmmAuxTableULT.h +++ b/Source/GmmLib/ULT/GmmAuxTableULT.h @@ -22,7 +22,7 @@ OTHER DEALINGS IN THE SOFTWARE. #pragma once -#if defined (__linux__) && !defined(__i386__) +#if !defined (_WIN32) && !defined(__i386__) #ifndef _ISOC11_SOURCE #define _ISOC11_SOURCE 1 @@ -248,4 +248,4 @@ class CTestAuxTable : public CTestGen10Resource }; }; -#endif /* __linux__ */ +#endif /* !_WIN32 */ diff --git a/Source/GmmLib/Utility/GmmLog/GmmLog.cpp b/Source/GmmLib/Utility/GmmLog/GmmLog.cpp index e864fac..13e8d3c 100644 --- a/Source/GmmLib/Utility/GmmLog/GmmLog.cpp +++ b/Source/GmmLib/Utility/GmmLog/GmmLog.cpp @@ -189,12 +189,9 @@ bool GmmLib::Logger::GmmLogInit() #elif defined(__ANDROID__) // Log to logcat SpdLogger = spdlog::android_logger(GMM_LOGGER_NAME, GMM_LOG_TAG); -#elif defined(__linux__) +#else // Log to syslog SpdLogger = spdlog::syslog_logger(GMM_LOGGER_NAME, GMM_LOG_TAG, 1 /*Log Pid*/); -#else - __GMM_ASSERT(0); - return false; #endif } } diff --git a/Source/GmmLib/Utility/GmmLog/spdlog/tweakme.h b/Source/GmmLib/Utility/GmmLog/spdlog/tweakme.h index 5518ce1..cafb783 100644 --- a/Source/GmmLib/Utility/GmmLog/spdlog/tweakme.h +++ b/Source/GmmLib/Utility/GmmLog/spdlog/tweakme.h @@ -97,7 +97,7 @@ /////////////////////////////////////////////////////////////////////////////// // Uncomment to enable syslog (disabled by default) // -#if __linux__ +#ifndef _WIN32 #define SPDLOG_ENABLE_SYSLOG #endif /////////////////////////////////////////////////////////////////////////////// diff --git a/Source/GmmLib/inc/External/Common/GmmCommonExt.h b/Source/GmmLib/inc/External/Common/GmmCommonExt.h index 320dda7..86778eb 100644 --- a/Source/GmmLib/inc/External/Common/GmmCommonExt.h +++ b/Source/GmmLib/inc/External/Common/GmmCommonExt.h @@ -81,7 +81,7 @@ extern const SWIZZLE_DESCRIPTOR INTEL_64KB_UNDEFINED_64_128bpp; #define GMM_NO_FENCE_REG 0xDEADBEEF #define GMM_MAX_DISPLAYS 3 -#if defined __linux__ +#ifndef _WIN32 typedef void* HANDLE; #endif diff --git a/Source/GmmLib/inc/External/Common/GmmPageTableMgr.h b/Source/GmmLib/inc/External/Common/GmmPageTableMgr.h index 55008a0..ddcc420 100644 --- a/Source/GmmLib/inc/External/Common/GmmPageTableMgr.h +++ b/Source/GmmLib/inc/External/Common/GmmPageTableMgr.h @@ -28,7 +28,7 @@ Description: This file contains the class definitions for GmmPageTableMgr #pragma once #include "GmmHw.h" -#ifdef __linux__ +#ifndef _WIN32 #include #endif @@ -108,7 +108,7 @@ namespace GmmLib GmmClientContext *pClientContext; ///< ClientContext of the client creating this Object //OS-specific defn -#if defined __linux__ +#ifndef _WIN32 pthread_mutex_t PoolLock; #endif public: @@ -134,7 +134,7 @@ namespace GmmLib GMM_VIRTUAL GMM_PAGETABLEPool * __GetFreePoolNode(uint32_t * FreePoolNodeIdx, POOL_TYPE PoolType); -#if defined __linux__ +#ifndef _WIN32 //returns number of BOs for indicated TTs = NumNodePoolElements+1 BOs for root table and pools GMM_VIRTUAL int GetNumOfPageTableBOs(uint8_t TTFlags); //returns BO* list for indicated TT in client allocated memory diff --git a/Source/GmmLib/inc/External/Common/GmmResourceInfoExt.h b/Source/GmmLib/inc/External/Common/GmmResourceInfoExt.h index 1c7455e..423bdeb 100644 --- a/Source/GmmLib/inc/External/Common/GmmResourceInfoExt.h +++ b/Source/GmmLib/inc/External/Common/GmmResourceInfoExt.h @@ -190,7 +190,7 @@ typedef struct GmmLibContext GMM_LIB_CONTEXT; // Place holder for GMM_RESOURCE_FLAG definition. //--------------------------------------------------------------------------- #include "GmmResourceFlags.h" -#if defined __linux__ +#ifndef _WIN32 #include "External/Linux/GmmResourceInfoLinExt.h" #endif diff --git a/Source/GmmLib/inc/External/Linux/GmmResourceInfoLinExt.h b/Source/GmmLib/inc/External/Linux/GmmResourceInfoLinExt.h index 20d3b95..527e52b 100644 --- a/Source/GmmLib/inc/External/Linux/GmmResourceInfoLinExt.h +++ b/Source/GmmLib/inc/External/Linux/GmmResourceInfoLinExt.h @@ -21,7 +21,7 @@ OTHER DEALINGS IN THE SOFTWARE. ============================================================================*/ #pragma once -#ifdef __linux__ +#ifndef _WIN32 #ifdef __cplusplus extern "C" { @@ -93,4 +93,4 @@ typedef struct GMM_UMD_SYNCCONTEXT_REC } #endif /*__cplusplus*/ -#endif /*__linux__*/ +#endif /*!_WIN32*/ diff --git a/Source/GmmLib/inc/Internal/Linux/GmmResourceInfoLinInt.h b/Source/GmmLib/inc/Internal/Linux/GmmResourceInfoLinInt.h index 750d537..0eedde3 100644 --- a/Source/GmmLib/inc/Internal/Linux/GmmResourceInfoLinInt.h +++ b/Source/GmmLib/inc/Internal/Linux/GmmResourceInfoLinInt.h @@ -22,7 +22,7 @@ OTHER DEALINGS IN THE SOFTWARE. #pragma once -#if defined(__linux__) && !LHDM +#if !defined(_WIN32) && !LHDM // GMM Lib Client Exports #include "External/Common/GmmCommonExt.h" @@ -68,4 +68,4 @@ int GmmCheckForNullDevCbPfn(GMM_CLIENT ClientType, GMM_DEVICE_CALLBACKS_INT *pDe extern GMM_TRANSLATIONTABLE_CALLBACKS DummyTTCB; -#endif /*__linux__*/ +#endif /*!_WIN32*/ diff --git a/Source/util/gfxDebug.h b/Source/util/gfxDebug.h index 69646f6..773c343 100644 --- a/Source/util/gfxDebug.h +++ b/Source/util/gfxDebug.h @@ -124,7 +124,7 @@ OTHER DEALINGS IN THE SOFTWARE. #else -#ifndef __linux__ +#ifdef _WIN32 #include "igdKrnlEtwMacros.h" #endif