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.
354 lines
12 KiB
C
354 lines
12 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 2007,2008,2009,2011,2012 Intel Corporation.
|
|
* Copyright (C) 2010 Red Hat, Inc.
|
|
*
|
|
* 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/>.
|
|
*
|
|
*
|
|
*
|
|
* Authors:
|
|
* Matthew Allum <mallum@openedhand.com>
|
|
* Neil Roberts <neil@linux.intel.com>
|
|
* Robert Bragg <robert@linux.intel.com>
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include "cogl-context-private.h"
|
|
#include "cogl-texture.h"
|
|
#include "cogl-util.h"
|
|
#include "cogl-texture-2d.h"
|
|
#include "cogl-primitive-texture.h"
|
|
#include "cogl-texture-2d-sliced-private.h"
|
|
#include "cogl-private.h"
|
|
#include "cogl-object.h"
|
|
#include "cogl-bitmap-private.h"
|
|
#include "cogl-atlas-texture-private.h"
|
|
#include "cogl-error-private.h"
|
|
#include "cogl-texture-rectangle.h"
|
|
#include "cogl-sub-texture.h"
|
|
#include "cogl-texture-2d-gl.h"
|
|
|
|
CoglTexture *
|
|
cogl_texture_new_with_size (unsigned int width,
|
|
unsigned int height,
|
|
CoglTextureFlags flags,
|
|
CoglPixelFormat internal_format)
|
|
{
|
|
CoglTexture *tex;
|
|
CoglError *skip_error = NULL;
|
|
|
|
_COGL_GET_CONTEXT (ctx, NULL);
|
|
|
|
if ((_cogl_util_is_pot (width) && _cogl_util_is_pot (height)) ||
|
|
(cogl_has_feature (ctx, COGL_FEATURE_ID_TEXTURE_NPOT_BASIC) &&
|
|
cogl_has_feature (ctx, COGL_FEATURE_ID_TEXTURE_NPOT_MIPMAP)))
|
|
{
|
|
/* First try creating a fast-path non-sliced texture */
|
|
tex = COGL_TEXTURE (cogl_texture_2d_new_with_size (ctx,
|
|
width, height,
|
|
internal_format));
|
|
|
|
/* TODO: instead of allocating storage here it would be better
|
|
* if we had some api that let us just check that the size is
|
|
* supported by the hardware so storage could be allocated
|
|
* lazily when uploading data. */
|
|
if (!cogl_texture_allocate (tex, &skip_error))
|
|
{
|
|
cogl_error_free (skip_error);
|
|
cogl_object_unref (tex);
|
|
tex = NULL;
|
|
}
|
|
}
|
|
else
|
|
tex = NULL;
|
|
|
|
if (tex)
|
|
{
|
|
CoglBool auto_mipmap = !(flags & COGL_TEXTURE_NO_AUTO_MIPMAP);
|
|
cogl_primitive_texture_set_auto_mipmap (COGL_PRIMITIVE_TEXTURE (tex),
|
|
auto_mipmap);
|
|
}
|
|
else
|
|
{
|
|
/* If it fails resort to sliced textures */
|
|
int max_waste = flags & COGL_TEXTURE_NO_SLICING ? -1 : COGL_TEXTURE_MAX_WASTE;
|
|
tex = COGL_TEXTURE (cogl_texture_2d_sliced_new_with_size (ctx,
|
|
width,
|
|
height,
|
|
max_waste,
|
|
internal_format));
|
|
}
|
|
|
|
return tex;
|
|
}
|
|
|
|
static CoglTexture *
|
|
_cogl_texture_new_from_data (CoglContext *ctx,
|
|
int width,
|
|
int height,
|
|
CoglTextureFlags flags,
|
|
CoglPixelFormat format,
|
|
CoglPixelFormat internal_format,
|
|
int rowstride,
|
|
const uint8_t *data,
|
|
CoglError **error)
|
|
{
|
|
CoglBitmap *bmp;
|
|
CoglTexture *tex;
|
|
|
|
_COGL_RETURN_VAL_IF_FAIL (format != COGL_PIXEL_FORMAT_ANY, NULL);
|
|
_COGL_RETURN_VAL_IF_FAIL (data != NULL, NULL);
|
|
|
|
/* Rowstride from width if not given */
|
|
if (rowstride == 0)
|
|
rowstride = width * _cogl_pixel_format_get_bytes_per_pixel (format);
|
|
|
|
/* Wrap the data into a bitmap */
|
|
bmp = cogl_bitmap_new_for_data (ctx,
|
|
width, height,
|
|
format,
|
|
rowstride,
|
|
(uint8_t *) data);
|
|
|
|
tex = _cogl_texture_new_from_bitmap (bmp, flags, internal_format, error);
|
|
|
|
cogl_object_unref (bmp);
|
|
|
|
return tex;
|
|
}
|
|
|
|
CoglTexture *
|
|
cogl_texture_new_from_data (int width,
|
|
int height,
|
|
CoglTextureFlags flags,
|
|
CoglPixelFormat format,
|
|
CoglPixelFormat internal_format,
|
|
int rowstride,
|
|
const uint8_t *data)
|
|
{
|
|
CoglError *ignore_error = NULL;
|
|
CoglTexture *tex;
|
|
|
|
_COGL_GET_CONTEXT (ctx, NULL);
|
|
|
|
tex = _cogl_texture_new_from_data (ctx,
|
|
width, height,
|
|
flags,
|
|
format, internal_format,
|
|
rowstride,
|
|
data,
|
|
&ignore_error);
|
|
if (!tex)
|
|
cogl_error_free (ignore_error);
|
|
return tex;
|
|
}
|
|
|
|
CoglTexture *
|
|
_cogl_texture_new_from_bitmap (CoglBitmap *bitmap,
|
|
CoglTextureFlags flags,
|
|
CoglPixelFormat internal_format,
|
|
CoglError **error)
|
|
{
|
|
CoglContext *ctx = _cogl_bitmap_get_context (bitmap);
|
|
CoglAtlasTexture *atlas_tex;
|
|
CoglTexture *tex;
|
|
CoglError *internal_error = NULL;
|
|
|
|
/* First try putting the texture in the atlas */
|
|
if ((atlas_tex = _cogl_atlas_texture_new_from_bitmap (bitmap,
|
|
flags,
|
|
internal_format,
|
|
&internal_error)))
|
|
return COGL_TEXTURE (atlas_tex);
|
|
|
|
if (cogl_error_matches (internal_error,
|
|
COGL_SYSTEM_ERROR,
|
|
COGL_SYSTEM_ERROR_NO_MEMORY))
|
|
{
|
|
_cogl_propagate_error (error, internal_error);
|
|
return NULL;
|
|
}
|
|
|
|
cogl_error_free (internal_error);
|
|
internal_error = NULL;
|
|
|
|
/* If that doesn't work try a fast path 2D texture */
|
|
if ((_cogl_util_is_pot (bitmap->width) &&
|
|
_cogl_util_is_pot (bitmap->height)) ||
|
|
(cogl_has_feature (ctx, COGL_FEATURE_ID_TEXTURE_NPOT_BASIC) &&
|
|
cogl_has_feature (ctx, COGL_FEATURE_ID_TEXTURE_NPOT_MIPMAP)))
|
|
{
|
|
tex = COGL_TEXTURE (cogl_texture_2d_new_from_bitmap (bitmap,
|
|
internal_format,
|
|
&internal_error));
|
|
|
|
if (cogl_error_matches (internal_error,
|
|
COGL_SYSTEM_ERROR,
|
|
COGL_SYSTEM_ERROR_NO_MEMORY))
|
|
{
|
|
_cogl_propagate_error (error, internal_error);
|
|
return NULL;
|
|
}
|
|
|
|
if (!tex)
|
|
{
|
|
cogl_error_free (internal_error);
|
|
internal_error = NULL;
|
|
}
|
|
}
|
|
else
|
|
tex = NULL;
|
|
|
|
if (tex)
|
|
{
|
|
CoglBool auto_mipmap = !(flags & COGL_TEXTURE_NO_AUTO_MIPMAP);
|
|
cogl_primitive_texture_set_auto_mipmap (COGL_PRIMITIVE_TEXTURE (tex),
|
|
auto_mipmap);
|
|
}
|
|
else
|
|
{
|
|
/* Otherwise create a sliced texture */
|
|
tex = COGL_TEXTURE (_cogl_texture_2d_sliced_new_from_bitmap (bitmap,
|
|
flags,
|
|
internal_format,
|
|
error));
|
|
}
|
|
|
|
return tex;
|
|
}
|
|
|
|
CoglTexture *
|
|
cogl_texture_new_from_bitmap (CoglBitmap *bitmap,
|
|
CoglTextureFlags flags,
|
|
CoglPixelFormat internal_format)
|
|
{
|
|
CoglError *ignore_error = NULL;
|
|
CoglTexture *tex =
|
|
_cogl_texture_new_from_bitmap (bitmap, flags, internal_format,
|
|
&ignore_error);
|
|
if (!tex)
|
|
cogl_error_free (ignore_error);
|
|
return tex;
|
|
}
|
|
|
|
CoglTexture *
|
|
cogl_texture_new_from_file (const char *filename,
|
|
CoglTextureFlags flags,
|
|
CoglPixelFormat internal_format,
|
|
CoglError **error)
|
|
{
|
|
CoglBitmap *bmp;
|
|
CoglTexture *texture = NULL;
|
|
CoglPixelFormat src_format;
|
|
|
|
_COGL_GET_CONTEXT (ctx, NULL);
|
|
|
|
_COGL_RETURN_VAL_IF_FAIL (error == NULL || *error == NULL, NULL);
|
|
|
|
bmp = cogl_bitmap_new_from_file (filename, error);
|
|
if (bmp == NULL)
|
|
return NULL;
|
|
|
|
src_format = cogl_bitmap_get_format (bmp);
|
|
|
|
/* We know that the bitmap data is solely owned by this function so
|
|
we can do the premult conversion in place. This avoids having to
|
|
copy the bitmap which will otherwise happen in
|
|
_cogl_texture_prepare_for_upload */
|
|
internal_format =
|
|
_cogl_texture_determine_internal_format (src_format, internal_format);
|
|
if (!_cogl_texture_needs_premult_conversion (src_format, internal_format) ||
|
|
_cogl_bitmap_convert_premult_status (bmp,
|
|
src_format ^ COGL_PREMULT_BIT,
|
|
error))
|
|
{
|
|
texture =
|
|
_cogl_texture_new_from_bitmap (bmp, flags, internal_format, error);
|
|
}
|
|
|
|
cogl_object_unref (bmp);
|
|
|
|
return texture;
|
|
}
|
|
|
|
CoglTexture *
|
|
cogl_texture_new_from_foreign (GLuint gl_handle,
|
|
GLenum gl_target,
|
|
GLuint width,
|
|
GLuint height,
|
|
GLuint x_pot_waste,
|
|
GLuint y_pot_waste,
|
|
CoglPixelFormat format)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NULL);
|
|
|
|
#if HAVE_COGL_GL
|
|
if (gl_target == GL_TEXTURE_RECTANGLE_ARB)
|
|
{
|
|
CoglTextureRectangle *texture_rectangle;
|
|
CoglSubTexture *sub_texture;
|
|
|
|
if (x_pot_waste != 0 || y_pot_waste != 0)
|
|
{
|
|
/* It shouldn't be necessary to have waste in this case since
|
|
* the texture isn't limited to power of two sizes. */
|
|
g_warning ("You can't create a foreign GL_TEXTURE_RECTANGLE cogl "
|
|
"texture with waste\n");
|
|
return NULL;
|
|
}
|
|
|
|
texture_rectangle = cogl_texture_rectangle_new_from_foreign (ctx,
|
|
gl_handle,
|
|
width,
|
|
height,
|
|
format,
|
|
NULL);
|
|
|
|
/* CoglTextureRectangle textures work with non-normalized
|
|
* coordinates, but the semantics for this function that people
|
|
* depend on are that all returned texture works with normalized
|
|
* coordinates so we wrap with a CoglSubTexture... */
|
|
sub_texture = cogl_sub_texture_new (ctx,
|
|
COGL_TEXTURE (texture_rectangle),
|
|
0, 0, width, height);
|
|
return COGL_TEXTURE (sub_texture);
|
|
}
|
|
#endif
|
|
|
|
if (x_pot_waste != 0 || y_pot_waste != 0)
|
|
return COGL_TEXTURE (_cogl_texture_2d_sliced_new_from_foreign (ctx,
|
|
gl_handle,
|
|
gl_target,
|
|
width,
|
|
height,
|
|
x_pot_waste,
|
|
y_pot_waste,
|
|
format,
|
|
NULL));
|
|
else
|
|
return COGL_TEXTURE (cogl_texture_2d_new_from_foreign (ctx,
|
|
gl_handle,
|
|
width,
|
|
height,
|
|
format,
|
|
NULL));
|
|
}
|