diff options
| author | Robert Bragg <robert@linux.intel.com> | 2013-06-08 20:45:08 +0100 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2013-07-29 16:57:33 +0100 |
| commit | d383bc0e61916ec6e92b03104222c4863e9fa0a8 (patch) | |
| tree | f5723fb0e5d06c2476fffc43e67f65f30e8e6be0 /cogl/cogl-atlas.h | |
| parent | 061240ef2a06d109525dfb2a1e41bc09790e041c (diff) | |
| download | cogl-d383bc0e61916ec6e92b03104222c4863e9fa0a8.tar.gz | |
remove internal use of cogl_texture_new_with_size
In preparation for removing the automagic cogl-auto-texture apis this
adds a more minimal version of the cogl_texture_new_with_size code to
cogl-atlas.c for creating textures used to migrate images out of an
atlas and to cogl-texture-pixmap-x11.c.
Note: It turned out that both of these minimal versions were the same so
I did consider keeping a shared utility, but since the implementations
are very small and potentially due to the differing requirements for
atlas and pixmap-x11 textures we might even want them to differ later I
chose to keep them separate.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 6d64307483713e7a5a7ef554275619def51b840f)
Conflicts:
cogl/cogl-atlas.c
cogl/winsys/cogl-texture-pixmap-x11.c
Diffstat (limited to 'cogl/cogl-atlas.h')
| -rw-r--r-- | cogl/cogl-atlas.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cogl/cogl-atlas.h b/cogl/cogl-atlas.h index 85e0aab5..52530a90 100644 --- a/cogl/cogl-atlas.h +++ b/cogl/cogl-atlas.h @@ -80,7 +80,6 @@ _cogl_atlas_copy_rectangle (CoglAtlas *atlas, int y, int width, int height, - CoglTextureFlags flags, CoglPixelFormat format); void |