From a95e774f01204210b3deb2930ca41ac4cd80a409 Mon Sep 17 00:00:00 2001 From: foreman Date: Mon, 12 Feb 2018 18:02:35 -0500 Subject: [PATCH] P4 to Git Change 1515374 by skeely@skeely_HSA_linux on 2018/02/12 17:53:32 SWDEV-94389 - Get gl display and context from cl context object. Also report Mesa interop errors in debug log. Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_gl_amd.hpp#20 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#82 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.hpp#25 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocglinterop.cpp#5 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocglinterop.hpp#5 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocmemory.cpp#33 edit --- opencl/api/opencl/amdocl/cl_gl_amd.hpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/opencl/api/opencl/amdocl/cl_gl_amd.hpp b/opencl/api/opencl/amdocl/cl_gl_amd.hpp index 15bc5f8d57..9adeeaaf60 100644 --- a/opencl/api/opencl/amdocl/cl_gl_amd.hpp +++ b/opencl/api/opencl/amdocl/cl_gl_amd.hpp @@ -327,6 +327,9 @@ public: Display* getIntDpy() const {return intDpy_;} GLXDrawable getIntDrawable() const {return intDrawable_;} GLXContext getIntCtx() const {return intCtx_;} + + EGLDisplay getEglDpy() const { return eglDisplay_; } + EGLContext getEglOrigCtx() const { return eglOriginalContext_; } #endif //!_WIN32 // Initialize GL dynamic library and function pointers