[cogl/wip/expose-glx-egl-context: 2/3] make cogl-egl.h private



commit b50915cffc17b6546c79eea19a6919a6fef59213
Author: Robert Bragg <robert linux intel com>
Date:   Wed Mar 5 01:59:03 2014 +0000

    make cogl-egl.h private
    
    cogl-egl.h doesn't include any public api. It is only included by
    cogl-winsys-private.h and makes sure any internal references to the
    GLeglImageOES type don't cause a build failure if the GL_OES_EGL_image
    extension isn't defined.

 cogl/Makefile.am                        |    3 +--
 cogl/{cogl-egl.h => cogl-egl-private.h} |   30 +++---------------------------
 cogl/winsys/cogl-winsys-private.h       |    2 +-
 3 files changed, 5 insertions(+), 30 deletions(-)
---
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index 9521b60..ca9e645 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -447,12 +447,11 @@ cogl_sources_c += \
        $(srcdir)/winsys/cogl-winsys-egl-android-private.h
 endif
 if SUPPORT_EGL
-cogl_public_h += \
-       $(srcdir)/cogl-egl.h
 cogl_nodist_experimental_h += \
        $(builddir)/cogl-egl-defines.h
 
 cogl_sources_c += \
+       $(srcdir)/cogl-egl-private.h \
        $(srcdir)/winsys/cogl-winsys-egl.c \
        $(srcdir)/winsys/cogl-winsys-egl-feature-functions.h \
        $(srcdir)/winsys/cogl-winsys-egl-private.h
diff --git a/cogl/cogl-egl.h b/cogl/cogl-egl-private.h
similarity index 67%
rename from cogl/cogl-egl.h
rename to cogl/cogl-egl-private.h
index 5f38bed..c9d905c 100644
--- a/cogl/cogl-egl.h
+++ b/cogl/cogl-egl-private.h
@@ -28,37 +28,13 @@
  *
  */
 
-#ifndef __COGL_EGL_H__
-#define __COGL_EGL_H__
-
-#ifdef COGL_HAS_EGL_SUPPORT
+#ifndef __COGL_EGL_PRIVATE_H__
+#define __COGL_EGL_PRIVATE_H__
 
 #include "cogl-egl-defines.h"
 
-COGL_BEGIN_DECLS
-
 #ifndef GL_OES_EGL_image
 #define GLeglImageOES void *
 #endif
 
-/**
- * cogl_egl_context_get_egl_display:
- * @context: A #CoglContext pointer
- *
- * If you have done a runtime check to determine that Cogl is using
- * EGL internally then this API can be used to retrieve the EGLDisplay
- * handle that was setup internally. The result is undefined if Cogl
- * is not using EGL.
- *
- * Return value: The internally setup EGLDisplay handle.
- * Since: 1.8
- * Stability: unstable
- */
-EGLDisplay
-cogl_egl_context_get_egl_display (CoglContext *context);
-
-COGL_END_DECLS
-
-#endif /* COGL_HAS_EGL_SUPPORT */
-
-#endif
+#endif /* __COGL_EGL_PRIVATE_H__ */
diff --git a/cogl/winsys/cogl-winsys-private.h b/cogl/winsys/cogl-winsys-private.h
index cced193..72dc615 100644
--- a/cogl/winsys/cogl-winsys-private.h
+++ b/cogl/winsys/cogl-winsys-private.h
@@ -45,7 +45,7 @@
 #endif
 
 #ifdef COGL_HAS_EGL_SUPPORT
-#include "cogl-egl.h"
+#include "cogl-egl-private.h"
 #endif
 
 #include "cogl-poll.h"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]