commit 77eb21f7d9c6e34e985dfa96152fb8b6c40f9a8a
author Ioan-Cristian Szabo <ioan-cristian.szabo@arm.com> Fri Dec 22 17:32:17 2017 +0000
committer Anthony Barbier <anthony.barbier@arm.com> Fri Nov 02 16:42:33 2018 +0000
tree 0b1cb2c0d7bd38bd2f7eacf41d90ea3a2b758f21
parent 88b8d8c2651ee52467fb9e2029ddc9820d442228

Fix destruction order of singleton objects and resolve hang GLES issue.

Change-Id: I9df42d4255b371b275a74aa521406e6796ee436b
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/113901
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Tested-by: Anthony Barbier <anthony.barbier@arm.com>

arm_compute/core/GLES_COMPUTE/GCKernelLibrary.h

diff --git a/arm_compute/core/GLES_COMPUTE/GCKernelLibrary.h b/arm_compute/core/GLES_COMPUTE/GCKernelLibrary.h
index db2d979..34bd567 100644
--- a/arm_compute/core/GLES_COMPUTE/GCKernelLibrary.h
+++ b/arm_compute/core/GLES_COMPUTE/GCKernelLibrary.h
@@ -191,14 +191,13 @@
 private:
     /** Default Constructor. */
     GCKernelLibrary();
+    ~GCKernelLibrary();
 
 public:
     /** Prevent instances of this class from being copied. */
     GCKernelLibrary(const GCKernelLibrary &) = delete;
     /** Prevent instances of this class from being copied. */
     const GCKernelLibrary &operator=(const GCKernelLibrary &) = delete;
-    /** Default Destructor. */
-    ~GCKernelLibrary();
 
     static GCKernelLibrary &get();
     /** Initialises the kernel library.
@@ -215,13 +214,6 @@
         _display = dpy;
         _context = ctx;
 
-        if(_display == EGL_NO_DISPLAY || _context == EGL_NO_CONTEXT)
-        {
-            setup_context();
-
-            _own_context = true;
-        }
-
         eglMakeCurrent(_display, EGL_NO_SURFACE, EGL_NO_SURFACE, _context);
         setup_dummy_fbo();
     }
@@ -289,15 +281,11 @@
      * @return Concatenated string.
      */
     std::string stringify_set(const StringSet &s) const;
-    /** Set up EGL context.
-     */
-    void setup_context();
 
     EGLDisplay  _display;                                                /**< Underlying EGL Display. */
     EGLContext  _context;                                                /**< Underlying EGL Context. */
     GLuint      _frame_buffer;                                           /**< Dummy fbo */
     GLuint      _tex_rt;                                                 /**< Dummy texture for render target */
-    bool        _own_context;                                            /**< Self created context or not. */
     std::string _shader_path;                                            /**< Path to the shaders folder. */
     mutable std::map<std::string, const GCProgram>  _programs_map;       /**< Map with all already loaded program data. */
     mutable std::map<std::string, const GCKernel>   _built_programs_map; /**< Map with all already built program data. */