X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=framework%2Fegl%2FegluUnique.hpp;h=aa24f5a8107b7a9b8c6b9aa00fac2e5e941d58c6;hb=a0310a03ac007e054664150c26e0506a226c8183;hp=7db218a2163471abdf3c57fb58947f6fdb99fe4e;hpb=8ada207f98ac56547ba4a56a2b3ea9305ce9ca93;p=platform%2Fupstream%2FVK-GL-CTS.git

diff --git a/framework/egl/egluUnique.hpp b/framework/egl/egluUnique.hpp
index 7db218a..aa24f5a 100644
--- a/framework/egl/egluUnique.hpp
+++ b/framework/egl/egluUnique.hpp
@@ -24,75 +24,100 @@
  *//*--------------------------------------------------------------------*/
 
 #include "egluDefs.hpp"
-#include "egluHeaderWrapper.hpp"
-#include "egluExtensions.hpp"
+#include "eglwDefs.hpp"
+
+namespace eglw
+{
+class Library;
+}
 
 namespace eglu
 {
 
+class UniqueDisplay
+{
+public:
+							UniqueDisplay	(const eglw::Library& egl, eglw::EGLDisplay display);
+							~UniqueDisplay	(void);
+
+	eglw::EGLDisplay		operator*		(void) const { return m_display; }
+	operator				bool			(void) const;
+
+private:
+	const eglw::Library&	m_egl;
+	eglw::EGLDisplay		m_display;
+
+	// Disabled
+	UniqueDisplay&			operator=		(const UniqueDisplay&);
+							UniqueDisplay	(const UniqueDisplay&);
+};
+
 class UniqueSurface
 {
 public:
-					UniqueSurface	(EGLDisplay display, EGLSurface surface);
-					~UniqueSurface	(void);
+							UniqueSurface	(const eglw::Library& egl, eglw::EGLDisplay display, eglw::EGLSurface surface);
+							~UniqueSurface	(void);
 
-	EGLSurface		operator*		(void) { return m_surface; }
-	operator		bool			(void) const { return m_surface != EGL_NO_SURFACE; }
+	eglw::EGLSurface		operator*		(void) const { return m_surface; }
+	operator				bool			(void) const;
 
 private:
-	EGLDisplay		m_display;
-	EGLSurface		m_surface;
+	const eglw::Library&	m_egl;
+	eglw::EGLDisplay		m_display;
+	eglw::EGLSurface		m_surface;
 
 	// Disabled
-	UniqueSurface&	operator=		(const UniqueSurface&);
-					UniqueSurface	(const UniqueSurface&);
+	UniqueSurface&			operator=		(const UniqueSurface&);
+							UniqueSurface	(const UniqueSurface&);
 };
 
 class UniqueContext
 {
 public:
-					UniqueContext	(EGLDisplay display, EGLContext context);
-					~UniqueContext	(void);
+							UniqueContext	(const eglw::Library& egl, eglw::EGLDisplay display, eglw::EGLContext context);
+							~UniqueContext	(void);
 
-	EGLContext		operator*		(void) { return m_context; }
-	operator		bool			(void) const { return m_context != EGL_NO_CONTEXT; }
+	eglw::EGLContext		operator*		(void) const { return m_context; }
+	operator				bool			(void) const;
 
 private:
-	EGLDisplay		m_display;
-	EGLContext		m_context;
+	const eglw::Library&	m_egl;
+	eglw::EGLDisplay		m_display;
+	eglw::EGLContext		m_context;
 
 	// Disabled
-	UniqueContext	operator=		(const UniqueContext&);
-					UniqueContext	(const UniqueContext&);
+	UniqueContext			operator=		(const UniqueContext&);
+							UniqueContext	(const UniqueContext&);
 };
 
 class ScopedCurrentContext
 {
 public:
-	ScopedCurrentContext	(EGLDisplay display, EGLSurface draw, EGLSurface read, EGLContext context);
+	ScopedCurrentContext	(const eglw::Library& egl, eglw::EGLDisplay display, eglw::EGLSurface draw, eglw::EGLSurface read, eglw::EGLContext context);
 	~ScopedCurrentContext	(void);
 
 private:
-	EGLDisplay		m_display;
+	const eglw::Library&	m_egl;
+	eglw::EGLDisplay		m_display;
 };
 
 class UniqueImage
 {
 public:
-							UniqueImage		(EGLDisplay display, EGLImageKHR image, const ImageFunctions& funcs);
+							UniqueImage		(const eglw::Library& egl, eglw::EGLDisplay display, eglw::EGLImage image);
 							~UniqueImage	(void);
 
-	EGLImageKHR				operator*		(void) { return m_image; }
-	operator				bool			(void) const { return m_image != EGL_NO_IMAGE_KHR; }
+	eglw::EGLImage			operator*		(void) const { return m_image; }
+	operator				bool			(void) const;
 
 private:
-	EGLDisplay				m_display;
-	EGLImageKHR				m_image;
-	const ImageFunctions&	m_funcs;
+	const eglw::Library&	m_egl;
+	eglw::EGLDisplay		m_display;
+	eglw::EGLImage			m_image;
 
 	// Disabled
-	UniqueImage		operator=		(const UniqueImage&);
-					UniqueImage		(const UniqueImage&);
+	UniqueImage				operator=		(const UniqueImage&);
+							UniqueImage		(const UniqueImage&);
 };
 
 } // eglu