From c43b8ca05c41a64d52f2c505b74c31ce0f7141ee Mon Sep 17 00:00:00 2001
From: "Guan, Zichuan" <Zichuan.Guan@amd.com>
Date: Fri, 27 Jun 2025 09:51:18 -0400
Subject: [PATCH] Fix memory leak in opengl interop (#541)

Signed-off-by: zichguan-amd <zichuan.guan@amd.com>

[ROCm/clr commit: 51508e0befa06980cad3441ad3168ebbfc289717]
---
 projects/clr/rocclr/platform/interop_gl.cpp | 38 +++++++++++----------
 projects/clr/rocclr/platform/interop_gl.hpp |  2 ++
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/projects/clr/rocclr/platform/interop_gl.cpp b/projects/clr/rocclr/platform/interop_gl.cpp
index 7bb285b30f..ba42731236 100644
--- a/projects/clr/rocclr/platform/interop_gl.cpp
+++ b/projects/clr/rocclr/platform/interop_gl.cpp
@@ -51,12 +51,12 @@
 bool amd::ClGlEvent::waitForFence() {
   GLenum ret;
   // get fence id associated with fence event
-  GLsync gs = !command().data().empty() ? reinterpret_cast<GLsync>(command().data().back())
-                                          : nullptr;
+  GLsync gs =
+      !command().data().empty() ? reinterpret_cast<GLsync>(command().data().back()) : nullptr;
   if (!gs) return false;
 
-// Try to use DC and GLRC of current thread, if it doesn't exist
-// create a new GL context on this thread, which is shared with the original context
+  // Try to use DC and GLRC of current thread, if it doesn't exist
+  // create a new GL context on this thread, which is shared with the original context
 
 #ifdef _WIN32
   HDC tempDC_ = context().glenv()->wglGetCurrentDC_();
@@ -149,13 +149,9 @@ amd::GLFunctions::SetIntEnv::~SetIntEnv() {
   env_->getLock().unlock();
 }
 
-amd::GLFunctions::Lock::Lock(GLFunctions* env) : env_(env) {
-    env_->getLock().lock();
-}
+amd::GLFunctions::Lock::Lock(GLFunctions* env) : env_(env) { env_->getLock().lock(); }
 
-amd::GLFunctions::Lock::~Lock() {
-    env_->getLock().unlock();
-}
+amd::GLFunctions::Lock::~Lock() { env_->getLock().unlock(); }
 
 amd::GLFunctions::GLFunctions(HMODULE h, bool isEGL)
     : libHandle_(h),
@@ -188,7 +184,7 @@ amd::GLFunctions::GLFunctions(HMODULE h, bool isEGL)
 #endif  //!_WIN32
 {
 #define VERIFY_POINTER(p)                                                                          \
-  if (nullptr == p) {                                                                                 \
+  if (nullptr == p) {                                                                              \
     missed_++;                                                                                     \
   }
 
@@ -225,6 +221,8 @@ amd::GLFunctions::GLFunctions(HMODULE h, bool isEGL)
       VERIFY_POINTER(XOpenDisplay_)
       XCloseDisplay_ = (PFNXCloseDisplay)GETPROCADDRESS(hXModule, "XCloseDisplay");
       VERIFY_POINTER(XCloseDisplay_)
+      XFree_ = (PFNXFree)GETPROCADDRESS(hXModule, "XFree");
+      VERIFY_POINTER(XFree_)
     } else {
       missed_ += 2;
     }
@@ -296,7 +294,7 @@ bool amd::GLFunctions::update(intptr_t hglrc) {
 
   origCtx_ = (GLXContext)hglrc;
   if (intCtx_ != nullptr) {
-    glXDestroyContext_(Dpy_,intCtx_);
+    glXDestroyContext_(Dpy_, intCtx_);
   }
 
   int attribList[] = {GLX_RGBA, None};
@@ -305,7 +303,10 @@ bool amd::GLFunctions::update(intptr_t hglrc) {
   if (!(vis = glXChooseVisual_(intDpy_, defaultScreen, attribList))) {
     return false;
   }
-  if (!(intCtx_ = glXCreateContext_(intDpy_, vis, origCtx_, true))) {
+  intCtx_ = glXCreateContext_(intDpy_, vis, origCtx_, true);
+  XFree_(vis);
+
+  if (!intCtx_) {
     return false;
   }
 #endif
@@ -389,7 +390,10 @@ bool amd::GLFunctions::init(intptr_t hdc, intptr_t hglrc) {
     if (!(vis = glXChooseVisual_(intDpy_, defaultScreen, attribList))) {
       return false;
     }
-    if (!(intCtx_ = glXCreateContext_(intDpy_, vis, origCtx_, true))) {
+    intCtx_ = glXCreateContext_(intDpy_, vis, origCtx_, true);
+    XFree_(vis);
+
+    if (!intCtx_) {
       return false;
     }
     return true;
@@ -462,13 +466,11 @@ bool amd::GLFunctions::restoreEnv() {
 }
 
 
-
-
-
 //! Function getCLFormatFromGL returns "true" if GL format
 //! is compatible with CL format, "false" otherwise.
 bool amd::getCLFormatFromGL(const amd::Context& amdContext, GLint gliInternalFormat,
-                       cl_image_format* pclImageFormat, int* piBytesPerPixel, cl_mem_flags flags) {
+                            cl_image_format* pclImageFormat, int* piBytesPerPixel,
+                            cl_mem_flags flags) {
   bool bRetVal = false;
 
   /*
diff --git a/projects/clr/rocclr/platform/interop_gl.hpp b/projects/clr/rocclr/platform/interop_gl.hpp
index 0523b9211a..fbf4698f02 100644
--- a/projects/clr/rocclr/platform/interop_gl.hpp
+++ b/projects/clr/rocclr/platform/interop_gl.hpp
@@ -242,6 +242,7 @@ protected:
     // X11 typedef
     typedef Display* (*PFNXOpenDisplay)(_Xconst char* display_name );
     typedef int (*PFNXCloseDisplay)(Display* display );
+    typedef int (*PFNXFree)(void* data );
 
     //glx typedefs
     typedef GLXDrawable (*PFNglXGetCurrentDrawable)();
@@ -335,6 +336,7 @@ public:
     //pointers to X11 functions
     PFNXOpenDisplay XOpenDisplay_;
     PFNXCloseDisplay XCloseDisplay_;
+    PFNXFree XFree_;
 
     //pointers to GLX functions
     PFNglXGetCurrentDrawable glXGetCurrentDrawable_;