summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRobert Bragg <robert@linux.intel.com>2013-07-02 01:48:54 +0100
committerRobert Bragg <robert@linux.intel.com>2014-01-09 15:49:47 +0000
commitaf7398788a2d4e39d55372edf2466097fcd8b97d (patch)
tree982e54ec5680a14e44f472985afa068906ea0aa1 /doc
parentcbd6951134dbd7b5e576e8570e8dc37d32add47f (diff)
downloadcogl-af7398788a2d4e39d55372edf2466097fcd8b97d.tar.gz
remove internal_format and redundant error arguments
Texture allocation is now consistently handled lazily such that the internal format can now be controlled using cogl_texture_set_components() and cogl_texture_set_premultiplied() before allocating the texture with cogl_texture_allocate(). This means that the internal_format arguments to texture constructors are now redundant and since most of the texture constructors now can't ever fail the error arguments are also redundant. This now means we no longer use CoglPixelFormat in the public api for describing the internal format of textures which had been bad solution originally due to how specific CoglPixelFormat is which is missleading when we don't support such explicit control over the internal format. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 99a53c82e9ab0a1e5ee35941bf83dc334b1fbe87) Note: there are numerous API changes for functions currently marked as 'unstable' which we don't think are in use by anyone depending on a stable 1.x api. Compared to the original patch though this avoids changing the cogl_texture_rectangle_new_with_size() api which we know is used by Mutter.
Diffstat (limited to 'doc')
-rw-r--r--doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-sections.txt2
-rw-r--r--doc/reference/cogl/cogl-sections.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-sections.txt b/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-sections.txt
index d8f75b5a..a7356990 100644
--- a/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-sections.txt
+++ b/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-sections.txt
@@ -420,7 +420,7 @@ cogl_texture_2d_new_with_size
cogl_texture_2d_new_from_file
cogl_texture_2d_new_from_bitmap
cogl_texture_2d_new_from_data
-cogl_texture_2d_new_from_foreign
+cogl_texture_2d_gl_new_from_foreign
cogl_is_texture_rectangle
</SECTION>
diff --git a/doc/reference/cogl/cogl-sections.txt b/doc/reference/cogl/cogl-sections.txt
index bc19aa91..af510ce4 100644
--- a/doc/reference/cogl/cogl-sections.txt
+++ b/doc/reference/cogl/cogl-sections.txt
@@ -228,7 +228,7 @@ CoglTexture2D
cogl_is_texture_2d
cogl_texture_2d_new_with_size
cogl_texture_2d_new_from_data
-cogl_texture_2d_new_from_foreign
+cogl_texture_2d_gl_new_from_foreign
</SECTION>
<SECTION>