isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-13 16:59:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

egl: Consolidates eglx and eglnative into one "egl" winsys

Browse Source 
This remove quite a lot of redundant code by consolidating the eglx and
eglnative window system backends.
This commit is contained in:
Robert Bragg
2010-06-18 04:38:43 +01:00
parent 46bed23302
commit d45ac12628
23 changed files with 79 additions and 1538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
doc/reference/clutter/Makefile.am
View File

@ -51,15 +51,13 @@ HFILE_GLOB=$(top_srcdir)/clutter/*.h \
$(top_srcdir)/clutter/x11/clutter-x11.h \
$(top_srcdir)/clutter/x11/clutter-x11-texture-pixmap.h \
$(top_srcdir)/clutter/glx/clutter-glx-texture-pixmap.h \
$(top_srcdir)/clutter/eglnative/clutter-egl.h \
$(top_srcdir)/clutter/eglx/clutter-eglx.h \
$(top_srcdir)/clutter/egl/clutter-egl.h \
$(top_srcdir)/clutter/win32/clutter-win32.h
CFILE_GLOB=$(top_srcdir)/clutter/*.c \
$(top_srcdir)/clutter/x11/*.c \
$(top_srcdir)/clutter/glx/*.c \
$(top_srcdir)/clutter/win32/*.c \
$(top_srcdir)/clutter/eglnative/*.c \
$(top_srcdir)/clutter/eglx/*.c
$(top_srcdir)/clutter/egl/*.c
# Header files to ignore when scanning.
# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
@ -83,8 +81,7 @@ IGNORE_HFILES=\
clutter-stage-window.h \
clutter-timeout-interval.h \
cogl \
eglnative \
eglx \
egl \
fruity \
glx \
osx \
@ -96,8 +93,7 @@ EXTRA_HFILES=\
$(top_srcdir)/clutter/x11/clutter-x11.h \
$(top_srcdir)/clutter/x11/clutter-x11-texture-pixmap.h \
$(top_srcdir)/clutter/glx/clutter-glx-texture-pixmap.h \
$(top_srcdir)/clutter/eglnative/clutter-egl.h \
$(top_srcdir)/clutter/eglx/clutter-eglx.h \
$(top_srcdir)/clutter/egl/clutter-egl.h \
$(top_srcdir)/clutter/win32/clutter-win32.h
# Images to copy into HTML directory.

3
doc/reference/clutter/clutter-docs.xml.in
View File

@ -205,8 +205,7 @@
<xi:include href="xml/clutter-x11.xml"/>
<xi:include href="xml/clutter-glx.xml"/>
<xi:include href="xml/clutter-win32.xml"/>
<xi:include href="xml/clutter-eglnative.xml"/>
<xi:include href="xml/clutter-eglx.xml"/>
<xi:include href="xml/clutter-egl.xml"/>
</part>
<part id="additionaldocs">

7
doc/reference/clutter/clutter-sections.txt
View File

@ -1823,13 +1823,8 @@ ClutterGLXTexturePixmapPrivate
<SECTION>
<TITLE>EGL Specific Support</TITLE>
<FILE>clutter-eglnative</FILE>
<FILE>clutter-egl</FILE>
clutter_egl_display
</SECTION>
<SECTION>
<TITLE>EGLX Specific Support</TITLE>
<FILE>clutter-eglx</FILE>
clutter_eglx_display
</SECTION>