Merge "Fix GCC 6.3 warnings in aosp/master" am: 1211e9fe1b am: 56ed30da81 am: 2bd761c309

[platform/upstream/VK-GL-CTS.git] / framework / egl / egluGLFunctionLoader.hpp

diff --git a/framework/egl/egluGLFunctionLoader.hpp b/framework/egl/egluGLFunctionLoader.hpp
index 9bab05b..f77b58d 100644 (file)
--- a/framework/egl/egluGLFunctionLoader.hpp
+++ b/framework/egl/egluGLFunctionLoader.hpp
@@ -26,23 +26,57 @@
 #include "tcuDefs.hpp"
 #include "tcuFunctionLibrary.hpp"
 #include "glwFunctionLoader.hpp"
+#include "gluRenderContext.hpp"
+
+namespace tcu
+{
+class CommandLine;
+}
+
+namespace eglw
+{
+class Library;
+}
 
 namespace eglu
 {
 
+class Platform;
+
 class GLFunctionLoader : public glw::FunctionLoader
 {
 public:
-                                                                               GLFunctionLoader        (const tcu::FunctionLibrary* platformLibrary);
+                                                                               GLFunctionLoader        (const eglw::Library& egl, const tcu::FunctionLibrary* platformLibrary);
        glw::GenericFuncType                            get                                     (const char* name) const;
 
 private:
                                                                                GLFunctionLoader        (const GLFunctionLoader&);
        GLFunctionLoader&                                       operator=                       (const GLFunctionLoader&);
 
+       const eglw::Library&                            m_egl;
        const tcu::FunctionLibrary* const       m_library;                      //!< Base platform library for functions. Used if eglGetProcAddress() fails.
 };
 
+class GLLibraryCache
+{
+public:
+                                                               GLLibraryCache          (const Platform& platform, const tcu::CommandLine& cmdLine);
+                                                               ~GLLibraryCache         (void);
+
+       const tcu::FunctionLibrary*     getLibrary                      (glu::ApiType apiType);
+
+private:
+       GLLibraryCache&                         operator=                       (const GLLibraryCache& other);
+                                                               GLLibraryCache          (const GLLibraryCache& other);
+
+       typedef std::map<deUint32, tcu::FunctionLibrary*> LibraryMap;
+
+       const Platform&                         m_platform;
+       const tcu::CommandLine&         m_cmdLine;
+
+       LibraryMap                                      m_libraries;
+};
+
 } // eglu
 
 #endif // _EGLUGLFUNCTIONLOADER_HPP