73e8a6d7ce
Consistent with how we lazily allocate framebuffers this patch allows us to instantiate textures but still specify constraints and requirements before allocating storage so that we can be sure to allocate the most appropriate/efficient storage. This adds a cogl_texture_allocate() function that is analogous to cogl_framebuffer_allocate() which can optionally be called to explicitly allocate storage and catch any errors. If this function isn't used explicitly then Cogl will implicitly ensure textures are allocated before the storage is needed. It is generally recommended to rely on lazy storage allocation or at least perform explicit allocation as late as possible so Cogl can be fully informed about the best way to allocate storage. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 1fa7c0f10a8a03043e3c75cb079a49625df098b7) Note: This reverts the cogl_texture_rectangle_new_with_size API change that dropped the CoglError argument and keeps the semantics of allocating the texture immediately. This is because Mutter currently uses this API so we will probably look at updating this later once we have a corresponding Mutter patch prepared. The other API changes were kept since they only affected experimental api.
87 lines
3 KiB
C
87 lines
3 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 2009 Intel Corporation.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
*
|
|
*/
|
|
|
|
#ifndef __COGL_ATLAS_TEXTURE_H
|
|
#define __COGL_ATLAS_TEXTURE_H
|
|
|
|
#include "cogl-object-private.h"
|
|
#include "cogl-texture-private.h"
|
|
#include "cogl-rectangle-map.h"
|
|
#include "cogl-atlas.h"
|
|
|
|
#define COGL_ATLAS_TEXTURE(tex) ((CoglAtlasTexture *) tex)
|
|
|
|
typedef struct _CoglAtlasTexture CoglAtlasTexture;
|
|
|
|
struct _CoglAtlasTexture
|
|
{
|
|
CoglTexture _parent;
|
|
|
|
/* The format that the texture is in. This isn't necessarily the
|
|
same format as the atlas texture because we can store
|
|
pre-multiplied and non-pre-multiplied textures together */
|
|
CoglPixelFormat format;
|
|
|
|
/* The rectangle that was used to add this texture to the
|
|
atlas. This includes the 1-pixel border */
|
|
CoglRectangleMapEntry rectangle;
|
|
|
|
/* The atlas that this texture is in. If the texture is no longer in
|
|
an atlas then this will be NULL. A reference is taken on the
|
|
atlas by the texture (but not vice versa so there is no cycle) */
|
|
CoglAtlas *atlas;
|
|
|
|
/* Either a CoglSubTexture representing the atlas region for easy
|
|
* rendering or if the texture has been migrated out of the atlas it
|
|
* may be some other texture type such as CoglTexture2D */
|
|
CoglTexture *sub_texture;
|
|
};
|
|
|
|
CoglAtlasTexture *
|
|
_cogl_atlas_texture_new_from_bitmap (CoglBitmap *bmp,
|
|
CoglTextureFlags flags,
|
|
CoglPixelFormat internal_format,
|
|
CoglError **error);
|
|
|
|
CoglAtlasTexture *
|
|
_cogl_atlas_texture_new_with_size (CoglContext *ctx,
|
|
int width,
|
|
int height,
|
|
CoglTextureFlags flags,
|
|
CoglPixelFormat internal_format,
|
|
CoglError **error);
|
|
|
|
void
|
|
_cogl_atlas_texture_add_reorganize_callback (CoglContext *ctx,
|
|
GHookFunc callback,
|
|
void *user_data);
|
|
|
|
void
|
|
_cogl_atlas_texture_remove_reorganize_callback (CoglContext *ctx,
|
|
GHookFunc callback,
|
|
void *user_data);
|
|
|
|
CoglBool
|
|
_cogl_is_atlas_texture (void *object);
|
|
|
|
#endif /* __COGL_ATLAS_TEXTURE_H */
|