[draw-buffers] First pass at overhauling Cogl's framebuffer management
authorRobert Bragg <robert@linux.intel.com>
Fri, 25 Sep 2009 13:34:34 +0000 (14:34 +0100)
committerRobert Bragg <robert@linux.intel.com>
Tue, 3 Nov 2009 17:23:03 +0000 (17:23 +0000)
commitf7d64e5abd5717bb522d28b7565ecccae63271fc
tree19320b70d163355a7d3149a281c47a607b218006
parentf8f8873714043efbcbf92718493a94ac9ddf303f
[draw-buffers] First pass at overhauling Cogl's framebuffer management

Cogl's support for offscreen rendering was originally written just to support
the clutter_texture_new_from_actor API and due to lack of documentation and
several confusing - non orthogonal - side effects of using the API it wasn't
really possible to use directly.

This commit does a number of things:
- It removes {gl,gles}/cogl-fbo.{c,h} and adds shared cogl-draw-buffer.{c,h}
  files instead which should be easier to maintain.
- internally CoglFbo objects are now called CoglDrawBuffers. A
  CoglDrawBuffer is an abstract base class that is inherited from to
  implement CoglOnscreen and CoglOffscreen draw buffers.  CoglOffscreen draw
  buffers will initially be used to support the
  cogl_offscreen_new_to_texture API, and CoglOnscreen draw buffers will
  start to be used internally to represent windows as we aim to migrate some
  of Clutter's backend code to Cogl.
- It makes draw buffer objects the owners of the following state:
  - viewport
  - projection matrix stack
  - modelview matrix stack
  - clip state
(This means when you switch between draw buffers you will automatically be
 switching to their associated viewport, matrix and clip state)

Aside from hopefully making cogl_offscreen_new_to_texture be more useful
short term by having simpler and well defined semantics for
cogl_set_draw_buffer, as mentioned above this is the first step for a couple
of other things:
- Its a step toward moving ownership for windows down from Clutter backends
  into Cogl, by (internally at least) introducing the CoglOnscreen draw
  buffer.  Note: the plan is that cogl_set_draw_buffer will accept on or
  offscreen draw buffer handles, and the "target" argument will become
  redundant since we will instead query the type of the given draw buffer
  handle.
- Because we have a common type for on and offscreen framebuffers we can
  provide a unified API for framebuffer management. Things like:
  - blitting between buffers
  - managing ancillary buffers (e.g. attaching depth and stencil buffers)
  - size requisition
  - clearing
31 files changed:
clutter/clutter-main.c
clutter/cogl/cogl/Makefile.am
clutter/cogl/cogl/cogl-clip-stack.c
clutter/cogl/cogl/cogl-clip-stack.h
clutter/cogl/cogl/cogl-context.c
clutter/cogl/cogl/cogl-context.h
clutter/cogl/cogl/cogl-draw-buffer-private.h [new file with mode: 0644]
clutter/cogl/cogl/cogl-draw-buffer.c [new file with mode: 0644]
clutter/cogl/cogl/cogl-journal.c
clutter/cogl/cogl/cogl-primitives.c
clutter/cogl/cogl/cogl-texture.c
clutter/cogl/cogl/cogl-vertex-buffer.c
clutter/cogl/cogl/cogl.c
clutter/cogl/cogl/cogl.h.in
clutter/cogl/cogl/driver/gl/Makefile.am
clutter/cogl/cogl/driver/gl/cogl-context-driver.c
clutter/cogl/cogl/driver/gl/cogl-context-driver.h
clutter/cogl/cogl/driver/gl/cogl-defines.h.in
clutter/cogl/cogl/driver/gl/cogl-fbo.c [deleted file]
clutter/cogl/cogl/driver/gl/cogl-fbo.h [deleted file]
clutter/cogl/cogl/driver/gl/cogl-primitives.c
clutter/cogl/cogl/driver/gl/cogl-texture-driver.c
clutter/cogl/cogl/driver/gl/cogl.c
clutter/cogl/cogl/driver/gles/Makefile.am
clutter/cogl/cogl/driver/gles/cogl-context-driver.c
clutter/cogl/cogl/driver/gles/cogl-context-driver.h
clutter/cogl/cogl/driver/gles/cogl-defines.h.in
clutter/cogl/cogl/driver/gles/cogl-fbo.c [deleted file]
clutter/cogl/cogl/driver/gles/cogl-fbo.h [deleted file]
clutter/cogl/cogl/driver/gles/cogl-primitives.c
clutter/cogl/cogl/driver/gles/cogl.c