resolve conflicts

1 files changed, 6 insertions, 1 deletions

diff --git a/src/com/jogamp/opencl/gl/CLGLObject.java b/src/com/jogamp/opencl/gl/CLGLObject.java
index f0081ce5..a9bad53d 100644
--- a/src/com/jogamp/opencl/gl/CLGLObject.java
+++ b/src/com/jogamp/opencl/gl/CLGLObject.java
@@ -38,7 +38,7 @@ import javax.media.opengl.GLContext;
  *
  * @author Michael Bien
  */
-interface CLGLObject {
+public interface CLGLObject {
 
     /**
      * Returns the OpenGL object id of this shared object.
@@ -46,6 +46,11 @@ interface CLGLObject {
     public int getGLObjectID();
 
     /**
+     * Returns the OpenCL object handle
+     */
+    public long getID();
+
+    /**
      * Returns the OpenGL buffer type of this shared object.
      */
     public GLObjectType getGLObjectType();