From: Neil Roberts <neil@linux.intel.com>
Date: Sat, 6 Feb 2010 00:20:07 +0000 (+0000)
Subject: Merge branch 'more-texture-backends'
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=830f2402d4f49b7173eb7fa0bda5762a4c430c9a;p=profile%2Fivi%2Fclutter.git

Merge branch 'more-texture-backends'

This adds three new texture backends.

- CoglTexture2D: This is a trimmed down version of CoglTexture2DSliced
  which only supports a single texture and only works with the
  GL_TEXTURE_2D target. The code is a lot simpler so it has a less
  overheads than dealing with slices. Cogl will use this wherever
  possible.

- CoglSubTexture: This is used to get a CoglHandle to represent a
  subregion of another texture. The texture can be used as if it was a
  standalone texture but it does not need to copy the resources.

- CoglAtlasTexture: This collects RGB and RGBA textures into a single
  GL texture with the aim of reducing texture state changes and
  increasing batching. The backend will try to manage the atlas and
  may move the textures around to close gaps in the texture. By
  default all textures will be placed in the atlas.
---

830f2402d4f49b7173eb7fa0bda5762a4c430c9a
diff --cc tests/conform/Makefile.am
index 81d19da,d86a4a2..7b35d27
--- a/tests/conform/Makefile.am
+++ b/tests/conform/Makefile.am
@@@ -41,9 -41,9 +41,10 @@@ test_conformance_SOURCES = 		
  	test-group.c			\
  	test-actor-size.c		\
  	test-texture-fbo.c		\
+ 	test-cogl-sub-texture.c         \
  	test-script-parser.c		\
  	test-actor-destroy.c		\
 +	test-behaviours.c		\
          $(NULL)
  
  # For convenience, this provides a way to easily run individual unit tests: