Remove link-time dependency on OpenGL lib -- it is now a runtime-only dependency. We can now build on Linux systems without needing both 64 and 32 bit versions of libGL.so

chesik-amd · chesik-amd · commit 32cb3e94e9a9 · 2016-09-30T15:45:17.000-04:00
Change-Id: I43b1a4897bf459d40d2164fa122f8a70c206319f
diff --git a/Build/VS2015/GPUPerfAPIGL.vcxproj b/Build/VS2015/GPUPerfAPIGL.vcxproj
@@ -46,9 +46,6 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   </PropertyGroup>
   <ItemDefinitionGroup>
-    <Link>
-      <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <None Include="..\..\PublicCounterCompilerInputFiles\CounterNamesGLGfx6.txt" />
@@ -89,4 +86,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/Build/VS2015/GPUPerfAPIGLES.vcxproj b/Build/VS2015/GPUPerfAPIGLES.vcxproj
@@ -46,9 +46,6 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   </PropertyGroup>
   <ItemDefinitionGroup>
-    <Link>
-      <AdditionalDependencies>libEGL.lib;libGLESv2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
     <ClCompile>
       <PreprocessorDefinitions>BOOST_MEM_FN_ENABLE_STDCALL;GLES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -88,4 +85,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/Src/GPUPerfAPICounterGenerator/GLEntryPoints.cpp b/Src/GPUPerfAPICounterGenerator/GLEntryPoints.cpp
@@ -8,6 +8,12 @@
 
 #include "GLEntryPoints.h"
 
+decltype(glFlush)*                      _oglFlush                          = nullptr;
+decltype(glGetString)*                  _oglGetString                      = nullptr;
+decltype(glGetIntegerv)*                _oglGetIntegerv                    = nullptr;
+#ifdef _WIN32
+decltype(wglGetCurrentContext)*         _wglGetCurrentContext              = nullptr;
+#endif
 PFNGLGETPERFMONITORGROUPSAMDPROC        _oglGetPerfMonitorGroupsAMD        = nullptr;
 PFNGLGETPERFMONITORCOUNTERSAMDPROC      _oglGetPerfMonitorCountersAMD      = nullptr;
 PFNGLGETPERFMONITORGROUPSTRINGAMDPROC   _oglGetPerfMonitorGroupStringAMD   = nullptr;
diff --git a/Src/GPUPerfAPICounterGenerator/GLEntryPoints.h b/Src/GPUPerfAPICounterGenerator/GLEntryPoints.h
@@ -23,19 +23,18 @@
 
 // used for defining the proc addresses which are initialized below
 #ifdef _WIN32
+extern decltype(wglGetProcAddress)* _wglGetProcAddress; ///< function pointer for wglGetProcAddress
 #define GET_PROC_ADDRESS(f,type,name)\
-    (f) = (type) wglGetProcAddress(name);
+    (f) = (type) _wglGetProcAddress(name);
 #endif
 
 #ifdef _LINUX
+extern decltype(glXGetProcAddressARB)* _glXGetProcAddressARB; ///< function pointer for glXGetProcAddressARB
 #define GET_PROC_ADDRESS(f,type,name)\
-    (f) = (type) glXGetProcAddressARB( (const GLubyte*) name);
+    (f) = (type) _glXGetProcAddressARB( (const GLubyte*) name);
 #endif
 
 #else
-// used for defining the proc addresses which are initialized below
-#define GET_PROC_ADDRESS(f,type,name)\
-    (f) = (type) eglGetProcAddress(name);
 
 #ifdef _WIN32
     typedef unsigned __int64 uint64_t;
@@ -49,10 +48,21 @@
 #include <GLES3/gl3.h>
 #include <GLES2/gl2ext.h>
 
+// used for defining the proc addresses which are initialized below
+extern decltype(eglGetProcAddress)* _eglGetProcAddress; ///< function pointer for eglGetProcAddress
+#define GET_PROC_ADDRESS(f,type,name)\
+    (f) = (type) _eglGetProcAddress(name);
+
 #endif // GLES
 
 typedef unsigned int GLhandle; ///< Workaround missing def in headers
 
+extern decltype(glFlush)*                      _oglFlush;                           ///< function pointer for glFlush
+extern decltype(glGetString)*                  _oglGetString;                       ///< function pointer for glGetString
+extern decltype(glGetIntegerv)*                _oglGetIntegerv;                     ///< function pointer for glGetIntegerv
+#ifdef _WIN32
+extern decltype(wglGetCurrentContext)*         _wglGetCurrentContext;               ///< function pointer for wglGetCurrentContext
+#endif
 extern PFNGLGETPERFMONITORGROUPSAMDPROC        _oglGetPerfMonitorGroupsAMD;         ///< function pointer for glGetPerfMonitorGroupsAMD
 extern PFNGLGETPERFMONITORCOUNTERSAMDPROC      _oglGetPerfMonitorCountersAMD;       ///< function pointer for glGetPerfMonitorCountersAMD
 extern PFNGLGETPERFMONITORGROUPSTRINGAMDPROC   _oglGetPerfMonitorGroupStringAMD;    ///< function pointer for glGetPerfMonitorGroupStringAMD
diff --git a/Src/GPUPerfAPIGL/ASICInfo.cpp b/Src/GPUPerfAPIGL/ASICInfo.cpp
@@ -269,7 +269,7 @@ bool GetASICInfo(ASICInfo& rASICInfo)
     // Since GL ES didn't exist before version 9551, there's no need to check the
     // version number. For now, it is assumed the version number will be >9551
 
-    const GLubyte* pVersion = glGetString(GL_VERSION);
+    const GLubyte* pVersion = _oglGetString(GL_VERSION);
     int nVersion = extractVersionNumber(pVersion);
 
     std::stringstream message;
diff --git a/Src/GPUPerfAPIGL/GLCounterDataRequest.cpp b/Src/GPUPerfAPIGL/GLCounterDataRequest.cpp
@@ -11,6 +11,7 @@
 #include "GLPerfMonitorCache.h"
 
 #include "../GPUPerfAPI-Common/Logging.h"
+#include "../GPUPerfAPICounterGenerator/GLEntryPoints.h"
 #include <sstream>
 #ifdef _LINUX
     #include <string.h>
@@ -586,12 +587,12 @@ bool GLCounterDataRequest::EndRequest()
         // The effects of the first glFlush() is extremely noticeable with the GLFiveQuarterQuads test and the PostZSamplesPassing counter.
         // The effects of the second glFlush() are noticeable with last draw call of the GLFiveQuarterQuads test and the PreZSamplesPassing counter.
         // The effects of the second glFlush() are also noticeable with last draw call of the GLFiveQuarterQuads test and the CBMemWritten counter.
-        glFlush();
+        _oglFlush();
 
         _oglEndPerfMonitorAMD(m_monitor);
         GPA_LogDebugMessage("glEndPerfMonitorAMD: %u", m_monitor);
 
-        glFlush();
+        _oglFlush();
 
     }
 
diff --git a/Src/GPUPerfAPIGL/GPUPerfAPIGL.cpp b/Src/GPUPerfAPIGL/GPUPerfAPIGL.cpp
@@ -11,6 +11,10 @@
 #include <assert.h>
 #include <sstream>
 
+#ifdef _LINUX
+#include <dlfcn.h>
+#endif
+
 #include "../GPUPerfAPI-Common/GPUPerfAPIImp.h"
 #include "../GPUPerfAPI-Common/GPACustomHWValidationManager.h"
 
@@ -202,6 +206,21 @@ gpa_uint32 GPA_IMP_GetPreferredCheckResultFrequency()
     return 50;
 }
 
+
+#ifndef GLES
+
+#ifdef _WIN32
+decltype(wglGetProcAddress)* _wglGetProcAddress = nullptr;
+#endif
+
+#ifdef _LINUX
+decltype(glXGetProcAddressARB)* _glXGetProcAddressARB = nullptr;
+#endif
+
+#else
+decltype(eglGetProcAddress)* _eglGetProcAddress = nullptr;
+#endif
+
 /// Checks the OpenGL extensions and initializes the various function pointers.  The extensions queried are:
 ///    -- GL_AMD_performance_monitor
 ///    -- GL_ARB_timer_query (OpenGL)
@@ -219,6 +238,77 @@ GPA_Status InitializeGLFunctions()
     bool bDebugOutputExtFound = false;
     bool bMesaQueryRendererExtFound = false;
 
+#ifdef _WIN32
+    HMODULE module = LoadLibraryA("opengl32.dll");
+#else
+    void* module = dlopen("libGL.so", RTLD_LAZY);
+#endif
+
+    if (nullptr == module)
+    {
+        return GPA_STATUS_ERROR_NULL_POINTER;
+    }
+
+#ifndef GLES
+
+#ifdef _WIN32
+    _wglGetCurrentContext = reinterpret_cast<decltype(wglGetCurrentContext)*>(GetProcAddress(module, "wglGetCurrentContext"));
+
+    _wglGetProcAddress = reinterpret_cast<decltype(wglGetProcAddress)*>(GetProcAddress(module, "wglGetProcAddress"));
+
+    if (nullptr == _wglGetProcAddress || nullptr == _wglGetCurrentContext)
+    {
+        return GPA_STATUS_ERROR_NULL_POINTER;
+    }
+#endif
+
+#ifdef _LINUX
+    _glXGetProcAddressARB = reinterpret_cast<decltype(glXGetProcAddressARB)*>(dlsym(module, "glXGetProcAddressARB"));
+
+    if (nullptr == _glXGetProcAddressARB)
+    {
+        return GPA_STATUS_ERROR_NULL_POINTER;
+    }
+#endif
+
+#else // GLES
+
+#ifdef _WIN32
+    _eglGetProcAddress = reinterpret_cast<decltype(eglGetProcAddress)*>(GetProcAddress(module, "eglGetProcAddress"));
+
+    if (nullptr == _eglGetProcAddress)
+    {
+        return GPA_STATUS_ERROR_NULL_POINTER;
+    }
+#endif
+
+#ifdef _LINUX
+    _eglGetProcAddress = reinterpret_cast<decltype(eglGetProcAddress)*>(dlsym(module, "eglGetProcAddress"));
+
+    if (nullptr == _eglGetProcAddress)
+    {
+        return GPA_STATUS_ERROR_NULL_POINTER;
+    }
+#endif
+
+#endif // GLES
+
+#ifdef _WIN32
+    _oglFlush = reinterpret_cast<decltype(glFlush)*>(GetProcAddress(module, "glFlush"));
+    _oglGetString = reinterpret_cast<decltype(glGetString)*>(GetProcAddress(module, "glGetString"));
+    _oglGetIntegerv = reinterpret_cast<decltype(glGetIntegerv)*>(GetProcAddress(module, "glGetIntegerv"));
+#endif
+#ifdef _LINUX
+    _oglFlush = reinterpret_cast<decltype(glFlush)*>(dlsym(module, "glFlush"));
+    _oglGetString = reinterpret_cast<decltype(glGetString)*>(dlsym(module, "glGetString"));
+    _oglGetIntegerv = reinterpret_cast<decltype(glGetIntegerv)*>(dlsym(module, "glGetIntegerv"));
+#endif
+
+    if (nullptr == _oglFlush || nullptr == _oglGetString || nullptr == _oglGetIntegerv )
+    {
+        return GPA_STATUS_ERROR_NULL_POINTER;
+    }
+
     GET_PROC_ADDRESS(_oglGetStringi, PFNGLGETSTRINGIPROC, "glGetStringi");
 
     // if OpenGL 3.x method of getting the extensions is available, use that, otherwise try the old method
@@ -227,7 +317,7 @@ GPA_Status InitializeGLFunctions()
         GPA_LogMessage("Using OpenGL 3.x method to query extensions.");
 
         GLint numExtensions = 0;
-        glGetIntegerv(GL_NUM_EXTENSIONS, &numExtensions);
+        _oglGetIntegerv(GL_NUM_EXTENSIONS, &numExtensions);
 
         for (GLint i = 0; i < numExtensions; i++)
         {
@@ -276,7 +366,7 @@ GPA_Status InitializeGLFunctions()
     else
     {
         GPA_LogMessage("Using OpenGL 1.x method to query extensions.");
-        const GLubyte* pExtensions = glGetString(GL_EXTENSIONS);
+        const GLubyte* pExtensions = _oglGetString(GL_EXTENSIONS);
 
         if (nullptr != pExtensions)
         {
@@ -476,11 +566,11 @@ GPA_Status GPA_IMP_GetHWInfo(void* pContext, GPA_HWInfo* pHwInfo)
         return status;
     }
 
-    const GLubyte* pRenderer = glGetString(GL_RENDERER);
+    const GLubyte* pRenderer = _oglGetString(GL_RENDERER);
     pHwInfo->SetDeviceName(reinterpret_cast<const char*>(pRenderer));
 
     // Handle non-AMD GPU vendors
-    const GLubyte* pVendor = glGetString(GL_VENDOR);
+    const GLubyte* pVendor = _oglGetString(GL_VENDOR);
 
     //TODO: should at least support GPUTime for these vendors then
     if (nullptr != strstr(reinterpret_cast<const char*>(pVendor), pNVIDIARenderer))
@@ -693,7 +783,7 @@ GPA_Status GPA_IMP_CompareHWInfo(void* pContext, GPA_HWInfo* pHwInfo)
         return status;
     }
 
-    const GLubyte* pRenderer = glGetString(GL_RENDERER);
+    const GLubyte* pRenderer = _oglGetString(GL_RENDERER);
 
     const char* deviceName = nullptr;
     pHwInfo->GetDeviceName(deviceName);
@@ -717,7 +807,7 @@ GPA_Status GPA_IMP_CompareHWInfo(void* pContext, GPA_HWInfo* pHwInfo)
         return GPA_STATUS_OK;
     }
 
-    const GLubyte* pVendor = glGetString(GL_VENDOR);
+    const GLubyte* pVendor = _oglGetString(GL_VENDOR);
 
     if (strstr(reinterpret_cast<const char*>(pVendor), pNVIDIARenderer))
     {
diff --git a/Src/GPUPerfAPIGL/makefile b/Src/GPUPerfAPIGL/makefile
@@ -17,7 +17,6 @@ INCLUDES =	-I. \
 		-I$(TSINGLETON_DIR)
 
 LIBS = \
-	-lGL \
 	$(COMMON_LIBS) \
 	$(COMMON_DEVICEINFO_LIB) \
 	$(STANDARD_LIBS)
diff --git a/Src/GPUPerfAPIGLES/makefile b/Src/GPUPerfAPIGLES/makefile
@@ -17,8 +17,6 @@ INCLUDES =	-I. \
 		-I$(TSINGLETON_DIR)
 
 LIBS = \
-	-lGL \
-	-lEGL \
 	$(COMMON_LIBS) \
 	$(COMMON_DEVICEINFO_LIB) \
 	$(STANDARD_LIBS)
