Revert "Add new target to unify gmmlib"

This reverts commit d6c3b56.

Change-Id: I55a7c86f0d9a834f546e497324c6d2d7f464ba87

Author: drprajap

Source/GmmLib/CMakeLists.txt

@@ -76,8 +76,7 @@ set(CMAKE_DISABLE_SOURCE_CHANGES ON)
 set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
 
 set (TARGET_LIST
-	igfxgmmumd
-    gmm_umd
+	gmm_umd
 	igfx_gmmumd_excite
 	#igfx_gmmumd_ocl
 	)
@@ -269,7 +268,6 @@ set(SOURCES_
 set(UMD_SOURCES
   ${SOURCES_}
   ${BS_DIR_GMMLIB}/GlobalInfo/GmmClientContext.cpp
-  ${BS_DIR_GMMLIB}/GlobalInfo/GmmOCL.cpp
   )
 
 source_group("Source Files\\Cache Policy\\Client Files" FILES
@@ -475,11 +473,6 @@ endforeach()
 	#	GMM_OCL
     #)
 
-    bs_set_extra_target_properties(igfxgmmumd
-				ISTDLIB_UMD
-				UNUSED_ISTDLIB_MT
-	)
-
 
 	if(ARCH EQUAL 32)
 		#bs_set_extra_target_properties(igfx_gmmumd_ocl UNUSED_ISTDLIB_MT)

Source/GmmLib/GlobalInfo/GmmClientContext.cpp

@@ -363,20 +363,20 @@ GMM_RESOURCE_INFO *GMM_STDCALL GmmLib::GmmClientContext::CreateResInfoObject(GMM
     // GMM_RESOURCE_INFO...
     if(pCreateParams->pPreallocatedResInfo)
     {
-        pRes = new(pCreateParams->pPreallocatedResInfo) GmmLib::GmmResourceInfo(this); // Use preallocated memory as a class
+        pRes = new(pCreateParams->pPreallocatedResInfo) GmmLib::GmmResourceInfo(); // Use preallocated memory as a class
         pCreateParams->Flags.Info.__PreallocatedResInfo =
         pRes->GetResFlags().Info.__PreallocatedResInfo = 1; // Set both in case we can die before copying over the flags.
     }
     else
     {
-        if((pRes = new GMM_RESOURCE_INFO(this)) == NULL)
+        if((pRes = new GMM_RESOURCE_INFO) == NULL)
         {
             GMM_ASSERTDPF(0, "Allocation failed!");
             goto ERROR_CASE;
         }
     }
 
-    if(pRes->Create(*pCreateParams) != GMM_SUCCESS)
+    if(pRes->Create(*pGmmGlobalContext, *pCreateParams) != GMM_SUCCESS)
     {
         goto ERROR_CASE;
     }

Source/GmmLib/GlobalInfo/GmmInfo.cpp

@@ -69,7 +69,6 @@ GMM_STATUS GMM_STDCALL GmmInitGlobalContext(const PLATFORM           Platform,
                                             GMM_CLIENT               ClientType)
 #endif
 {
-    GMM_STATUS Status = GMM_ERROR;
     __GMM_ASSERTPTR(pSkuTable, GMM_ERROR);
     __GMM_ASSERTPTR(pWaTable, GMM_ERROR);
     __GMM_ASSERTPTR(pGtSysInfo, GMM_ERROR);
@@ -94,13 +93,7 @@ GMM_STATUS GMM_STDCALL GmmInitGlobalContext(const PLATFORM           Platform,
         return GMM_ERROR;
     }
 
-    Status = (pGmmGlobalContext->InitContext(Platform, skuTable, waTable, sysInfo, ClientType));
-
-#ifdef GMM_OCL
-    Status = GmmCreateGlobalOCLClientContext();
-#endif
-
-    return Status;
+    return (pGmmGlobalContext->InitContext(Platform, skuTable, waTable, sysInfo, ClientType));
 }
 
 
@@ -114,9 +107,6 @@ void GMM_STDCALL GmmDestroyGlobalContext(void)
     int32_t ContextRefCount = GmmLib::Context::DecrementRefCount();
     if(!ContextRefCount && pGmmGlobalContext)
     {
-#ifdef GMM_OCL
-        GmmDestroyGlobalOCLClientContext();
-#endif
         pGmmGlobalContext->DestroyContext();
         delete pGmmGlobalContext;
         pGmmGlobalContext = NULL;