Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
|
|
|
include $(top_srcdir)/build/autotools/Makefile.am.silent
|
|
|
|
|
2010-09-13 10:30:30 +00:00
|
|
|
# preamble
|
|
|
|
|
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
|
|
|
NULL =
|
|
|
|
|
2010-09-13 10:30:30 +00:00
|
|
|
SUBDIRS =
|
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
|
|
|
|
2009-11-18 17:35:07 +00:00
|
|
|
BUILT_SOURCES =
|
2010-09-12 18:25:47 +00:00
|
|
|
|
2009-11-18 17:35:07 +00:00
|
|
|
EXTRA_DIST =
|
2009-10-23 11:15:25 +00:00
|
|
|
CLEANFILES =
|
|
|
|
DISTCLEANFILES =
|
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
|
|
|
|
2010-09-12 18:25:47 +00:00
|
|
|
noinst_LTLIBRARIES =
|
2011-02-10 02:32:11 +00:00
|
|
|
lib_LTLIBRARIES =
|
2010-09-12 18:25:47 +00:00
|
|
|
|
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
|
|
|
INCLUDES = \
|
2009-10-23 11:15:25 +00:00
|
|
|
-I$(top_srcdir) \
|
2011-02-10 02:32:11 +00:00
|
|
|
-I$(top_builddir) \
|
2010-09-13 10:31:46 +00:00
|
|
|
-I$(srcdir)/tesselator \
|
2009-10-23 11:15:25 +00:00
|
|
|
-I$(srcdir)/winsys \
|
|
|
|
-I$(srcdir)/driver/$(COGL_DRIVER) \
|
2011-02-10 02:32:11 +00:00
|
|
|
$(NULL)
|
|
|
|
|
2010-01-13 15:40:36 +00:00
|
|
|
AM_CPPFLAGS = \
|
2011-02-10 02:32:11 +00:00
|
|
|
-DG_DISABLE_SINGLE_INCLUDES \
|
|
|
|
-DG_DISABLE_DEPRECATED \
|
|
|
|
-DG_LOG_DOMAIN=\"Cogl\" \
|
|
|
|
-DCLUTTER_COMPILATION \
|
2010-01-13 15:40:36 +00:00
|
|
|
$(NULL)
|
|
|
|
|
2011-02-10 02:32:11 +00:00
|
|
|
AM_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
|
2010-01-13 15:40:36 +00:00
|
|
|
|
2009-11-18 17:35:07 +00:00
|
|
|
BUILT_SOURCES += cogl-defines.h
|
|
|
|
DISTCLEANFILES += cogl-defines.h
|
2010-06-23 16:29:08 +00:00
|
|
|
EXTRA_DIST += cogl-defines.h.in
|
|
|
|
|
2011-02-10 02:32:11 +00:00
|
|
|
# Note: The cogl-1.0/cogl-gl-1.0 files are essentially for
|
|
|
|
# compatability only. I'm not really sure who could possibly be using
|
|
|
|
# them so we may decide to remove them entirely at some point.
|
2010-09-13 10:30:30 +00:00
|
|
|
pc_files = \
|
2011-02-10 02:32:11 +00:00
|
|
|
cogl-1.0.pc \
|
|
|
|
cogl-gl-1.0.pc
|
2010-09-13 10:30:30 +00:00
|
|
|
|
2011-06-10 17:47:12 +00:00
|
|
|
pc_files += cogl-$(COGL_API_VERSION)-experimental.pc
|
2011-02-10 02:32:11 +00:00
|
|
|
|
|
|
|
cogl-gl-1.0.pc: cogl-1.0.pc
|
2010-09-13 10:30:30 +00:00
|
|
|
$(QUIET_GEN)cp -f $< $(@F)
|
|
|
|
|
|
|
|
pkgconfigdir = $(libdir)/pkgconfig
|
|
|
|
pkgconfig_DATA = $(pc_files)
|
|
|
|
|
2011-06-13 11:42:25 +00:00
|
|
|
EXTRA_DIST += cogl-1.0.pc.in cogl-$(COGL_API_VERSION)-experimental.pc.in
|
2010-09-13 10:30:30 +00:00
|
|
|
DISTCLEANFILES += $(pc_files)
|
|
|
|
|
2009-10-23 11:15:25 +00:00
|
|
|
# public headers
|
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
|
|
|
cogl_public_h = \
|
2010-06-03 10:33:54 +00:00
|
|
|
$(srcdir)/cogl-object.h \
|
2009-10-23 11:15:25 +00:00
|
|
|
$(srcdir)/cogl-bitmap.h \
|
2010-01-10 17:28:24 +00:00
|
|
|
$(srcdir)/cogl-buffer.h \
|
2009-10-23 11:15:25 +00:00
|
|
|
$(srcdir)/cogl-color.h \
|
|
|
|
$(srcdir)/cogl-fixed.h \
|
2011-04-14 17:12:03 +00:00
|
|
|
$(srcdir)/cogl-depth-state.h \
|
2010-10-27 17:54:57 +00:00
|
|
|
$(srcdir)/cogl-material-compat.h \
|
|
|
|
$(srcdir)/cogl-pipeline.h \
|
2010-05-20 13:54:44 +00:00
|
|
|
$(srcdir)/cogl-vector.h \
|
2010-02-25 01:40:29 +00:00
|
|
|
$(srcdir)/cogl-euler.h \
|
2010-02-25 01:40:29 +00:00
|
|
|
$(srcdir)/cogl-quaternion.h \
|
2009-10-23 11:15:25 +00:00
|
|
|
$(srcdir)/cogl-matrix.h \
|
|
|
|
$(srcdir)/cogl-offscreen.h \
|
2010-02-10 22:30:37 +00:00
|
|
|
$(srcdir)/cogl-primitives.h \
|
2009-10-23 11:15:25 +00:00
|
|
|
$(srcdir)/cogl-path.h \
|
2011-03-02 15:19:57 +00:00
|
|
|
$(srcdir)/cogl-pixel-buffer.h \
|
2009-10-23 11:15:25 +00:00
|
|
|
$(srcdir)/cogl-shader.h \
|
|
|
|
$(srcdir)/cogl-texture.h \
|
2010-07-01 21:04:59 +00:00
|
|
|
$(srcdir)/cogl-texture-3d.h \
|
2011-05-16 23:05:54 +00:00
|
|
|
$(srcdir)/cogl-texture-2d.h \
|
2009-10-23 11:15:25 +00:00
|
|
|
$(srcdir)/cogl-types.h \
|
|
|
|
$(srcdir)/cogl-vertex-buffer.h \
|
2011-03-02 23:31:19 +00:00
|
|
|
$(srcdir)/cogl-index-buffer.h \
|
2011-03-02 15:01:41 +00:00
|
|
|
$(srcdir)/cogl-attribute-buffer.h \
|
2010-10-12 11:48:58 +00:00
|
|
|
$(srcdir)/cogl-indices.h \
|
2011-01-20 19:31:53 +00:00
|
|
|
$(srcdir)/cogl-attribute.h \
|
2010-10-12 11:54:07 +00:00
|
|
|
$(srcdir)/cogl-primitive.h \
|
2011-03-02 17:45:25 +00:00
|
|
|
$(srcdir)/cogl-clip-state.h \
|
2010-11-05 12:28:33 +00:00
|
|
|
$(srcdir)/cogl-framebuffer.h \
|
2011-02-22 18:25:29 +00:00
|
|
|
$(srcdir)/cogl-clutter.h \
|
2009-11-18 17:35:07 +00:00
|
|
|
$(srcdir)/cogl.h \
|
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
|
|
|
$(NULL)
|
|
|
|
|
2010-11-04 00:27:47 +00:00
|
|
|
cogl_experimental_h = \
|
Adds renderer,display,onscreen-template and swap-chain stubs
As part of the process of splitting Cogl out as a standalone graphics
API we need to introduce some API concepts that will allow us to
initialize a new CoglContext when Clutter isn't there to handle that for
us...
The new objects roughly in the order that they are (optionally) involved
in constructing a context are: CoglRenderer, CoglOnscreenTemplate,
CoglSwapChain and CoglDisplay.
Conceptually a CoglRenderer represents a means for rendering. Cogl
supports rendering via OpenGL or OpenGL ES 1/2.0 and those APIs are
accessed through a number of different windowing APIs such as GLX, EGL,
SDL or WGL and more. Potentially in the future Cogl could render using
D3D or even by using libdrm and directly banging the hardware. All these
choices are wrapped up in the configuration of a CoglRenderer.
Conceptually a CoglDisplay represents a display pipeline for a renderer.
Although Cogl doesn't aim to provide a detailed abstraction of display
hardware, on some platforms we can give control over multiple display
planes (On TV platforms for instance video content may be on one plane
and 3D would be on another so a CoglDisplay lets you select the plane
up-front.)
Another aspect of CoglDisplay is that it lets us negotiate a display
pipeline that best supports the type of CoglOnscreen framebuffers we are
planning to create. For instance if you want transparent CoglOnscreen
framebuffers then we have to be sure the display pipeline wont discard
the alpha component of your framebuffers. Or if you want to use
double/tripple buffering that requires support from the display
pipeline.
CoglOnscreenTemplate and CoglSwapChain are how we describe our default
CoglOnscreen framebuffer configuration which can affect the
configuration of the display pipeline.
The default/simple way we expect most CoglContexts to be constructed
will be via something like:
if (!cogl_context_new (NULL, &error))
g_error ("Failed to construct a CoglContext: %s", error->message);
Where that NULL is for an optional "display" parameter and NULL says to
Cogl "please just try to do something sensible".
If you want some more control though you can manually construct a
CoglDisplay something like:
display = cogl_display_new (NULL, NULL);
cogl_gdl_display_set_plane (display, plane);
if (!cogl_display_setup (display, &error))
g_error ("Failed to setup a CoglDisplay: %s", error->message);
And in a similar fashion to cogl_context_new() you can optionally pass
a NULL "renderer" and/or a NULL "onscreen template" so Cogl will try to
just do something sensible.
If you need to change the CoglOnscreen defaults you can provide a
template something like:
chain = cogl_swap_chain_new ();
cogl_swap_chain_set_has_alpha (chain, TRUE);
cogl_swap_chain_set_length (chain, 3);
onscreen_template = cogl_onscreen_template_new (chain);
cogl_onscreen_template_set_pixel_format (onscreen_template,
COGL_PIXEL_FORMAT_RGB565);
display = cogl_display_new (NULL, onscreen_template);
if (!cogl_display_setup (display, &error))
g_error ("Failed to setup a CoglDisplay: %s", error->message);
2011-02-25 17:06:50 +00:00
|
|
|
$(srcdir)/cogl-renderer.h \
|
|
|
|
$(srcdir)/cogl-swap-chain.h \
|
|
|
|
$(srcdir)/cogl-onscreen-template.h \
|
|
|
|
$(srcdir)/cogl-display.h \
|
2010-11-05 00:00:25 +00:00
|
|
|
$(srcdir)/cogl-context.h \
|
2010-11-04 00:27:47 +00:00
|
|
|
$(srcdir)/cogl2-path.h \
|
2011-03-02 17:45:25 +00:00
|
|
|
$(srcdir)/cogl2-clip-state.h \
|
2010-11-04 00:27:47 +00:00
|
|
|
$(NULL)
|
|
|
|
|
2010-09-13 10:30:30 +00:00
|
|
|
# driver sources
|
|
|
|
cogl_driver_sources =
|
|
|
|
|
|
|
|
if COGL_DRIVER_GL
|
|
|
|
cogl_driver_sources += \
|
|
|
|
$(srcdir)/driver/gl/cogl-gl.c \
|
|
|
|
$(srcdir)/driver/gl/cogl-texture-driver-gl.c \
|
2011-05-06 16:10:42 +00:00
|
|
|
$(srcdir)/driver/gl/cogl-context-driver-gl.h \
|
2010-09-13 10:30:30 +00:00
|
|
|
$(NULL)
|
|
|
|
endif
|
|
|
|
|
|
|
|
if COGL_DRIVER_GLES
|
|
|
|
cogl_driver_sources += \
|
|
|
|
$(srcdir)/driver/gles/cogl-gles.c \
|
|
|
|
$(srcdir)/driver/gles/cogl-texture-driver-gles.c \
|
2011-05-06 16:10:42 +00:00
|
|
|
$(srcdir)/driver/gles/cogl-context-driver-gles.h \
|
2010-09-13 10:30:30 +00:00
|
|
|
$(NULL)
|
|
|
|
|
2010-10-04 07:57:29 +00:00
|
|
|
endif # COGL_DRIVER_GLES
|
2010-09-13 10:30:30 +00:00
|
|
|
|
2010-09-12 18:25:47 +00:00
|
|
|
# winsys sources, common to all backends
|
|
|
|
cogl_winsys_common_sources = \
|
2010-11-05 12:28:33 +00:00
|
|
|
$(srcdir)/winsys/cogl-winsys-private.h \
|
|
|
|
$(srcdir)/winsys/cogl-winsys.c \
|
2010-09-12 18:25:47 +00:00
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
# tesselator sources
|
|
|
|
cogl_tesselator_sources = \
|
|
|
|
$(srcdir)/tesselator/dict-list.h \
|
|
|
|
$(srcdir)/tesselator/dict.c \
|
|
|
|
$(srcdir)/tesselator/dict.h \
|
|
|
|
$(srcdir)/tesselator/geom.c \
|
|
|
|
$(srcdir)/tesselator/geom.h \
|
|
|
|
$(srcdir)/tesselator/gluos.h \
|
|
|
|
$(srcdir)/tesselator/memalloc.h \
|
|
|
|
$(srcdir)/tesselator/mesh.c \
|
|
|
|
$(srcdir)/tesselator/mesh.h \
|
|
|
|
$(srcdir)/tesselator/normal.c \
|
|
|
|
$(srcdir)/tesselator/normal.h \
|
|
|
|
$(srcdir)/tesselator/priorityq-heap.h \
|
|
|
|
$(srcdir)/tesselator/priorityq-sort.h \
|
|
|
|
$(srcdir)/tesselator/priorityq.c \
|
|
|
|
$(srcdir)/tesselator/priorityq.h \
|
|
|
|
$(srcdir)/tesselator/render.c \
|
|
|
|
$(srcdir)/tesselator/render.h \
|
|
|
|
$(srcdir)/tesselator/sweep.c \
|
|
|
|
$(srcdir)/tesselator/sweep.h \
|
|
|
|
$(srcdir)/tesselator/tess.c \
|
|
|
|
$(srcdir)/tesselator/tess.h \
|
|
|
|
$(srcdir)/tesselator/tesselator.h \
|
|
|
|
$(srcdir)/tesselator/tessmono.c \
|
|
|
|
$(srcdir)/tesselator/tessmono.h \
|
|
|
|
$(srcdir)/tesselator/GL/glu.h \
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
EXTRA_DIST += \
|
2010-09-13 10:30:30 +00:00
|
|
|
$(srcdir)/tesselator/README \
|
|
|
|
$(srcdir)/tesselator/priorityq-heap.c \
|
|
|
|
$(NULL)
|
2010-09-12 18:25:47 +00:00
|
|
|
|
|
|
|
# sources
|
2010-01-13 15:40:36 +00:00
|
|
|
cogl_sources_c = \
|
2010-09-13 10:30:30 +00:00
|
|
|
$(cogl_driver_sources) \
|
2010-09-12 18:25:47 +00:00
|
|
|
$(cogl_winsys_common_sources) \
|
|
|
|
$(cogl_tesselator_sources) \
|
2010-11-02 17:15:06 +00:00
|
|
|
$(srcdir)/cogl-private.h \
|
2010-07-25 20:36:41 +00:00
|
|
|
$(srcdir)/cogl-debug.h \
|
2010-09-15 14:56:42 +00:00
|
|
|
$(srcdir)/cogl-debug-options.h \
|
2009-10-23 11:15:25 +00:00
|
|
|
$(srcdir)/cogl-handle.h \
|
2010-11-04 22:25:52 +00:00
|
|
|
$(srcdir)/cogl-context-private.h \
|
2009-10-23 11:15:25 +00:00
|
|
|
$(srcdir)/cogl-context.c \
|
Adds renderer,display,onscreen-template and swap-chain stubs
As part of the process of splitting Cogl out as a standalone graphics
API we need to introduce some API concepts that will allow us to
initialize a new CoglContext when Clutter isn't there to handle that for
us...
The new objects roughly in the order that they are (optionally) involved
in constructing a context are: CoglRenderer, CoglOnscreenTemplate,
CoglSwapChain and CoglDisplay.
Conceptually a CoglRenderer represents a means for rendering. Cogl
supports rendering via OpenGL or OpenGL ES 1/2.0 and those APIs are
accessed through a number of different windowing APIs such as GLX, EGL,
SDL or WGL and more. Potentially in the future Cogl could render using
D3D or even by using libdrm and directly banging the hardware. All these
choices are wrapped up in the configuration of a CoglRenderer.
Conceptually a CoglDisplay represents a display pipeline for a renderer.
Although Cogl doesn't aim to provide a detailed abstraction of display
hardware, on some platforms we can give control over multiple display
planes (On TV platforms for instance video content may be on one plane
and 3D would be on another so a CoglDisplay lets you select the plane
up-front.)
Another aspect of CoglDisplay is that it lets us negotiate a display
pipeline that best supports the type of CoglOnscreen framebuffers we are
planning to create. For instance if you want transparent CoglOnscreen
framebuffers then we have to be sure the display pipeline wont discard
the alpha component of your framebuffers. Or if you want to use
double/tripple buffering that requires support from the display
pipeline.
CoglOnscreenTemplate and CoglSwapChain are how we describe our default
CoglOnscreen framebuffer configuration which can affect the
configuration of the display pipeline.
The default/simple way we expect most CoglContexts to be constructed
will be via something like:
if (!cogl_context_new (NULL, &error))
g_error ("Failed to construct a CoglContext: %s", error->message);
Where that NULL is for an optional "display" parameter and NULL says to
Cogl "please just try to do something sensible".
If you want some more control though you can manually construct a
CoglDisplay something like:
display = cogl_display_new (NULL, NULL);
cogl_gdl_display_set_plane (display, plane);
if (!cogl_display_setup (display, &error))
g_error ("Failed to setup a CoglDisplay: %s", error->message);
And in a similar fashion to cogl_context_new() you can optionally pass
a NULL "renderer" and/or a NULL "onscreen template" so Cogl will try to
just do something sensible.
If you need to change the CoglOnscreen defaults you can provide a
template something like:
chain = cogl_swap_chain_new ();
cogl_swap_chain_set_has_alpha (chain, TRUE);
cogl_swap_chain_set_length (chain, 3);
onscreen_template = cogl_onscreen_template_new (chain);
cogl_onscreen_template_set_pixel_format (onscreen_template,
COGL_PIXEL_FORMAT_RGB565);
display = cogl_display_new (NULL, onscreen_template);
if (!cogl_display_setup (display, &error))
g_error ("Failed to setup a CoglDisplay: %s", error->message);
2011-02-25 17:06:50 +00:00
|
|
|
$(srcdir)/cogl-renderer-private.h \
|
|
|
|
$(srcdir)/cogl-renderer.h \
|
|
|
|
$(srcdir)/cogl-renderer.c \
|
|
|
|
$(srcdir)/cogl-swap-chain-private.h \
|
|
|
|
$(srcdir)/cogl-swap-chain.h \
|
|
|
|
$(srcdir)/cogl-swap-chain.c \
|
|
|
|
$(srcdir)/cogl-onscreen-template-private.h \
|
|
|
|
$(srcdir)/cogl-onscreen-template.h \
|
|
|
|
$(srcdir)/cogl-onscreen-template.c \
|
|
|
|
$(srcdir)/cogl-display-private.h \
|
|
|
|
$(srcdir)/cogl-display.h \
|
|
|
|
$(srcdir)/cogl-display.c \
|
2009-10-23 11:15:25 +00:00
|
|
|
$(srcdir)/cogl-internal.h \
|
|
|
|
$(srcdir)/cogl.c \
|
2010-05-27 21:24:56 +00:00
|
|
|
$(srcdir)/cogl-object-private.h \
|
|
|
|
$(srcdir)/cogl-object.h \
|
|
|
|
$(srcdir)/cogl-object.c \
|
2009-10-23 11:15:25 +00:00
|
|
|
$(srcdir)/cogl-util.h \
|
|
|
|
$(srcdir)/cogl-util.c \
|
|
|
|
$(srcdir)/cogl-bitmap-private.h \
|
|
|
|
$(srcdir)/cogl-bitmap.c \
|
|
|
|
$(srcdir)/cogl-bitmap-fallback.c \
|
2010-11-02 17:15:06 +00:00
|
|
|
$(srcdir)/cogl-primitives-private.h \
|
2009-10-23 11:15:25 +00:00
|
|
|
$(srcdir)/cogl-primitives.h \
|
|
|
|
$(srcdir)/cogl-primitives.c \
|
2010-11-19 18:29:43 +00:00
|
|
|
$(srcdir)/cogl-path-private.h \
|
2010-02-10 22:30:37 +00:00
|
|
|
$(srcdir)/cogl-path.h \
|
|
|
|
$(srcdir)/cogl-path.c \
|
2010-11-04 00:27:47 +00:00
|
|
|
$(srcdir)/cogl2-path.h \
|
|
|
|
$(srcdir)/cogl2-path.c \
|
2009-10-23 11:15:25 +00:00
|
|
|
$(srcdir)/cogl-bitmap-pixbuf.c \
|
|
|
|
$(srcdir)/cogl-clip-stack.h \
|
|
|
|
$(srcdir)/cogl-clip-stack.c \
|
2011-03-02 17:45:25 +00:00
|
|
|
$(srcdir)/cogl-clip-state-private.h \
|
|
|
|
$(srcdir)/cogl-clip-state.h \
|
|
|
|
$(srcdir)/cogl-clip-state.c \
|
|
|
|
$(srcdir)/cogl2-clip-state.h \
|
|
|
|
$(srcdir)/cogl2-clip-state.c \
|
2011-07-06 17:59:20 +00:00
|
|
|
$(srcdir)/cogl-ext-functions.h \
|
2009-11-17 13:52:40 +00:00
|
|
|
$(srcdir)/cogl-feature-private.h \
|
|
|
|
$(srcdir)/cogl-feature-private.c \
|
2009-10-23 11:15:25 +00:00
|
|
|
$(srcdir)/cogl-fixed.c \
|
2010-06-15 21:36:19 +00:00
|
|
|
$(srcdir)/cogl-color-private.h \
|
2009-10-23 11:15:25 +00:00
|
|
|
$(srcdir)/cogl-color.c \
|
2010-01-10 17:28:24 +00:00
|
|
|
$(srcdir)/cogl-buffer-private.h \
|
|
|
|
$(srcdir)/cogl-buffer.c \
|
2011-03-02 15:19:57 +00:00
|
|
|
$(srcdir)/cogl-pixel-buffer-private.h \
|
|
|
|
$(srcdir)/cogl-pixel-buffer.c \
|
2009-10-23 11:15:25 +00:00
|
|
|
$(srcdir)/cogl-vertex-buffer-private.h \
|
|
|
|
$(srcdir)/cogl-vertex-buffer.c \
|
2011-03-02 23:31:19 +00:00
|
|
|
$(srcdir)/cogl-index-buffer-private.h \
|
|
|
|
$(srcdir)/cogl-index-buffer.c \
|
2011-03-02 15:01:41 +00:00
|
|
|
$(srcdir)/cogl-attribute-buffer-private.h \
|
|
|
|
$(srcdir)/cogl-attribute-buffer.c \
|
2010-10-12 11:48:58 +00:00
|
|
|
$(srcdir)/cogl-indices-private.h \
|
|
|
|
$(srcdir)/cogl-indices.c \
|
2011-01-20 19:31:53 +00:00
|
|
|
$(srcdir)/cogl-attribute-private.h \
|
|
|
|
$(srcdir)/cogl-attribute.c \
|
2010-10-12 11:54:07 +00:00
|
|
|
$(srcdir)/cogl-primitive-private.h \
|
|
|
|
$(srcdir)/cogl-primitive.c \
|
2009-10-23 11:15:25 +00:00
|
|
|
$(srcdir)/cogl-matrix.c \
|
2010-05-20 13:54:44 +00:00
|
|
|
$(srcdir)/cogl-vector.c \
|
2010-02-25 01:40:29 +00:00
|
|
|
$(srcdir)/cogl-euler.c \
|
2011-06-13 11:42:25 +00:00
|
|
|
$(srcdir)/cogl-quaternion-private.h \
|
2010-02-25 01:40:29 +00:00
|
|
|
$(srcdir)/cogl-quaternion.c \
|
2009-11-18 14:37:43 +00:00
|
|
|
$(srcdir)/cogl-matrix-private.h \
|
2009-10-23 11:15:25 +00:00
|
|
|
$(srcdir)/cogl-matrix-stack.c \
|
|
|
|
$(srcdir)/cogl-matrix-stack.h \
|
2011-04-14 17:12:03 +00:00
|
|
|
$(srcdir)/cogl-depth-state.c \
|
|
|
|
$(srcdir)/cogl-depth-state-private.h \
|
2010-10-27 17:54:57 +00:00
|
|
|
$(srcdir)/cogl-pipeline.c \
|
|
|
|
$(srcdir)/cogl-pipeline-private.h \
|
|
|
|
$(srcdir)/cogl-pipeline-opengl.c \
|
|
|
|
$(srcdir)/cogl-pipeline-opengl-private.h \
|
2010-11-29 16:56:41 +00:00
|
|
|
$(srcdir)/cogl-pipeline-fragend-glsl.c \
|
|
|
|
$(srcdir)/cogl-pipeline-fragend-glsl-private.h \
|
|
|
|
$(srcdir)/cogl-pipeline-fragend-arbfp.c \
|
|
|
|
$(srcdir)/cogl-pipeline-fragend-arbfp-private.h \
|
|
|
|
$(srcdir)/cogl-pipeline-fragend-fixed.c \
|
|
|
|
$(srcdir)/cogl-pipeline-fragend-fixed-private.h \
|
2010-12-02 20:48:45 +00:00
|
|
|
$(srcdir)/cogl-pipeline-vertend-glsl.c \
|
|
|
|
$(srcdir)/cogl-pipeline-vertend-glsl-private.h \
|
2010-11-29 18:32:21 +00:00
|
|
|
$(srcdir)/cogl-pipeline-vertend-fixed.c \
|
|
|
|
$(srcdir)/cogl-pipeline-vertend-fixed-private.h \
|
2010-12-02 14:00:46 +00:00
|
|
|
$(srcdir)/cogl-pipeline-progend-glsl.c \
|
|
|
|
$(srcdir)/cogl-pipeline-progend-glsl-private.h \
|
2010-10-27 17:54:57 +00:00
|
|
|
$(srcdir)/cogl-material-compat.c \
|
2010-10-15 17:00:29 +00:00
|
|
|
$(srcdir)/cogl-program.c \
|
|
|
|
$(srcdir)/cogl-program-private.h \
|
2009-10-23 11:15:25 +00:00
|
|
|
$(srcdir)/cogl-blend-string.c \
|
|
|
|
$(srcdir)/cogl-blend-string.h \
|
|
|
|
$(srcdir)/cogl-debug.c \
|
2009-11-27 16:39:16 +00:00
|
|
|
$(srcdir)/cogl-sub-texture-private.h \
|
2009-10-23 11:15:25 +00:00
|
|
|
$(srcdir)/cogl-texture-private.h \
|
2009-11-27 18:45:36 +00:00
|
|
|
$(srcdir)/cogl-texture-2d-private.h \
|
2009-10-23 11:15:25 +00:00
|
|
|
$(srcdir)/cogl-texture-2d-sliced-private.h \
|
2010-07-01 21:04:59 +00:00
|
|
|
$(srcdir)/cogl-texture-3d-private.h \
|
2009-10-23 11:15:25 +00:00
|
|
|
$(srcdir)/cogl-texture-driver.h \
|
2009-11-27 16:39:16 +00:00
|
|
|
$(srcdir)/cogl-sub-texture.c \
|
2009-10-23 11:15:25 +00:00
|
|
|
$(srcdir)/cogl-texture.c \
|
2009-11-27 18:45:36 +00:00
|
|
|
$(srcdir)/cogl-texture-2d.c \
|
2009-10-23 11:15:25 +00:00
|
|
|
$(srcdir)/cogl-texture-2d-sliced.c \
|
2010-07-01 21:04:59 +00:00
|
|
|
$(srcdir)/cogl-texture-3d.c \
|
2010-06-10 14:33:34 +00:00
|
|
|
$(srcdir)/cogl-texture-rectangle-private.h \
|
|
|
|
$(srcdir)/cogl-texture-rectangle.c \
|
2010-08-02 14:24:03 +00:00
|
|
|
$(srcdir)/cogl-rectangle-map.h \
|
|
|
|
$(srcdir)/cogl-rectangle-map.c \
|
2010-08-02 15:29:10 +00:00
|
|
|
$(srcdir)/cogl-atlas.h \
|
|
|
|
$(srcdir)/cogl-atlas.c \
|
2009-12-04 13:06:32 +00:00
|
|
|
$(srcdir)/cogl-atlas-texture-private.h \
|
|
|
|
$(srcdir)/cogl-atlas-texture.c \
|
2011-01-20 17:45:47 +00:00
|
|
|
$(srcdir)/cogl-blit.h \
|
|
|
|
$(srcdir)/cogl-blit.c \
|
2009-10-23 11:15:25 +00:00
|
|
|
$(srcdir)/cogl-spans.h \
|
|
|
|
$(srcdir)/cogl-spans.c \
|
|
|
|
$(srcdir)/cogl-journal-private.h \
|
|
|
|
$(srcdir)/cogl-journal.c \
|
2009-11-26 19:06:35 +00:00
|
|
|
$(srcdir)/cogl-framebuffer-private.h \
|
|
|
|
$(srcdir)/cogl-framebuffer.c \
|
2009-07-03 15:22:35 +00:00
|
|
|
$(srcdir)/cogl-profile.h \
|
|
|
|
$(srcdir)/cogl-profile.c \
|
2011-04-15 14:39:14 +00:00
|
|
|
$(srcdir)/cogl-flags.h \
|
2010-05-20 16:31:42 +00:00
|
|
|
$(srcdir)/cogl-bitmask.h \
|
|
|
|
$(srcdir)/cogl-bitmask.c \
|
2010-11-20 10:46:57 +00:00
|
|
|
$(srcdir)/cogl-shader-boilerplate.h \
|
2010-08-02 20:40:55 +00:00
|
|
|
$(srcdir)/cogl-shader-private.h \
|
|
|
|
$(srcdir)/cogl-shader.c \
|
2010-11-29 21:42:06 +00:00
|
|
|
$(srcdir)/cogl-gtype-private.h \
|
2011-02-22 18:25:29 +00:00
|
|
|
$(srcdir)/cogl-point-in-poly-private.h \
|
|
|
|
$(srcdir)/cogl-point-in-poly.c \
|
|
|
|
$(srcdir)/cogl-clutter.c \
|
2011-06-13 11:42:25 +00:00
|
|
|
$(srcdir)/winsys/cogl-winsys-stub-private.h \
|
2011-06-13 15:11:31 +00:00
|
|
|
$(srcdir)/cogl-queue.h \
|
2011-05-17 14:00:38 +00:00
|
|
|
$(srcdir)/winsys/cogl-winsys-stub.c \
|
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
|
|
|
$(NULL)
|
|
|
|
|
2010-05-19 15:13:07 +00:00
|
|
|
if SUPPORT_XLIB
|
2011-06-28 13:16:24 +00:00
|
|
|
cogl_public_h += \
|
|
|
|
$(srcdir)/cogl-xlib-renderer.h
|
|
|
|
|
2010-11-04 00:27:47 +00:00
|
|
|
cogl_experimental_h += \
|
2010-11-05 12:28:33 +00:00
|
|
|
$(srcdir)/winsys/cogl-texture-pixmap-x11.h \
|
|
|
|
$(srcdir)/cogl-xlib.h
|
2010-05-25 17:56:14 +00:00
|
|
|
|
2010-09-13 10:30:30 +00:00
|
|
|
cogl_sources_c += \
|
2011-06-28 13:16:24 +00:00
|
|
|
$(srcdir)/cogl-x11-renderer-private.h \
|
|
|
|
$(srcdir)/cogl-xlib-renderer-private.h \
|
|
|
|
$(srcdir)/cogl-xlib-renderer.c \
|
|
|
|
$(srcdir)/cogl-xlib-display-private.h \
|
2010-11-05 12:28:33 +00:00
|
|
|
$(srcdir)/cogl-xlib.c \
|
2011-05-06 16:10:42 +00:00
|
|
|
$(srcdir)/cogl-xlib-private.h \
|
2010-11-05 12:28:33 +00:00
|
|
|
$(srcdir)/winsys/cogl-texture-pixmap-x11.c \
|
|
|
|
$(srcdir)/winsys/cogl-texture-pixmap-x11-private.h
|
2009-10-08 11:08:21 +00:00
|
|
|
endif
|
2010-05-19 15:13:07 +00:00
|
|
|
if SUPPORT_GLX
|
2010-09-13 10:30:30 +00:00
|
|
|
cogl_sources_c += \
|
2011-06-28 13:16:24 +00:00
|
|
|
$(srcdir)/cogl-glx-renderer-private.h \
|
|
|
|
$(srcdir)/cogl-glx-display-private.h \
|
2010-11-05 12:28:33 +00:00
|
|
|
$(srcdir)/winsys/cogl-winsys-glx-feature-functions.h \
|
|
|
|
$(srcdir)/winsys/cogl-winsys-glx.c
|
2010-05-19 15:13:07 +00:00
|
|
|
endif
|
2011-05-09 16:48:50 +00:00
|
|
|
if SUPPORT_WGL
|
2011-06-28 15:06:45 +00:00
|
|
|
cogl_public_h += \
|
|
|
|
$(srcdir)/cogl-win32-renderer.h
|
|
|
|
|
2011-05-09 16:48:50 +00:00
|
|
|
cogl_sources_c += \
|
2011-06-28 12:38:50 +00:00
|
|
|
$(srcdir)/cogl-win32-renderer.c \
|
2011-05-09 16:48:50 +00:00
|
|
|
$(srcdir)/winsys/cogl-winsys-wgl.c \
|
|
|
|
$(srcdir)/winsys/cogl-winsys-wgl-feature-functions.h
|
|
|
|
endif
|
2009-10-08 11:08:21 +00:00
|
|
|
if SUPPORT_EGL_PLATFORM_POWERVR_X11
|
2010-09-13 10:30:30 +00:00
|
|
|
cogl_sources_c += \
|
2011-05-24 21:34:10 +00:00
|
|
|
$(srcdir)/winsys/cogl-winsys-egl.c \
|
|
|
|
$(srcdir)/winsys/cogl-winsys-egl-private.h
|
2009-10-08 11:08:21 +00:00
|
|
|
endif
|
|
|
|
if SUPPORT_EGL_PLATFORM_POWERVR_NULL
|
2010-09-13 10:30:30 +00:00
|
|
|
cogl_sources_c += \
|
2011-05-24 21:34:10 +00:00
|
|
|
$(srcdir)/winsys/cogl-winsys-egl.c \
|
|
|
|
$(srcdir)/winsys/cogl-winsys-egl-private.h
|
2009-10-08 11:08:21 +00:00
|
|
|
endif
|
2011-03-04 12:50:39 +00:00
|
|
|
if SUPPORT_EGL_PLATFORM_GDL
|
2010-09-13 10:30:30 +00:00
|
|
|
cogl_sources_c += \
|
2011-05-24 21:34:10 +00:00
|
|
|
$(srcdir)/winsys/cogl-winsys-egl.c \
|
|
|
|
$(srcdir)/winsys/cogl-winsys-egl-private.h
|
2010-08-12 13:25:17 +00:00
|
|
|
endif
|
2011-03-17 19:31:34 +00:00
|
|
|
if SUPPORT_EGL_PLATFORM_WAYLAND
|
2011-06-28 13:57:05 +00:00
|
|
|
cogl_public_h += \
|
|
|
|
$(srcdir)/cogl-wayland-renderer.h
|
|
|
|
|
2011-03-17 19:31:34 +00:00
|
|
|
cogl_sources_c += \
|
2011-05-24 21:34:10 +00:00
|
|
|
$(srcdir)/winsys/cogl-winsys-egl.c \
|
|
|
|
$(srcdir)/winsys/cogl-winsys-egl-private.h
|
2011-03-17 19:31:34 +00:00
|
|
|
endif
|
2011-05-16 15:43:30 +00:00
|
|
|
if SUPPORT_EGL_PLATFORM_ANDROID
|
|
|
|
cogl_sources_c += \
|
2011-05-24 21:34:10 +00:00
|
|
|
$(srcdir)/winsys/cogl-winsys-egl.c \
|
|
|
|
$(srcdir)/winsys/cogl-winsys-egl-private.h
|
2011-05-16 15:43:30 +00:00
|
|
|
endif
|
2009-10-08 11:08:21 +00:00
|
|
|
|
2009-10-23 11:15:25 +00:00
|
|
|
EXTRA_DIST += stb_image.c
|
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
|
|
|
|
2010-09-13 10:30:30 +00:00
|
|
|
# glib-mkenums rules
|
|
|
|
glib_enum_h = cogl-enum-types.h
|
|
|
|
glib_enum_c = cogl-enum-types.c
|
|
|
|
glib_enum_headers = $(cogl_public_h)
|
|
|
|
include $(top_srcdir)/build/autotools/Makefile.am.enums
|
|
|
|
|
2011-02-10 02:32:11 +00:00
|
|
|
lib_LTLIBRARIES += libcogl.la
|
2010-09-13 10:30:30 +00:00
|
|
|
|
2011-04-19 16:40:57 +00:00
|
|
|
libcogl_la_LIBADD = -lm $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
|
2011-02-10 02:32:11 +00:00
|
|
|
if SUPPORT_GLX
|
|
|
|
libcogl_la_LIBADD += -ldl
|
|
|
|
endif
|
|
|
|
# XXX: The aim is to eventually get rid of all private API exports
|
2011-05-05 21:04:07 +00:00
|
|
|
# for cogl-pango.
|
2011-02-10 02:32:11 +00:00
|
|
|
libcogl_la_LDFLAGS = \
|
|
|
|
-no-undefined \
|
|
|
|
-version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@ \
|
|
|
|
-export-dynamic \
|
2011-06-13 09:30:49 +00:00
|
|
|
-export-symbols-regex "^(cogl|_cogl_debug_flags|_cogl_atlas_new|_cogl_atlas_add_reorganize_callback|_cogl_atlas_reserve_space|_cogl_callback|_cogl_util_get_eye_planes_for_screen_poly|_cogl_atlas_texture_remove_reorganize_callback|_cogl_atlas_texture_add_reorganize_callback|_cogl_texture_foreach_sub_texture_in_region|_cogl_atlas_texture_new_with_size|_cogl_profile_trace_message).*"
|
2011-02-10 02:32:11 +00:00
|
|
|
|
|
|
|
libcogl_la_SOURCES = $(cogl_sources_c)
|
|
|
|
nodist_libcogl_la_SOURCES = $(BUILT_SOURCES)
|
2010-09-13 10:30:30 +00:00
|
|
|
|
2010-11-04 00:27:47 +00:00
|
|
|
# Cogl installed headers
|
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
|
|
|
cogl_headers = \
|
|
|
|
$(cogl_public_h) \
|
2009-10-23 11:15:25 +00:00
|
|
|
$(srcdir)/cogl-deprecated.h \
|
2011-05-16 14:41:25 +00:00
|
|
|
$(srcdir)/cogl-pango.h \
|
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
|
|
|
$(NULL)
|
|
|
|
|
2011-02-10 02:32:11 +00:00
|
|
|
coglincludedir = $(includedir)/cogl/cogl
|
|
|
|
coglinclude_HEADERS = $(cogl_headers) $(cogl_experimental_h)
|
|
|
|
nodist_coglinclude_HEADERS = cogl-defines.h cogl-enum-types.h
|
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
|
|
|
|
2010-09-03 10:09:57 +00:00
|
|
|
-include $(INTROSPECTION_MAKEFILE)
|
|
|
|
|
|
|
|
INTROSPECTION_GIRS =
|
|
|
|
|
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
|
|
|
if HAVE_INTROSPECTION
|
2011-02-10 02:32:11 +00:00
|
|
|
Cogl-1.0.gir: libcogl.la Makefile
|
|
|
|
|
|
|
|
Cogl_1_0_gir_NAMESPACE = Cogl
|
|
|
|
Cogl_1_0_gir_VERSION = 1.0
|
|
|
|
Cogl_1_0_gir_LIBS = libcogl.la
|
2011-05-16 14:41:25 +00:00
|
|
|
Cogl_1_0_gir_FILES = $(cogl_public_h) cogl-enum-types.h
|
2011-06-01 17:49:18 +00:00
|
|
|
Cogl_1_0_gir_CFLAGS = $(INCLUDES) $(AM_CPPFLAGS) $(COGL_DEP_CFLAGS)
|
2011-02-10 02:32:11 +00:00
|
|
|
Cogl_1_0_gir_INCLUDES = GL-1.0 GObject-2.0
|
|
|
|
Cogl_1_0_gir_EXPORT_PACKAGES = cogl-1.0
|
|
|
|
Cogl_1_0_gir_SCANNERFLAGS = --warn-all --c-include='cogl/cogl.h'
|
|
|
|
|
|
|
|
INTROSPECTION_GIRS += Cogl-1.0.gir
|
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
|
|
|
|
|
|
|
girdir = $(datadir)/gir-1.0
|
2010-09-13 01:01:21 +00:00
|
|
|
gir_DATA = $(INTROSPECTION_GIRS)
|
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
|
|
|
|
2011-05-06 15:53:43 +00:00
|
|
|
typelibdir = $(libdir)/girepository-1.0
|
|
|
|
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
|
|
|
|
|
|
|
|
CLEANFILES += $(gir_DATA) $(typelib_DATA)
|
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
|
|
|
endif
|