2009-12-04 13:06:32 +00:00
|
|
|
/*
|
|
|
|
* Cogl
|
|
|
|
*
|
|
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
|
|
*
|
2010-02-12 15:33:56 +00:00
|
|
|
* Copyright (C) 2009,2010 Intel Corporation.
|
2009-12-04 13:06:32 +00:00
|
|
|
*
|
|
|
|
* 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
|
2010-03-01 12:56:10 +00:00
|
|
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*
|
|
|
|
*
|
2009-12-04 13:06:32 +00:00
|
|
|
*
|
|
|
|
* Authors:
|
|
|
|
* Neil Roberts <neil@linux.intel.com>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include "config.h"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "cogl.h"
|
|
|
|
#include "cogl-internal.h"
|
|
|
|
#include "cogl-util.h"
|
|
|
|
#include "cogl-texture-private.h"
|
|
|
|
#include "cogl-atlas-texture-private.h"
|
|
|
|
#include "cogl-texture-2d-private.h"
|
2010-01-18 09:22:04 +00:00
|
|
|
#include "cogl-sub-texture-private.h"
|
2009-12-04 13:06:32 +00:00
|
|
|
#include "cogl-context.h"
|
|
|
|
#include "cogl-handle.h"
|
|
|
|
#include "cogl-texture-driver.h"
|
|
|
|
#include "cogl-atlas.h"
|
2010-02-12 15:33:56 +00:00
|
|
|
#include "cogl-journal-private.h"
|
2009-12-04 13:06:32 +00:00
|
|
|
|
2009-12-04 18:24:15 +00:00
|
|
|
#include <stdlib.h>
|
|
|
|
|
2009-12-05 13:24:01 +00:00
|
|
|
#ifdef HAVE_COGL_GLES2
|
|
|
|
|
|
|
|
#include "../gles/cogl-gles2-wrapper.h"
|
|
|
|
|
|
|
|
#else /* HAVE_COGL_GLES2 */
|
|
|
|
|
|
|
|
#define glGenFramebuffers ctx->drv.pf_glGenFramebuffers
|
|
|
|
#define glBindFramebuffer ctx->drv.pf_glBindFramebuffer
|
|
|
|
#define glFramebufferTexture2D ctx->drv.pf_glFramebufferTexture2D
|
|
|
|
#define glCheckFramebufferStatus ctx->drv.pf_glCheckFramebufferStatus
|
|
|
|
#define glDeleteFramebuffers ctx->drv.pf_glDeleteFramebuffers
|
|
|
|
|
|
|
|
#endif /* HAVE_COGL_GLES2 */
|
|
|
|
|
|
|
|
#ifndef GL_FRAMEBUFFER
|
|
|
|
#define GL_FRAMEBUFFER 0x8D40
|
|
|
|
#endif
|
|
|
|
#ifndef GL_FRAMEBUFFER_BINDING
|
|
|
|
#define GL_FRAMEBUFFER_BINDING 0x8CA6
|
|
|
|
#endif
|
|
|
|
#ifndef GL_COLOR_ATTACHMENT0
|
|
|
|
#define GL_COLOR_ATTACHMENT0 0x8CE0
|
|
|
|
#endif
|
|
|
|
#ifndef GL_FRAMEBUFFER_COMPLETE
|
|
|
|
#define GL_FRAMEBUFFER_COMPLETE 0x8CD5
|
|
|
|
#endif
|
|
|
|
|
2009-12-04 13:06:32 +00:00
|
|
|
static void _cogl_atlas_texture_free (CoglAtlasTexture *sub_tex);
|
|
|
|
|
2010-07-09 17:46:31 +00:00
|
|
|
COGL_TEXTURE_INTERNAL_DEFINE (AtlasTexture, atlas_texture);
|
2009-12-04 13:06:32 +00:00
|
|
|
|
|
|
|
static const CoglTextureVtable cogl_atlas_texture_vtable;
|
|
|
|
|
2009-12-05 13:24:01 +00:00
|
|
|
/* If we want to do mulitple blits from a texture (such as when
|
|
|
|
reorganizing the atlas) then it's quicker to download all of the
|
|
|
|
data once and upload multiple times from that. This struct is used
|
|
|
|
to keep the image data for a series of blits */
|
|
|
|
|
|
|
|
typedef struct _CoglAtlasTextureBlitData
|
|
|
|
{
|
|
|
|
CoglHandle src_tex, dst_tex;
|
|
|
|
|
|
|
|
/* If we're using an FBO to blit, then FBO will be non-zero and
|
|
|
|
old_fbo will be the previous framebuffer binding */
|
|
|
|
GLuint fbo, old_fbo;
|
|
|
|
|
|
|
|
/* If we're not using an FBO then we g_malloc a buffer and copy the
|
|
|
|
complete texture data in */
|
|
|
|
unsigned char *image_data;
|
|
|
|
CoglPixelFormat format;
|
cogl: improves header and coding style consistency
We've had complaints that our Cogl code/headers are a bit "special" so
this is a first pass at tidying things up by giving them some
consistency. These changes are all consistent with how new code in Cogl
is being written, but the style isn't consistently applied across all
code yet.
There are two parts to this patch; but since each one required a large
amount of effort to maintain tidy indenting it made sense to combine the
changes to reduce the time spent re indenting the same lines.
The first change is to use a consistent style for declaring function
prototypes in headers. Cogl headers now consistently use this style for
prototypes:
return_type
cogl_function_name (CoglType arg0,
CoglType arg1);
Not everyone likes this style, but it seems that most of the currently
active Cogl developers agree on it.
The second change is to constrain the use of redundant glib data types
in Cogl. Uses of gint, guint, gfloat, glong, gulong and gchar have all
been replaced with int, unsigned int, float, long, unsigned long and char
respectively. When talking about pixel data; use of guchar has been
replaced with guint8, otherwise unsigned char can be used.
The glib types that we continue to use for portability are gboolean,
gint{8,16,32,64}, guint{8,16,32,64} and gsize.
The general intention is that Cogl should look palatable to the widest
range of C programmers including those outside the Gnome community so
- especially for the public API - we want to minimize the number of
foreign looking typedefs.
2010-02-10 01:57:32 +00:00
|
|
|
int bpp;
|
|
|
|
unsigned int src_height, src_width;
|
2009-12-05 13:24:01 +00:00
|
|
|
|
|
|
|
GLenum dst_gl_target;
|
|
|
|
} CoglAtlasTextureBlitData;
|
|
|
|
|
|
|
|
static void
|
|
|
|
_cogl_atlas_texture_blit_begin (CoglAtlasTextureBlitData *data,
|
|
|
|
CoglHandle dst_tex,
|
|
|
|
CoglHandle src_tex)
|
|
|
|
{
|
|
|
|
GLenum src_gl_target;
|
|
|
|
GLuint src_gl_texture;
|
|
|
|
GLuint dst_gl_texture;
|
|
|
|
|
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
|
|
|
|
data->dst_tex = dst_tex;
|
|
|
|
data->src_tex = src_tex;
|
|
|
|
data->fbo = 0;
|
|
|
|
|
|
|
|
/* If we can use an FBO then we don't need to download the data and
|
|
|
|
we can tell GL to blit directly between the textures */
|
|
|
|
if (cogl_features_available (COGL_FEATURE_OFFSCREEN) &&
|
|
|
|
!cogl_texture_is_sliced (dst_tex) &&
|
|
|
|
cogl_texture_get_gl_texture (src_tex, &src_gl_texture, &src_gl_target) &&
|
|
|
|
cogl_texture_get_gl_texture (dst_tex, &dst_gl_texture,
|
|
|
|
&data->dst_gl_target))
|
|
|
|
{
|
|
|
|
/* Ideally we would use the cogl-offscreen API here, but I'd
|
|
|
|
rather avoid creating a stencil renderbuffer which you can't
|
|
|
|
currently do */
|
|
|
|
/* Preserve the previous framebuffer binding so we don't trample
|
|
|
|
on cogl-offscreen */
|
|
|
|
data->old_fbo = 0;
|
|
|
|
GE( glGetIntegerv (GL_FRAMEBUFFER_BINDING, (GLint *) &data->old_fbo) );
|
|
|
|
|
|
|
|
_cogl_texture_set_filters (src_tex, GL_NEAREST, GL_NEAREST);
|
|
|
|
|
|
|
|
/* Create an FBO to read from the src texture */
|
|
|
|
GE( glGenFramebuffers (1, &data->fbo) );
|
|
|
|
GE( glBindFramebuffer (GL_FRAMEBUFFER, data->fbo) );
|
|
|
|
GE( glFramebufferTexture2D (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
|
|
|
|
src_gl_target, src_gl_texture, 0) );
|
|
|
|
if (glCheckFramebufferStatus (GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE)
|
|
|
|
{
|
|
|
|
/* The FBO failed for whatever reason so we'll fallback to
|
|
|
|
reading the texture data */
|
|
|
|
GE( glBindFramebuffer (GL_FRAMEBUFFER, data->old_fbo) );
|
|
|
|
GE( glDeleteFramebuffers (1, &data->fbo) );
|
|
|
|
data->fbo = 0;
|
|
|
|
}
|
|
|
|
|
2010-04-26 09:01:43 +00:00
|
|
|
_cogl_bind_gl_texture_transient (data->dst_gl_target,
|
|
|
|
dst_gl_texture,
|
|
|
|
FALSE);
|
2009-12-05 13:24:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (data->fbo)
|
|
|
|
COGL_NOTE (ATLAS, "Blit set up using an FBO");
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* We need to retrieve the entire texture data (there is no
|
|
|
|
glGetTexSubImage2D) */
|
|
|
|
|
|
|
|
data->format = cogl_texture_get_format (src_tex);
|
|
|
|
data->bpp = _cogl_get_format_bpp (data->format);
|
|
|
|
data->src_width = cogl_texture_get_width (src_tex);
|
|
|
|
data->src_height = cogl_texture_get_height (src_tex);
|
|
|
|
|
|
|
|
data->image_data = g_malloc (data->bpp * data->src_width *
|
|
|
|
data->src_height);
|
|
|
|
cogl_texture_get_data (src_tex, data->format,
|
|
|
|
data->src_width * data->bpp, data->image_data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
_cogl_atlas_texture_blit (CoglAtlasTextureBlitData *data,
|
cogl: improves header and coding style consistency
We've had complaints that our Cogl code/headers are a bit "special" so
this is a first pass at tidying things up by giving them some
consistency. These changes are all consistent with how new code in Cogl
is being written, but the style isn't consistently applied across all
code yet.
There are two parts to this patch; but since each one required a large
amount of effort to maintain tidy indenting it made sense to combine the
changes to reduce the time spent re indenting the same lines.
The first change is to use a consistent style for declaring function
prototypes in headers. Cogl headers now consistently use this style for
prototypes:
return_type
cogl_function_name (CoglType arg0,
CoglType arg1);
Not everyone likes this style, but it seems that most of the currently
active Cogl developers agree on it.
The second change is to constrain the use of redundant glib data types
in Cogl. Uses of gint, guint, gfloat, glong, gulong and gchar have all
been replaced with int, unsigned int, float, long, unsigned long and char
respectively. When talking about pixel data; use of guchar has been
replaced with guint8, otherwise unsigned char can be used.
The glib types that we continue to use for portability are gboolean,
gint{8,16,32,64}, guint{8,16,32,64} and gsize.
The general intention is that Cogl should look palatable to the widest
range of C programmers including those outside the Gnome community so
- especially for the public API - we want to minimize the number of
foreign looking typedefs.
2010-02-10 01:57:32 +00:00
|
|
|
unsigned int src_x,
|
|
|
|
unsigned int src_y,
|
|
|
|
unsigned int dst_x,
|
|
|
|
unsigned int dst_y,
|
|
|
|
unsigned int width,
|
|
|
|
unsigned int height)
|
2009-12-05 13:24:01 +00:00
|
|
|
{
|
|
|
|
/* If we have an FBO then we can do a fast blit */
|
|
|
|
if (data->fbo)
|
|
|
|
GE( glCopyTexSubImage2D (data->dst_gl_target, 0, dst_x, dst_y, src_x, src_y,
|
|
|
|
width, height) );
|
|
|
|
else
|
|
|
|
cogl_texture_set_region (data->dst_tex,
|
|
|
|
src_x, src_y,
|
|
|
|
dst_x, dst_y,
|
|
|
|
width, height,
|
|
|
|
data->src_width, data->src_height,
|
|
|
|
data->format,
|
|
|
|
data->src_width * data->bpp,
|
|
|
|
data->image_data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
_cogl_atlas_texture_blit_end (CoglAtlasTextureBlitData *data)
|
|
|
|
{
|
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
|
|
|
|
if (data->fbo)
|
|
|
|
{
|
|
|
|
GE( glBindFramebuffer (GL_FRAMEBUFFER, data->old_fbo) );
|
|
|
|
GE( glDeleteFramebuffers (1, &data->fbo) );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
g_free (data->image_data);
|
|
|
|
}
|
|
|
|
|
2009-12-04 13:06:32 +00:00
|
|
|
static void
|
|
|
|
_cogl_atlas_texture_foreach_sub_texture_in_region (
|
|
|
|
CoglTexture *tex,
|
|
|
|
float virtual_tx_1,
|
|
|
|
float virtual_ty_1,
|
|
|
|
float virtual_tx_2,
|
|
|
|
float virtual_ty_2,
|
|
|
|
CoglTextureSliceCallback callback,
|
|
|
|
void *user_data)
|
|
|
|
{
|
|
|
|
CoglAtlasTexture *atlas_tex = COGL_ATLAS_TEXTURE (tex);
|
|
|
|
|
|
|
|
/* Forward on to the sub texture */
|
|
|
|
_cogl_texture_foreach_sub_texture_in_region (atlas_tex->sub_texture,
|
|
|
|
virtual_tx_1,
|
|
|
|
virtual_ty_1,
|
|
|
|
virtual_tx_2,
|
|
|
|
virtual_ty_2,
|
|
|
|
callback,
|
|
|
|
user_data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2010-03-25 17:29:22 +00:00
|
|
|
_cogl_atlas_texture_set_wrap_mode_parameters (CoglTexture *tex,
|
|
|
|
GLenum wrap_mode_s,
|
|
|
|
GLenum wrap_mode_t,
|
|
|
|
GLenum wrap_mode_r)
|
2009-12-04 13:06:32 +00:00
|
|
|
{
|
|
|
|
CoglAtlasTexture *atlas_tex = COGL_ATLAS_TEXTURE (tex);
|
|
|
|
|
|
|
|
/* Forward on to the sub texture */
|
2010-03-25 17:29:22 +00:00
|
|
|
_cogl_texture_set_wrap_mode_parameters (atlas_tex->sub_texture,
|
|
|
|
wrap_mode_s,
|
|
|
|
wrap_mode_t,
|
|
|
|
wrap_mode_r);
|
2009-12-04 13:06:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2009-12-05 13:48:03 +00:00
|
|
|
_cogl_atlas_texture_remove_from_atlas (CoglAtlasTexture *atlas_tex)
|
2009-12-04 13:06:32 +00:00
|
|
|
{
|
|
|
|
if (atlas_tex->in_atlas)
|
2009-12-04 18:55:53 +00:00
|
|
|
{
|
2009-12-05 13:48:03 +00:00
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
|
2010-02-03 19:54:12 +00:00
|
|
|
_cogl_atlas_remove_rectangle (ctx->atlas, &atlas_tex->rectangle);
|
2009-12-04 18:55:53 +00:00
|
|
|
|
|
|
|
COGL_NOTE (ATLAS, "Removed rectangle sized %ix%i",
|
|
|
|
atlas_tex->rectangle.width,
|
|
|
|
atlas_tex->rectangle.height);
|
|
|
|
COGL_NOTE (ATLAS, "Atlas is %ix%i, has %i textures and is %i%% waste",
|
2010-02-03 19:54:12 +00:00
|
|
|
_cogl_atlas_get_width (ctx->atlas),
|
|
|
|
_cogl_atlas_get_height (ctx->atlas),
|
|
|
|
_cogl_atlas_get_n_rectangles (ctx->atlas),
|
|
|
|
_cogl_atlas_get_remaining_space (ctx->atlas) * 100 /
|
|
|
|
(_cogl_atlas_get_width (ctx->atlas) *
|
|
|
|
_cogl_atlas_get_height (ctx->atlas)));
|
2009-12-05 13:48:03 +00:00
|
|
|
|
|
|
|
atlas_tex->in_atlas = FALSE;
|
2009-12-04 18:55:53 +00:00
|
|
|
}
|
2009-12-05 13:48:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
_cogl_atlas_texture_free (CoglAtlasTexture *atlas_tex)
|
|
|
|
{
|
|
|
|
_cogl_atlas_texture_remove_from_atlas (atlas_tex);
|
2009-12-04 13:06:32 +00:00
|
|
|
|
|
|
|
cogl_handle_unref (atlas_tex->sub_texture);
|
2010-04-13 16:26:03 +00:00
|
|
|
|
2010-04-26 09:01:43 +00:00
|
|
|
/* Chain up */
|
|
|
|
_cogl_texture_free (COGL_TEXTURE (atlas_tex));
|
2009-12-04 13:06:32 +00:00
|
|
|
}
|
|
|
|
|
cogl: improves header and coding style consistency
We've had complaints that our Cogl code/headers are a bit "special" so
this is a first pass at tidying things up by giving them some
consistency. These changes are all consistent with how new code in Cogl
is being written, but the style isn't consistently applied across all
code yet.
There are two parts to this patch; but since each one required a large
amount of effort to maintain tidy indenting it made sense to combine the
changes to reduce the time spent re indenting the same lines.
The first change is to use a consistent style for declaring function
prototypes in headers. Cogl headers now consistently use this style for
prototypes:
return_type
cogl_function_name (CoglType arg0,
CoglType arg1);
Not everyone likes this style, but it seems that most of the currently
active Cogl developers agree on it.
The second change is to constrain the use of redundant glib data types
in Cogl. Uses of gint, guint, gfloat, glong, gulong and gchar have all
been replaced with int, unsigned int, float, long, unsigned long and char
respectively. When talking about pixel data; use of guchar has been
replaced with guint8, otherwise unsigned char can be used.
The glib types that we continue to use for portability are gboolean,
gint{8,16,32,64}, guint{8,16,32,64} and gsize.
The general intention is that Cogl should look palatable to the widest
range of C programmers including those outside the Gnome community so
- especially for the public API - we want to minimize the number of
foreign looking typedefs.
2010-02-10 01:57:32 +00:00
|
|
|
static int
|
2009-12-04 13:06:32 +00:00
|
|
|
_cogl_atlas_texture_get_max_waste (CoglTexture *tex)
|
|
|
|
{
|
|
|
|
CoglAtlasTexture *atlas_tex = COGL_ATLAS_TEXTURE (tex);
|
|
|
|
|
|
|
|
/* Forward on to the sub texture */
|
|
|
|
return cogl_texture_get_max_waste (atlas_tex->sub_texture);
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
_cogl_atlas_texture_is_sliced (CoglTexture *tex)
|
|
|
|
{
|
|
|
|
CoglAtlasTexture *atlas_tex = COGL_ATLAS_TEXTURE (tex);
|
|
|
|
|
|
|
|
/* Forward on to the sub texture */
|
|
|
|
return cogl_texture_is_sliced (atlas_tex->sub_texture);
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
_cogl_atlas_texture_can_hardware_repeat (CoglTexture *tex)
|
|
|
|
{
|
|
|
|
CoglAtlasTexture *atlas_tex = COGL_ATLAS_TEXTURE (tex);
|
|
|
|
|
|
|
|
/* Forward on to the sub texture */
|
|
|
|
return _cogl_texture_can_hardware_repeat (atlas_tex->sub_texture);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
_cogl_atlas_texture_transform_coords_to_gl (CoglTexture *tex,
|
|
|
|
float *s,
|
|
|
|
float *t)
|
|
|
|
{
|
|
|
|
CoglAtlasTexture *atlas_tex = COGL_ATLAS_TEXTURE (tex);
|
|
|
|
|
|
|
|
/* Forward on to the sub texture */
|
|
|
|
_cogl_texture_transform_coords_to_gl (atlas_tex->sub_texture, s, t);
|
|
|
|
}
|
|
|
|
|
2010-03-01 21:49:04 +00:00
|
|
|
static CoglTransformResult
|
2010-01-18 09:22:04 +00:00
|
|
|
_cogl_atlas_texture_transform_quad_coords_to_gl (CoglTexture *tex,
|
|
|
|
float *coords)
|
|
|
|
{
|
|
|
|
CoglAtlasTexture *atlas_tex = COGL_ATLAS_TEXTURE (tex);
|
|
|
|
|
|
|
|
/* Forward on to the sub texture */
|
|
|
|
return _cogl_texture_transform_quad_coords_to_gl (atlas_tex->sub_texture,
|
|
|
|
coords);
|
|
|
|
}
|
|
|
|
|
2009-12-04 13:06:32 +00:00
|
|
|
static gboolean
|
|
|
|
_cogl_atlas_texture_get_gl_texture (CoglTexture *tex,
|
|
|
|
GLuint *out_gl_handle,
|
|
|
|
GLenum *out_gl_target)
|
|
|
|
{
|
|
|
|
CoglAtlasTexture *atlas_tex = COGL_ATLAS_TEXTURE (tex);
|
|
|
|
|
|
|
|
/* Forward on to the sub texture */
|
|
|
|
return cogl_texture_get_gl_texture (atlas_tex->sub_texture,
|
|
|
|
out_gl_handle,
|
|
|
|
out_gl_target);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
_cogl_atlas_texture_set_filters (CoglTexture *tex,
|
|
|
|
GLenum min_filter,
|
|
|
|
GLenum mag_filter)
|
|
|
|
{
|
|
|
|
CoglAtlasTexture *atlas_tex = COGL_ATLAS_TEXTURE (tex);
|
|
|
|
|
|
|
|
/* Forward on to the sub texture */
|
|
|
|
_cogl_texture_set_filters (atlas_tex->sub_texture, min_filter, mag_filter);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2010-01-18 09:22:04 +00:00
|
|
|
_cogl_atlas_texture_migrate_out_of_atlas (CoglAtlasTexture *atlas_tex)
|
2009-12-04 13:06:32 +00:00
|
|
|
{
|
2010-01-18 09:22:04 +00:00
|
|
|
/* Make sure this texture is not in the atlas */
|
2009-12-05 13:48:03 +00:00
|
|
|
if (atlas_tex->in_atlas)
|
|
|
|
{
|
|
|
|
CoglAtlasTextureBlitData blit_data;
|
|
|
|
|
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
|
|
|
|
COGL_NOTE (ATLAS, "Migrating texture out of the atlas");
|
|
|
|
|
2010-06-04 15:42:30 +00:00
|
|
|
/* We don't know if any materials may currently be referenced in
|
|
|
|
* the journal that depend on the current underlying GL texture
|
|
|
|
* storage so we flush the journal before migrating.
|
|
|
|
*
|
|
|
|
* We are assuming that texture atlas migration never happens
|
|
|
|
* during a flush so we don't have to consider recursion here.
|
|
|
|
*/
|
|
|
|
_cogl_journal_flush ();
|
2010-02-12 15:33:56 +00:00
|
|
|
|
2010-04-08 11:21:04 +00:00
|
|
|
/* Notify cogl-material.c that the texture's underlying GL texture
|
|
|
|
* storage is changing so it knows it may need to bind a new texture
|
|
|
|
* if the CoglTexture is reused with the same texture unit. */
|
|
|
|
_cogl_material_texture_storage_change_notify (atlas_tex);
|
|
|
|
|
2009-12-05 13:48:03 +00:00
|
|
|
cogl_handle_unref (atlas_tex->sub_texture);
|
|
|
|
|
|
|
|
/* Create a new texture at the right size, not including the
|
|
|
|
border */
|
|
|
|
atlas_tex->sub_texture =
|
|
|
|
cogl_texture_new_with_size (atlas_tex->rectangle.width - 2,
|
|
|
|
atlas_tex->rectangle.height - 2,
|
|
|
|
COGL_TEXTURE_NO_ATLAS,
|
|
|
|
atlas_tex->format);
|
|
|
|
|
|
|
|
/* Blit the data out of the atlas to the new texture. If FBOs
|
|
|
|
aren't available this will end up having to copy the entire
|
|
|
|
atlas texture */
|
|
|
|
_cogl_atlas_texture_blit_begin (&blit_data, atlas_tex->sub_texture,
|
2010-01-29 12:19:42 +00:00
|
|
|
ctx->atlas_texture);
|
2009-12-05 13:48:03 +00:00
|
|
|
_cogl_atlas_texture_blit (&blit_data,
|
|
|
|
atlas_tex->rectangle.x + 1,
|
|
|
|
atlas_tex->rectangle.y + 1,
|
|
|
|
0, 0,
|
|
|
|
atlas_tex->rectangle.width - 2,
|
|
|
|
atlas_tex->rectangle.height - 2);
|
|
|
|
_cogl_atlas_texture_blit_end (&blit_data);
|
|
|
|
|
|
|
|
_cogl_atlas_texture_remove_from_atlas (atlas_tex);
|
|
|
|
}
|
2010-01-18 09:22:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2010-06-09 16:39:59 +00:00
|
|
|
_cogl_atlas_texture_pre_paint (CoglTexture *tex, CoglTexturePrePaintFlags flags)
|
2010-01-18 09:22:04 +00:00
|
|
|
{
|
|
|
|
CoglAtlasTexture *atlas_tex = COGL_ATLAS_TEXTURE (tex);
|
|
|
|
|
2010-06-09 16:39:59 +00:00
|
|
|
if ((flags & COGL_TEXTURE_NEEDS_MIPMAP))
|
|
|
|
/* Mipmaps do not work well with the current atlas so instead
|
|
|
|
we'll just migrate the texture out and use a regular texture */
|
|
|
|
_cogl_atlas_texture_migrate_out_of_atlas (atlas_tex);
|
2009-12-04 13:06:32 +00:00
|
|
|
|
|
|
|
/* Forward on to the sub texture */
|
2010-06-09 16:39:59 +00:00
|
|
|
_cogl_texture_pre_paint (atlas_tex->sub_texture, flags);
|
2009-12-04 13:06:32 +00:00
|
|
|
}
|
|
|
|
|
2010-01-18 09:22:04 +00:00
|
|
|
static void
|
|
|
|
_cogl_atlas_texture_ensure_non_quad_rendering (CoglTexture *tex)
|
|
|
|
{
|
|
|
|
CoglAtlasTexture *atlas_tex = COGL_ATLAS_TEXTURE (tex);
|
|
|
|
|
|
|
|
/* Sub textures can't support non-quad rendering so we'll just
|
|
|
|
migrate the texture out */
|
|
|
|
_cogl_atlas_texture_migrate_out_of_atlas (atlas_tex);
|
|
|
|
|
|
|
|
/* Forward on to the sub texture */
|
|
|
|
_cogl_texture_ensure_non_quad_rendering (atlas_tex->sub_texture);
|
|
|
|
}
|
|
|
|
|
2010-01-18 10:53:00 +00:00
|
|
|
static gboolean
|
|
|
|
_cogl_atlas_texture_set_region_with_border (CoglAtlasTexture *atlas_tex,
|
|
|
|
int src_x,
|
|
|
|
int src_y,
|
|
|
|
int dst_x,
|
|
|
|
int dst_y,
|
|
|
|
unsigned int dst_width,
|
|
|
|
unsigned int dst_height,
|
|
|
|
int width,
|
|
|
|
int height,
|
|
|
|
CoglPixelFormat format,
|
|
|
|
unsigned int rowstride,
|
|
|
|
const guint8 *data)
|
|
|
|
{
|
|
|
|
_COGL_GET_CONTEXT (ctx, FALSE);
|
|
|
|
|
|
|
|
/* Copy the central data */
|
2010-01-29 12:19:42 +00:00
|
|
|
if (!cogl_texture_set_region (ctx->atlas_texture,
|
2010-01-18 10:53:00 +00:00
|
|
|
src_x, src_y,
|
|
|
|
dst_x + atlas_tex->rectangle.x + 1,
|
|
|
|
dst_y + atlas_tex->rectangle.y + 1,
|
|
|
|
dst_width,
|
|
|
|
dst_height,
|
|
|
|
width, height,
|
|
|
|
format,
|
|
|
|
rowstride,
|
|
|
|
data))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
/* Update the left edge pixels */
|
|
|
|
if (dst_x == 0 &&
|
2010-01-29 12:19:42 +00:00
|
|
|
!cogl_texture_set_region (ctx->atlas_texture,
|
2010-01-18 10:53:00 +00:00
|
|
|
src_x, src_y,
|
|
|
|
atlas_tex->rectangle.x,
|
|
|
|
dst_y + atlas_tex->rectangle.y + 1,
|
|
|
|
1, dst_height,
|
|
|
|
width, height,
|
|
|
|
format, rowstride,
|
|
|
|
data))
|
|
|
|
return FALSE;
|
|
|
|
/* Update the right edge pixels */
|
|
|
|
if (dst_x + dst_width == atlas_tex->rectangle.width - 2 &&
|
2010-01-29 12:19:42 +00:00
|
|
|
!cogl_texture_set_region (ctx->atlas_texture,
|
2010-01-18 10:53:00 +00:00
|
|
|
src_x + dst_width - 1, src_y,
|
|
|
|
atlas_tex->rectangle.x +
|
|
|
|
atlas_tex->rectangle.width - 1,
|
|
|
|
dst_y + atlas_tex->rectangle.y + 1,
|
|
|
|
1, dst_height,
|
|
|
|
width, height,
|
|
|
|
format, rowstride,
|
|
|
|
data))
|
|
|
|
return FALSE;
|
|
|
|
/* Update the top edge pixels */
|
|
|
|
if (dst_y == 0 &&
|
2010-01-29 12:19:42 +00:00
|
|
|
!cogl_texture_set_region (ctx->atlas_texture,
|
2010-01-18 10:53:00 +00:00
|
|
|
src_x, src_y,
|
|
|
|
dst_x + atlas_tex->rectangle.x + 1,
|
|
|
|
atlas_tex->rectangle.y,
|
|
|
|
dst_width, 1,
|
|
|
|
width, height,
|
|
|
|
format, rowstride,
|
|
|
|
data))
|
|
|
|
return FALSE;
|
|
|
|
/* Update the bottom edge pixels */
|
|
|
|
if (dst_y + dst_height == atlas_tex->rectangle.height - 2 &&
|
2010-01-29 12:19:42 +00:00
|
|
|
!cogl_texture_set_region (ctx->atlas_texture,
|
2010-01-18 10:53:00 +00:00
|
|
|
src_x, src_y + dst_height - 1,
|
|
|
|
dst_x + atlas_tex->rectangle.x + 1,
|
|
|
|
atlas_tex->rectangle.y +
|
|
|
|
atlas_tex->rectangle.height - 1,
|
|
|
|
dst_width, 1,
|
|
|
|
width, height,
|
|
|
|
format, rowstride,
|
|
|
|
data))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2009-12-04 13:06:32 +00:00
|
|
|
static gboolean
|
|
|
|
_cogl_atlas_texture_set_region (CoglTexture *tex,
|
|
|
|
int src_x,
|
|
|
|
int src_y,
|
|
|
|
int dst_x,
|
|
|
|
int dst_y,
|
|
|
|
unsigned int dst_width,
|
|
|
|
unsigned int dst_height,
|
2010-07-08 14:15:22 +00:00
|
|
|
CoglBitmap *bmp)
|
2009-12-04 13:06:32 +00:00
|
|
|
{
|
|
|
|
CoglAtlasTexture *atlas_tex = COGL_ATLAS_TEXTURE (tex);
|
|
|
|
|
|
|
|
/* If the texture is in the atlas then we need to copy the edge
|
|
|
|
pixels to the border */
|
|
|
|
if (atlas_tex->in_atlas)
|
2010-07-08 14:15:22 +00:00
|
|
|
/* Upload the data ignoring the premult bit */
|
|
|
|
return _cogl_atlas_texture_set_region_with_border (atlas_tex,
|
|
|
|
src_x, src_y,
|
|
|
|
dst_x, dst_y,
|
|
|
|
dst_width, dst_height,
|
|
|
|
bmp->width,
|
|
|
|
bmp->height,
|
|
|
|
bmp->format &
|
|
|
|
~COGL_PREMULT_BIT,
|
|
|
|
bmp->rowstride,
|
|
|
|
bmp->data);
|
|
|
|
|
2009-12-04 13:06:32 +00:00
|
|
|
else
|
|
|
|
/* Otherwise we can just forward on to the sub texture */
|
2010-07-08 14:15:22 +00:00
|
|
|
return _cogl_texture_set_region_from_bitmap (atlas_tex->sub_texture,
|
|
|
|
src_x, src_y,
|
|
|
|
dst_x, dst_y,
|
|
|
|
dst_width, dst_height,
|
|
|
|
bmp);
|
2009-12-04 13:06:32 +00:00
|
|
|
}
|
|
|
|
|
2010-07-08 12:54:37 +00:00
|
|
|
static gboolean
|
2009-12-04 13:06:32 +00:00
|
|
|
_cogl_atlas_texture_get_data (CoglTexture *tex,
|
|
|
|
CoglPixelFormat format,
|
|
|
|
unsigned int rowstride,
|
|
|
|
guint8 *data)
|
|
|
|
{
|
|
|
|
CoglAtlasTexture *atlas_tex = COGL_ATLAS_TEXTURE (tex);
|
|
|
|
|
|
|
|
/* Forward on to the sub texture */
|
|
|
|
return cogl_texture_get_data (atlas_tex->sub_texture,
|
|
|
|
format,
|
|
|
|
rowstride,
|
|
|
|
data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static CoglPixelFormat
|
|
|
|
_cogl_atlas_texture_get_format (CoglTexture *tex)
|
|
|
|
{
|
|
|
|
CoglAtlasTexture *atlas_tex = COGL_ATLAS_TEXTURE (tex);
|
|
|
|
|
|
|
|
/* We don't want to forward this on the sub-texture because it isn't
|
|
|
|
the necessarily the same format. This will happen if the texture
|
|
|
|
isn't pre-multiplied */
|
|
|
|
return atlas_tex->format;
|
|
|
|
}
|
|
|
|
|
|
|
|
static GLenum
|
|
|
|
_cogl_atlas_texture_get_gl_format (CoglTexture *tex)
|
|
|
|
{
|
|
|
|
CoglAtlasTexture *atlas_tex = COGL_ATLAS_TEXTURE (tex);
|
|
|
|
|
|
|
|
/* Forward on to the sub texture */
|
|
|
|
return _cogl_texture_get_gl_format (atlas_tex->sub_texture);
|
|
|
|
}
|
|
|
|
|
cogl: improves header and coding style consistency
We've had complaints that our Cogl code/headers are a bit "special" so
this is a first pass at tidying things up by giving them some
consistency. These changes are all consistent with how new code in Cogl
is being written, but the style isn't consistently applied across all
code yet.
There are two parts to this patch; but since each one required a large
amount of effort to maintain tidy indenting it made sense to combine the
changes to reduce the time spent re indenting the same lines.
The first change is to use a consistent style for declaring function
prototypes in headers. Cogl headers now consistently use this style for
prototypes:
return_type
cogl_function_name (CoglType arg0,
CoglType arg1);
Not everyone likes this style, but it seems that most of the currently
active Cogl developers agree on it.
The second change is to constrain the use of redundant glib data types
in Cogl. Uses of gint, guint, gfloat, glong, gulong and gchar have all
been replaced with int, unsigned int, float, long, unsigned long and char
respectively. When talking about pixel data; use of guchar has been
replaced with guint8, otherwise unsigned char can be used.
The glib types that we continue to use for portability are gboolean,
gint{8,16,32,64}, guint{8,16,32,64} and gsize.
The general intention is that Cogl should look palatable to the widest
range of C programmers including those outside the Gnome community so
- especially for the public API - we want to minimize the number of
foreign looking typedefs.
2010-02-10 01:57:32 +00:00
|
|
|
static int
|
2009-12-04 13:06:32 +00:00
|
|
|
_cogl_atlas_texture_get_width (CoglTexture *tex)
|
|
|
|
{
|
|
|
|
CoglAtlasTexture *atlas_tex = COGL_ATLAS_TEXTURE (tex);
|
|
|
|
|
|
|
|
/* Forward on to the sub texture */
|
|
|
|
return cogl_texture_get_width (atlas_tex->sub_texture);
|
|
|
|
}
|
|
|
|
|
cogl: improves header and coding style consistency
We've had complaints that our Cogl code/headers are a bit "special" so
this is a first pass at tidying things up by giving them some
consistency. These changes are all consistent with how new code in Cogl
is being written, but the style isn't consistently applied across all
code yet.
There are two parts to this patch; but since each one required a large
amount of effort to maintain tidy indenting it made sense to combine the
changes to reduce the time spent re indenting the same lines.
The first change is to use a consistent style for declaring function
prototypes in headers. Cogl headers now consistently use this style for
prototypes:
return_type
cogl_function_name (CoglType arg0,
CoglType arg1);
Not everyone likes this style, but it seems that most of the currently
active Cogl developers agree on it.
The second change is to constrain the use of redundant glib data types
in Cogl. Uses of gint, guint, gfloat, glong, gulong and gchar have all
been replaced with int, unsigned int, float, long, unsigned long and char
respectively. When talking about pixel data; use of guchar has been
replaced with guint8, otherwise unsigned char can be used.
The glib types that we continue to use for portability are gboolean,
gint{8,16,32,64}, guint{8,16,32,64} and gsize.
The general intention is that Cogl should look palatable to the widest
range of C programmers including those outside the Gnome community so
- especially for the public API - we want to minimize the number of
foreign looking typedefs.
2010-02-10 01:57:32 +00:00
|
|
|
static int
|
2009-12-04 13:06:32 +00:00
|
|
|
_cogl_atlas_texture_get_height (CoglTexture *tex)
|
|
|
|
{
|
|
|
|
CoglAtlasTexture *atlas_tex = COGL_ATLAS_TEXTURE (tex);
|
|
|
|
|
|
|
|
/* Forward on to the sub texture */
|
|
|
|
return cogl_texture_get_height (atlas_tex->sub_texture);
|
|
|
|
}
|
|
|
|
|
2009-12-04 18:24:15 +00:00
|
|
|
static CoglHandle
|
2010-01-29 12:19:42 +00:00
|
|
|
_cogl_atlas_texture_create_sub_texture (CoglHandle full_texture,
|
2009-12-04 18:24:15 +00:00
|
|
|
const CoglAtlasRectangle *rectangle)
|
|
|
|
{
|
|
|
|
/* Create a subtexture for the given rectangle not including the
|
|
|
|
1-pixel border */
|
2010-01-18 09:22:04 +00:00
|
|
|
return _cogl_sub_texture_new (full_texture,
|
|
|
|
rectangle->x + 1,
|
|
|
|
rectangle->y + 1,
|
|
|
|
rectangle->width - 2,
|
|
|
|
rectangle->height - 2);
|
2009-12-04 18:24:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
typedef struct _CoglAtlasTextureRepositionData
|
|
|
|
{
|
|
|
|
/* The current texture which already has a position */
|
|
|
|
CoglAtlasTexture *texture;
|
|
|
|
/* The new position of the texture */
|
|
|
|
CoglAtlasRectangle new_position;
|
|
|
|
} CoglAtlasTextureRepositionData;
|
|
|
|
|
|
|
|
static void
|
cogl: improves header and coding style consistency
We've had complaints that our Cogl code/headers are a bit "special" so
this is a first pass at tidying things up by giving them some
consistency. These changes are all consistent with how new code in Cogl
is being written, but the style isn't consistently applied across all
code yet.
There are two parts to this patch; but since each one required a large
amount of effort to maintain tidy indenting it made sense to combine the
changes to reduce the time spent re indenting the same lines.
The first change is to use a consistent style for declaring function
prototypes in headers. Cogl headers now consistently use this style for
prototypes:
return_type
cogl_function_name (CoglType arg0,
CoglType arg1);
Not everyone likes this style, but it seems that most of the currently
active Cogl developers agree on it.
The second change is to constrain the use of redundant glib data types
in Cogl. Uses of gint, guint, gfloat, glong, gulong and gchar have all
been replaced with int, unsigned int, float, long, unsigned long and char
respectively. When talking about pixel data; use of guchar has been
replaced with guint8, otherwise unsigned char can be used.
The glib types that we continue to use for portability are gboolean,
gint{8,16,32,64}, guint{8,16,32,64} and gsize.
The general intention is that Cogl should look palatable to the widest
range of C programmers including those outside the Gnome community so
- especially for the public API - we want to minimize the number of
foreign looking typedefs.
2010-02-10 01:57:32 +00:00
|
|
|
_cogl_atlas_texture_migrate (unsigned int n_textures,
|
2009-12-04 18:24:15 +00:00
|
|
|
CoglAtlasTextureRepositionData *textures,
|
|
|
|
CoglHandle old_texture,
|
|
|
|
CoglHandle new_texture,
|
|
|
|
CoglAtlasTexture *skip_texture)
|
|
|
|
{
|
cogl: improves header and coding style consistency
We've had complaints that our Cogl code/headers are a bit "special" so
this is a first pass at tidying things up by giving them some
consistency. These changes are all consistent with how new code in Cogl
is being written, but the style isn't consistently applied across all
code yet.
There are two parts to this patch; but since each one required a large
amount of effort to maintain tidy indenting it made sense to combine the
changes to reduce the time spent re indenting the same lines.
The first change is to use a consistent style for declaring function
prototypes in headers. Cogl headers now consistently use this style for
prototypes:
return_type
cogl_function_name (CoglType arg0,
CoglType arg1);
Not everyone likes this style, but it seems that most of the currently
active Cogl developers agree on it.
The second change is to constrain the use of redundant glib data types
in Cogl. Uses of gint, guint, gfloat, glong, gulong and gchar have all
been replaced with int, unsigned int, float, long, unsigned long and char
respectively. When talking about pixel data; use of guchar has been
replaced with guint8, otherwise unsigned char can be used.
The glib types that we continue to use for portability are gboolean,
gint{8,16,32,64}, guint{8,16,32,64} and gsize.
The general intention is that Cogl should look palatable to the widest
range of C programmers including those outside the Gnome community so
- especially for the public API - we want to minimize the number of
foreign looking typedefs.
2010-02-10 01:57:32 +00:00
|
|
|
unsigned int i;
|
2009-12-05 13:24:01 +00:00
|
|
|
CoglAtlasTextureBlitData blit_data;
|
|
|
|
|
2010-06-04 15:42:30 +00:00
|
|
|
/* We don't know if any materials may currently be referenced in the
|
|
|
|
* journal that depend on the current underlying GL texture storage
|
|
|
|
* so we flush the journal before migrating.
|
|
|
|
*
|
|
|
|
* We are assuming that texture atlas migration never happens during
|
|
|
|
* a flush so we don't have to consider recursion here.
|
|
|
|
*/
|
|
|
|
_cogl_journal_flush ();
|
|
|
|
|
2010-06-09 13:42:18 +00:00
|
|
|
_cogl_atlas_texture_blit_begin (&blit_data, new_texture, old_texture);
|
|
|
|
|
2009-12-04 18:24:15 +00:00
|
|
|
for (i = 0; i < n_textures; i++)
|
|
|
|
{
|
2010-04-08 11:21:04 +00:00
|
|
|
/* Notify cogl-material.c that the texture's underlying GL texture
|
|
|
|
* storage is changing so it knows it may need to bind a new texture
|
|
|
|
* if the CoglTexture is reused with the same texture unit. */
|
|
|
|
_cogl_material_texture_storage_change_notify (textures[i].texture);
|
|
|
|
|
2009-12-04 18:24:15 +00:00
|
|
|
/* Skip the texture that is being added because it doesn't contain
|
|
|
|
any data yet */
|
|
|
|
if (textures[i].texture != skip_texture)
|
|
|
|
{
|
2009-12-05 13:24:01 +00:00
|
|
|
_cogl_atlas_texture_blit (&blit_data,
|
|
|
|
textures[i].texture->rectangle.x,
|
|
|
|
textures[i].texture->rectangle.y,
|
|
|
|
textures[i].new_position.x,
|
|
|
|
textures[i].new_position.y,
|
|
|
|
textures[i].new_position.width,
|
|
|
|
textures[i].new_position.height);
|
2009-12-04 18:24:15 +00:00
|
|
|
/* Update the sub texture */
|
|
|
|
cogl_handle_unref (textures[i].texture->sub_texture);
|
|
|
|
textures[i].texture->sub_texture =
|
|
|
|
_cogl_atlas_texture_create_sub_texture (new_texture,
|
|
|
|
&textures[i].new_position);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Update the texture position */
|
|
|
|
textures[i].texture->rectangle = textures[i].new_position;
|
|
|
|
}
|
|
|
|
|
2009-12-05 13:24:01 +00:00
|
|
|
_cogl_atlas_texture_blit_end (&blit_data);
|
2009-12-04 18:24:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
typedef struct _CoglAtlasTextureGetRectanglesData
|
|
|
|
{
|
|
|
|
CoglAtlasTextureRepositionData *textures;
|
|
|
|
/* Number of textures found so far */
|
cogl: improves header and coding style consistency
We've had complaints that our Cogl code/headers are a bit "special" so
this is a first pass at tidying things up by giving them some
consistency. These changes are all consistent with how new code in Cogl
is being written, but the style isn't consistently applied across all
code yet.
There are two parts to this patch; but since each one required a large
amount of effort to maintain tidy indenting it made sense to combine the
changes to reduce the time spent re indenting the same lines.
The first change is to use a consistent style for declaring function
prototypes in headers. Cogl headers now consistently use this style for
prototypes:
return_type
cogl_function_name (CoglType arg0,
CoglType arg1);
Not everyone likes this style, but it seems that most of the currently
active Cogl developers agree on it.
The second change is to constrain the use of redundant glib data types
in Cogl. Uses of gint, guint, gfloat, glong, gulong and gchar have all
been replaced with int, unsigned int, float, long, unsigned long and char
respectively. When talking about pixel data; use of guchar has been
replaced with guint8, otherwise unsigned char can be used.
The glib types that we continue to use for portability are gboolean,
gint{8,16,32,64}, guint{8,16,32,64} and gsize.
The general intention is that Cogl should look palatable to the widest
range of C programmers including those outside the Gnome community so
- especially for the public API - we want to minimize the number of
foreign looking typedefs.
2010-02-10 01:57:32 +00:00
|
|
|
unsigned int n_textures;
|
2009-12-04 18:24:15 +00:00
|
|
|
} CoglAtlasTextureGetRectanglesData;
|
|
|
|
|
|
|
|
static void
|
|
|
|
_cogl_atlas_texture_get_rectangles_cb (const CoglAtlasRectangle *rectangle,
|
|
|
|
gpointer rectangle_data,
|
|
|
|
gpointer user_data)
|
|
|
|
{
|
|
|
|
CoglAtlasTextureGetRectanglesData *data = user_data;
|
|
|
|
|
|
|
|
data->textures[data->n_textures++].texture = rectangle_data;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
cogl: improves header and coding style consistency
We've had complaints that our Cogl code/headers are a bit "special" so
this is a first pass at tidying things up by giving them some
consistency. These changes are all consistent with how new code in Cogl
is being written, but the style isn't consistently applied across all
code yet.
There are two parts to this patch; but since each one required a large
amount of effort to maintain tidy indenting it made sense to combine the
changes to reduce the time spent re indenting the same lines.
The first change is to use a consistent style for declaring function
prototypes in headers. Cogl headers now consistently use this style for
prototypes:
return_type
cogl_function_name (CoglType arg0,
CoglType arg1);
Not everyone likes this style, but it seems that most of the currently
active Cogl developers agree on it.
The second change is to constrain the use of redundant glib data types
in Cogl. Uses of gint, guint, gfloat, glong, gulong and gchar have all
been replaced with int, unsigned int, float, long, unsigned long and char
respectively. When talking about pixel data; use of guchar has been
replaced with guint8, otherwise unsigned char can be used.
The glib types that we continue to use for portability are gboolean,
gint{8,16,32,64}, guint{8,16,32,64} and gsize.
The general intention is that Cogl should look palatable to the widest
range of C programmers including those outside the Gnome community so
- especially for the public API - we want to minimize the number of
foreign looking typedefs.
2010-02-10 01:57:32 +00:00
|
|
|
_cogl_atlas_texture_get_next_size (unsigned int *atlas_width,
|
|
|
|
unsigned int *atlas_height)
|
2009-12-04 18:24:15 +00:00
|
|
|
{
|
|
|
|
/* Double the size of the texture by increasing whichever dimension
|
|
|
|
is smaller */
|
|
|
|
if (*atlas_width < *atlas_height)
|
|
|
|
*atlas_width <<= 1;
|
|
|
|
else
|
|
|
|
*atlas_height <<= 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static CoglAtlas *
|
cogl: improves header and coding style consistency
We've had complaints that our Cogl code/headers are a bit "special" so
this is a first pass at tidying things up by giving them some
consistency. These changes are all consistent with how new code in Cogl
is being written, but the style isn't consistently applied across all
code yet.
There are two parts to this patch; but since each one required a large
amount of effort to maintain tidy indenting it made sense to combine the
changes to reduce the time spent re indenting the same lines.
The first change is to use a consistent style for declaring function
prototypes in headers. Cogl headers now consistently use this style for
prototypes:
return_type
cogl_function_name (CoglType arg0,
CoglType arg1);
Not everyone likes this style, but it seems that most of the currently
active Cogl developers agree on it.
The second change is to constrain the use of redundant glib data types
in Cogl. Uses of gint, guint, gfloat, glong, gulong and gchar have all
been replaced with int, unsigned int, float, long, unsigned long and char
respectively. When talking about pixel data; use of guchar has been
replaced with guint8, otherwise unsigned char can be used.
The glib types that we continue to use for portability are gboolean,
gint{8,16,32,64}, guint{8,16,32,64} and gsize.
The general intention is that Cogl should look palatable to the widest
range of C programmers including those outside the Gnome community so
- especially for the public API - we want to minimize the number of
foreign looking typedefs.
2010-02-10 01:57:32 +00:00
|
|
|
_cogl_atlas_texture_create_atlas (unsigned int atlas_width,
|
|
|
|
unsigned int atlas_height,
|
|
|
|
unsigned int n_textures,
|
2009-12-04 18:24:15 +00:00
|
|
|
CoglAtlasTextureRepositionData *textures)
|
|
|
|
{
|
|
|
|
GLint max_texture_size = 1024;
|
|
|
|
|
|
|
|
GE( glGetIntegerv (GL_MAX_TEXTURE_SIZE, &max_texture_size) );
|
|
|
|
|
|
|
|
/* Sanity check that we're not going to get stuck in an infinite
|
|
|
|
loop if the maximum texture size has the high bit set */
|
|
|
|
if ((max_texture_size & (1 << (sizeof (GLint) * 8 - 2))))
|
|
|
|
max_texture_size >>= 1;
|
|
|
|
|
|
|
|
/* Keep trying increasingly larger atlases until we can fit all of
|
|
|
|
the textures */
|
|
|
|
while (atlas_width < max_texture_size && atlas_height < max_texture_size)
|
|
|
|
{
|
2010-02-03 19:54:12 +00:00
|
|
|
CoglAtlas *new_atlas = _cogl_atlas_new (atlas_width, atlas_height, NULL);
|
cogl: improves header and coding style consistency
We've had complaints that our Cogl code/headers are a bit "special" so
this is a first pass at tidying things up by giving them some
consistency. These changes are all consistent with how new code in Cogl
is being written, but the style isn't consistently applied across all
code yet.
There are two parts to this patch; but since each one required a large
amount of effort to maintain tidy indenting it made sense to combine the
changes to reduce the time spent re indenting the same lines.
The first change is to use a consistent style for declaring function
prototypes in headers. Cogl headers now consistently use this style for
prototypes:
return_type
cogl_function_name (CoglType arg0,
CoglType arg1);
Not everyone likes this style, but it seems that most of the currently
active Cogl developers agree on it.
The second change is to constrain the use of redundant glib data types
in Cogl. Uses of gint, guint, gfloat, glong, gulong and gchar have all
been replaced with int, unsigned int, float, long, unsigned long and char
respectively. When talking about pixel data; use of guchar has been
replaced with guint8, otherwise unsigned char can be used.
The glib types that we continue to use for portability are gboolean,
gint{8,16,32,64}, guint{8,16,32,64} and gsize.
The general intention is that Cogl should look palatable to the widest
range of C programmers including those outside the Gnome community so
- especially for the public API - we want to minimize the number of
foreign looking typedefs.
2010-02-10 01:57:32 +00:00
|
|
|
unsigned int i;
|
2009-12-04 18:24:15 +00:00
|
|
|
|
|
|
|
/* Add all of the textures and keep track of the new position */
|
|
|
|
for (i = 0; i < n_textures; i++)
|
2010-02-03 19:54:12 +00:00
|
|
|
if (!_cogl_atlas_add_rectangle (new_atlas,
|
|
|
|
textures[i].texture->rectangle.width,
|
|
|
|
textures[i].texture->rectangle.height,
|
|
|
|
textures[i].texture,
|
|
|
|
&textures[i].new_position))
|
2009-12-04 18:24:15 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
/* If the atlas can contain all of the textures then we have a
|
|
|
|
winner */
|
|
|
|
if (i >= n_textures)
|
|
|
|
return new_atlas;
|
|
|
|
|
2010-02-03 19:54:12 +00:00
|
|
|
_cogl_atlas_free (new_atlas);
|
2009-12-04 18:24:15 +00:00
|
|
|
_cogl_atlas_texture_get_next_size (&atlas_width, &atlas_height);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If we get here then there's no atlas that can accommodate all of
|
|
|
|
the rectangles */
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
_cogl_atlas_texture_compare_size_cb (const void *a,
|
|
|
|
const void *b)
|
|
|
|
{
|
|
|
|
const CoglAtlasTextureRepositionData *ta = a;
|
|
|
|
const CoglAtlasTextureRepositionData *tb = b;
|
cogl: improves header and coding style consistency
We've had complaints that our Cogl code/headers are a bit "special" so
this is a first pass at tidying things up by giving them some
consistency. These changes are all consistent with how new code in Cogl
is being written, but the style isn't consistently applied across all
code yet.
There are two parts to this patch; but since each one required a large
amount of effort to maintain tidy indenting it made sense to combine the
changes to reduce the time spent re indenting the same lines.
The first change is to use a consistent style for declaring function
prototypes in headers. Cogl headers now consistently use this style for
prototypes:
return_type
cogl_function_name (CoglType arg0,
CoglType arg1);
Not everyone likes this style, but it seems that most of the currently
active Cogl developers agree on it.
The second change is to constrain the use of redundant glib data types
in Cogl. Uses of gint, guint, gfloat, glong, gulong and gchar have all
been replaced with int, unsigned int, float, long, unsigned long and char
respectively. When talking about pixel data; use of guchar has been
replaced with guint8, otherwise unsigned char can be used.
The glib types that we continue to use for portability are gboolean,
gint{8,16,32,64}, guint{8,16,32,64} and gsize.
The general intention is that Cogl should look palatable to the widest
range of C programmers including those outside the Gnome community so
- especially for the public API - we want to minimize the number of
foreign looking typedefs.
2010-02-10 01:57:32 +00:00
|
|
|
unsigned int a_size, b_size;
|
2009-12-04 18:24:15 +00:00
|
|
|
|
|
|
|
a_size = ta->texture->rectangle.width * ta->texture->rectangle.height;
|
|
|
|
b_size = tb->texture->rectangle.width * tb->texture->rectangle.height;
|
|
|
|
|
|
|
|
return a_size < b_size ? 1 : a_size > b_size ? -1 : 0;
|
|
|
|
}
|
|
|
|
|
2009-12-04 13:06:32 +00:00
|
|
|
static gboolean
|
2010-01-29 12:19:42 +00:00
|
|
|
_cogl_atlas_texture_reserve_space (CoglAtlasTexture *new_sub_tex,
|
cogl: improves header and coding style consistency
We've had complaints that our Cogl code/headers are a bit "special" so
this is a first pass at tidying things up by giving them some
consistency. These changes are all consistent with how new code in Cogl
is being written, but the style isn't consistently applied across all
code yet.
There are two parts to this patch; but since each one required a large
amount of effort to maintain tidy indenting it made sense to combine the
changes to reduce the time spent re indenting the same lines.
The first change is to use a consistent style for declaring function
prototypes in headers. Cogl headers now consistently use this style for
prototypes:
return_type
cogl_function_name (CoglType arg0,
CoglType arg1);
Not everyone likes this style, but it seems that most of the currently
active Cogl developers agree on it.
The second change is to constrain the use of redundant glib data types
in Cogl. Uses of gint, guint, gfloat, glong, gulong and gchar have all
been replaced with int, unsigned int, float, long, unsigned long and char
respectively. When talking about pixel data; use of guchar has been
replaced with guint8, otherwise unsigned char can be used.
The glib types that we continue to use for portability are gboolean,
gint{8,16,32,64}, guint{8,16,32,64} and gsize.
The general intention is that Cogl should look palatable to the widest
range of C programmers including those outside the Gnome community so
- especially for the public API - we want to minimize the number of
foreign looking typedefs.
2010-02-10 01:57:32 +00:00
|
|
|
unsigned int width,
|
|
|
|
unsigned int height)
|
2009-12-04 13:06:32 +00:00
|
|
|
{
|
2009-12-04 18:24:15 +00:00
|
|
|
CoglAtlasTextureGetRectanglesData data;
|
|
|
|
CoglAtlas *new_atlas;
|
|
|
|
CoglHandle new_tex;
|
cogl: improves header and coding style consistency
We've had complaints that our Cogl code/headers are a bit "special" so
this is a first pass at tidying things up by giving them some
consistency. These changes are all consistent with how new code in Cogl
is being written, but the style isn't consistently applied across all
code yet.
There are two parts to this patch; but since each one required a large
amount of effort to maintain tidy indenting it made sense to combine the
changes to reduce the time spent re indenting the same lines.
The first change is to use a consistent style for declaring function
prototypes in headers. Cogl headers now consistently use this style for
prototypes:
return_type
cogl_function_name (CoglType arg0,
CoglType arg1);
Not everyone likes this style, but it seems that most of the currently
active Cogl developers agree on it.
The second change is to constrain the use of redundant glib data types
in Cogl. Uses of gint, guint, gfloat, glong, gulong and gchar have all
been replaced with int, unsigned int, float, long, unsigned long and char
respectively. When talking about pixel data; use of guchar has been
replaced with guint8, otherwise unsigned char can be used.
The glib types that we continue to use for portability are gboolean,
gint{8,16,32,64}, guint{8,16,32,64} and gsize.
The general intention is that Cogl should look palatable to the widest
range of C programmers including those outside the Gnome community so
- especially for the public API - we want to minimize the number of
foreign looking typedefs.
2010-02-10 01:57:32 +00:00
|
|
|
unsigned int atlas_width, atlas_height;
|
2009-12-04 18:24:15 +00:00
|
|
|
gboolean ret;
|
|
|
|
|
2009-12-04 13:06:32 +00:00
|
|
|
_COGL_GET_CONTEXT (ctx, FALSE);
|
|
|
|
|
2009-12-04 18:24:15 +00:00
|
|
|
/* Check if we can fit the rectangle into the existing atlas */
|
2010-02-03 19:54:12 +00:00
|
|
|
if (ctx->atlas && _cogl_atlas_add_rectangle (ctx->atlas, width, height,
|
2009-12-04 18:24:15 +00:00
|
|
|
new_sub_tex,
|
|
|
|
&new_sub_tex->rectangle))
|
2009-12-04 18:55:53 +00:00
|
|
|
{
|
|
|
|
COGL_NOTE (ATLAS, "Atlas is %ix%i, has %i textures and is %i%% waste",
|
2010-02-03 19:54:12 +00:00
|
|
|
_cogl_atlas_get_width (ctx->atlas),
|
|
|
|
_cogl_atlas_get_height (ctx->atlas),
|
|
|
|
_cogl_atlas_get_n_rectangles (ctx->atlas),
|
|
|
|
_cogl_atlas_get_remaining_space (ctx->atlas) * 100 /
|
|
|
|
(_cogl_atlas_get_width (ctx->atlas) *
|
|
|
|
_cogl_atlas_get_height (ctx->atlas)));
|
2010-01-29 12:19:42 +00:00
|
|
|
|
2009-12-04 18:55:53 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
2009-12-04 18:24:15 +00:00
|
|
|
|
|
|
|
/* We need to reorganise the atlas so we'll get an array of all the
|
|
|
|
textures currently in the atlas. */
|
|
|
|
data.n_textures = 0;
|
2010-01-29 12:19:42 +00:00
|
|
|
if (ctx->atlas == NULL)
|
2009-12-04 18:24:15 +00:00
|
|
|
data.textures = g_malloc (sizeof (CoglAtlasTextureRepositionData));
|
|
|
|
else
|
|
|
|
{
|
2010-02-03 19:54:12 +00:00
|
|
|
data.textures =
|
|
|
|
g_malloc (sizeof (CoglAtlasTextureRepositionData) *
|
|
|
|
(_cogl_atlas_get_n_rectangles (ctx->atlas) + 1));
|
|
|
|
_cogl_atlas_foreach (ctx->atlas, _cogl_atlas_texture_get_rectangles_cb,
|
|
|
|
&data);
|
2009-12-04 18:24:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Add the new rectangle as a dummy texture so that it can be
|
|
|
|
positioned with the rest */
|
|
|
|
data.textures[data.n_textures++].texture = new_sub_tex;
|
|
|
|
|
|
|
|
/* The atlasing algorithm works a lot better if the rectangles are
|
|
|
|
added in decreasing order of size so we'll first sort the
|
|
|
|
array */
|
|
|
|
qsort (data.textures, data.n_textures,
|
|
|
|
sizeof (CoglAtlasTextureRepositionData),
|
|
|
|
_cogl_atlas_texture_compare_size_cb);
|
|
|
|
|
|
|
|
/* Try to create a new atlas that can contain all of the textures */
|
2010-01-29 12:19:42 +00:00
|
|
|
if (ctx->atlas)
|
2009-12-04 18:24:15 +00:00
|
|
|
{
|
2010-02-03 19:54:12 +00:00
|
|
|
atlas_width = _cogl_atlas_get_width (ctx->atlas);
|
|
|
|
atlas_height = _cogl_atlas_get_height (ctx->atlas);
|
2009-12-04 18:24:15 +00:00
|
|
|
|
|
|
|
/* If there is enough space in the existing for the new
|
|
|
|
rectangle in the existing atlas we'll start with the same
|
|
|
|
size, otherwise we'll immediately double it */
|
2010-02-03 19:54:12 +00:00
|
|
|
if (_cogl_atlas_get_remaining_space (ctx->atlas) < width * height)
|
2009-12-04 18:24:15 +00:00
|
|
|
_cogl_atlas_texture_get_next_size (&atlas_width, &atlas_height);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Start with an initial size of 256x256 */
|
|
|
|
atlas_width = 256;
|
|
|
|
atlas_height = 256;
|
|
|
|
}
|
|
|
|
|
|
|
|
new_atlas = _cogl_atlas_texture_create_atlas (atlas_width, atlas_height,
|
|
|
|
data.n_textures, data.textures);
|
|
|
|
|
|
|
|
/* If we can't create an atlas with the texture then give up */
|
|
|
|
if (new_atlas == NULL)
|
2009-12-04 18:55:53 +00:00
|
|
|
{
|
|
|
|
COGL_NOTE (ATLAS, "Could not fit texture in the atlas");
|
|
|
|
ret = FALSE;
|
|
|
|
}
|
2010-02-16 11:58:47 +00:00
|
|
|
/* We need to migrate the existing textures into a new texture */
|
|
|
|
else if ((new_tex =
|
|
|
|
_cogl_texture_2d_new_with_size (_cogl_atlas_get_width (new_atlas),
|
|
|
|
_cogl_atlas_get_height (new_atlas),
|
|
|
|
COGL_TEXTURE_NONE,
|
|
|
|
COGL_PIXEL_FORMAT_RGBA_8888)) ==
|
|
|
|
COGL_INVALID_HANDLE)
|
|
|
|
{
|
|
|
|
COGL_NOTE (ATLAS, "Could not create a CoglTexture2D");
|
|
|
|
_cogl_atlas_free (new_atlas);
|
|
|
|
ret = FALSE;
|
|
|
|
}
|
2009-12-04 18:24:15 +00:00
|
|
|
else
|
|
|
|
{
|
2009-12-04 18:55:53 +00:00
|
|
|
COGL_NOTE (ATLAS,
|
|
|
|
"Atlas %s with size %ix%i",
|
2010-01-29 12:19:42 +00:00
|
|
|
ctx->atlas == NULL ||
|
2010-02-03 19:54:12 +00:00
|
|
|
_cogl_atlas_get_width (ctx->atlas) !=
|
|
|
|
_cogl_atlas_get_width (new_atlas) ||
|
|
|
|
_cogl_atlas_get_height (ctx->atlas) !=
|
|
|
|
_cogl_atlas_get_height (new_atlas) ?
|
2009-12-04 18:55:53 +00:00
|
|
|
"resized" : "reorganized",
|
2010-02-03 19:54:12 +00:00
|
|
|
_cogl_atlas_get_width (new_atlas),
|
|
|
|
_cogl_atlas_get_height (new_atlas));
|
2009-12-04 18:55:53 +00:00
|
|
|
|
2010-01-29 12:19:42 +00:00
|
|
|
if (ctx->atlas)
|
2009-12-04 18:24:15 +00:00
|
|
|
{
|
|
|
|
/* Move all the textures to the right position in the new
|
|
|
|
texture. This will also update the texture's rectangle */
|
|
|
|
_cogl_atlas_texture_migrate (data.n_textures,
|
|
|
|
data.textures,
|
2010-01-29 12:19:42 +00:00
|
|
|
ctx->atlas_texture,
|
2009-12-04 18:24:15 +00:00
|
|
|
new_tex,
|
|
|
|
new_sub_tex);
|
2010-02-03 19:54:12 +00:00
|
|
|
_cogl_atlas_free (ctx->atlas);
|
2010-01-29 12:19:42 +00:00
|
|
|
cogl_handle_unref (ctx->atlas_texture);
|
2009-12-04 18:24:15 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
/* We know there's only one texture so we can just directly
|
|
|
|
update the rectangle from its new position */
|
|
|
|
data.textures[0].texture->rectangle = data.textures[0].new_position;
|
|
|
|
|
2010-01-29 12:19:42 +00:00
|
|
|
ctx->atlas = new_atlas;
|
|
|
|
ctx->atlas_texture = new_tex;
|
2009-12-04 18:24:15 +00:00
|
|
|
|
2009-12-04 18:55:53 +00:00
|
|
|
COGL_NOTE (ATLAS, "Atlas is %ix%i, has %i textures and is %i%% waste",
|
2010-02-03 19:54:12 +00:00
|
|
|
_cogl_atlas_get_width (ctx->atlas),
|
|
|
|
_cogl_atlas_get_height (ctx->atlas),
|
|
|
|
_cogl_atlas_get_n_rectangles (ctx->atlas),
|
|
|
|
_cogl_atlas_get_remaining_space (ctx->atlas) * 100 /
|
|
|
|
(_cogl_atlas_get_width (ctx->atlas) *
|
|
|
|
_cogl_atlas_get_height (ctx->atlas)));
|
2009-12-04 18:55:53 +00:00
|
|
|
|
2009-12-04 18:24:15 +00:00
|
|
|
ret = TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
g_free (data.textures);
|
|
|
|
|
|
|
|
return ret;
|
2009-12-04 13:06:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
CoglHandle
|
|
|
|
_cogl_atlas_texture_new_from_bitmap (CoglHandle bmp_handle,
|
|
|
|
CoglTextureFlags flags,
|
|
|
|
CoglPixelFormat internal_format)
|
|
|
|
{
|
2010-02-01 12:11:58 +00:00
|
|
|
CoglAtlasTexture *atlas_tex;
|
|
|
|
CoglBitmap *bmp = (CoglBitmap *) bmp_handle;
|
|
|
|
CoglBitmap dst_bmp;
|
|
|
|
gboolean dst_bmp_owner;
|
|
|
|
GLenum gl_intformat;
|
|
|
|
GLenum gl_format;
|
|
|
|
GLenum gl_type;
|
2009-12-04 13:06:32 +00:00
|
|
|
|
|
|
|
_COGL_GET_CONTEXT (ctx, COGL_INVALID_HANDLE);
|
|
|
|
|
|
|
|
g_return_val_if_fail (bmp_handle != COGL_INVALID_HANDLE, COGL_INVALID_HANDLE);
|
|
|
|
|
2010-01-21 15:34:19 +00:00
|
|
|
/* Don't put textures in the atlas if the user has explicitly
|
|
|
|
requested to disable it */
|
|
|
|
if (G_UNLIKELY (cogl_debug_flags & COGL_DEBUG_DISABLE_ATLAS))
|
|
|
|
return COGL_INVALID_HANDLE;
|
|
|
|
|
2009-12-04 13:06:32 +00:00
|
|
|
/* We can't put the texture in the atlas if there are any special
|
|
|
|
flags. This precludes textures with COGL_TEXTURE_NO_ATLAS and
|
|
|
|
COGL_TEXTURE_NO_SLICING from being atlased */
|
|
|
|
if (flags)
|
|
|
|
return COGL_INVALID_HANDLE;
|
|
|
|
|
|
|
|
/* We can't atlas zero-sized textures because it breaks the atlas
|
|
|
|
data structure */
|
|
|
|
if (bmp->width < 1 || bmp->height < 1)
|
|
|
|
return COGL_INVALID_HANDLE;
|
|
|
|
|
2010-02-16 12:01:18 +00:00
|
|
|
/* If we can't use FBOs or we can't read back texture data then it
|
|
|
|
will be too slow to migrate textures and we shouldn't use the
|
|
|
|
atlas */
|
|
|
|
if (!cogl_features_available (COGL_FEATURE_TEXTURE_READ_PIXELS) ||
|
|
|
|
!cogl_features_available (COGL_FEATURE_OFFSCREEN))
|
2009-12-04 13:06:32 +00:00
|
|
|
return COGL_INVALID_HANDLE;
|
|
|
|
|
2009-12-04 18:55:53 +00:00
|
|
|
COGL_NOTE (ATLAS, "Adding texture of size %ix%i", bmp->width, bmp->height);
|
|
|
|
|
2010-02-03 22:54:44 +00:00
|
|
|
internal_format = _cogl_texture_determine_internal_format (bmp->format,
|
|
|
|
internal_format);
|
2010-02-01 12:11:58 +00:00
|
|
|
|
2009-12-04 13:06:32 +00:00
|
|
|
/* If the texture is in a strange format then we can't use it */
|
|
|
|
if (internal_format != COGL_PIXEL_FORMAT_RGB_888 &&
|
|
|
|
(internal_format & ~COGL_PREMULT_BIT) != COGL_PIXEL_FORMAT_RGBA_8888)
|
|
|
|
{
|
2009-12-04 18:55:53 +00:00
|
|
|
COGL_NOTE (ATLAS, "Texture can not be added because the "
|
|
|
|
"format is unsupported");
|
|
|
|
|
2009-12-04 13:06:32 +00:00
|
|
|
return COGL_INVALID_HANDLE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We need to allocate the texture now because we need the pointer
|
|
|
|
to set as the data for the rectangle in the atlas */
|
|
|
|
atlas_tex = g_new (CoglAtlasTexture, 1);
|
2009-12-04 18:24:15 +00:00
|
|
|
/* We need to fill in the texture size now because it is used in the
|
|
|
|
reserve_space function below. We add two pixels for the border */
|
2010-02-01 12:11:58 +00:00
|
|
|
atlas_tex->rectangle.width = bmp->width + 2;
|
|
|
|
atlas_tex->rectangle.height = bmp->height + 2;
|
2009-12-04 13:06:32 +00:00
|
|
|
|
|
|
|
/* Try to make some space in the atlas for the texture */
|
2010-01-29 12:19:42 +00:00
|
|
|
if (!_cogl_atlas_texture_reserve_space (atlas_tex,
|
2009-12-04 18:24:15 +00:00
|
|
|
atlas_tex->rectangle.width,
|
|
|
|
atlas_tex->rectangle.height))
|
2009-12-04 13:06:32 +00:00
|
|
|
{
|
|
|
|
g_free (atlas_tex);
|
|
|
|
return COGL_INVALID_HANDLE;
|
|
|
|
}
|
|
|
|
|
2010-02-01 12:11:58 +00:00
|
|
|
if (!_cogl_texture_prepare_for_upload (bmp,
|
|
|
|
internal_format,
|
|
|
|
&internal_format,
|
|
|
|
&dst_bmp,
|
|
|
|
&dst_bmp_owner,
|
|
|
|
&gl_intformat,
|
|
|
|
&gl_format,
|
|
|
|
&gl_type))
|
2009-12-04 13:06:32 +00:00
|
|
|
{
|
2010-02-03 19:54:12 +00:00
|
|
|
_cogl_atlas_remove_rectangle (ctx->atlas, &atlas_tex->rectangle);
|
2009-12-04 13:06:32 +00:00
|
|
|
g_free (atlas_tex);
|
|
|
|
return COGL_INVALID_HANDLE;
|
|
|
|
}
|
|
|
|
|
|
|
|
atlas_tex->_parent.vtable = &cogl_atlas_texture_vtable;
|
|
|
|
atlas_tex->format = internal_format;
|
|
|
|
atlas_tex->in_atlas = TRUE;
|
2009-12-04 18:24:15 +00:00
|
|
|
atlas_tex->sub_texture =
|
2010-01-29 12:19:42 +00:00
|
|
|
_cogl_atlas_texture_create_sub_texture (ctx->atlas_texture,
|
2009-12-04 18:24:15 +00:00
|
|
|
&atlas_tex->rectangle);
|
2009-12-04 13:06:32 +00:00
|
|
|
|
|
|
|
/* Defer to set_region so that we can share the code for copying the
|
2010-01-18 10:53:00 +00:00
|
|
|
edge pixels to the border. We don't want to pass the actual
|
|
|
|
format of the converted texture because otherwise it will get
|
|
|
|
unpremultiplied. */
|
|
|
|
_cogl_atlas_texture_set_region_with_border (atlas_tex,
|
|
|
|
0, 0,
|
|
|
|
0, 0,
|
2010-02-01 12:11:58 +00:00
|
|
|
dst_bmp.width,
|
|
|
|
dst_bmp.height,
|
|
|
|
dst_bmp.width,
|
|
|
|
dst_bmp.height,
|
|
|
|
dst_bmp.format &
|
2010-01-18 10:53:00 +00:00
|
|
|
~COGL_PREMULT_BIT,
|
2010-02-01 12:11:58 +00:00
|
|
|
dst_bmp.rowstride,
|
|
|
|
dst_bmp.data);
|
|
|
|
|
|
|
|
if (dst_bmp_owner)
|
|
|
|
g_free (dst_bmp.data);
|
2009-12-04 13:06:32 +00:00
|
|
|
|
|
|
|
return _cogl_atlas_texture_handle_new (atlas_tex);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const CoglTextureVtable
|
|
|
|
cogl_atlas_texture_vtable =
|
|
|
|
{
|
|
|
|
_cogl_atlas_texture_set_region,
|
|
|
|
_cogl_atlas_texture_get_data,
|
|
|
|
_cogl_atlas_texture_foreach_sub_texture_in_region,
|
|
|
|
_cogl_atlas_texture_get_max_waste,
|
|
|
|
_cogl_atlas_texture_is_sliced,
|
|
|
|
_cogl_atlas_texture_can_hardware_repeat,
|
|
|
|
_cogl_atlas_texture_transform_coords_to_gl,
|
2010-01-18 09:22:04 +00:00
|
|
|
_cogl_atlas_texture_transform_quad_coords_to_gl,
|
2009-12-04 13:06:32 +00:00
|
|
|
_cogl_atlas_texture_get_gl_texture,
|
|
|
|
_cogl_atlas_texture_set_filters,
|
2010-06-09 16:39:59 +00:00
|
|
|
_cogl_atlas_texture_pre_paint,
|
2010-01-18 09:22:04 +00:00
|
|
|
_cogl_atlas_texture_ensure_non_quad_rendering,
|
2010-03-25 17:29:22 +00:00
|
|
|
_cogl_atlas_texture_set_wrap_mode_parameters,
|
2009-12-04 13:06:32 +00:00
|
|
|
_cogl_atlas_texture_get_format,
|
|
|
|
_cogl_atlas_texture_get_gl_format,
|
|
|
|
_cogl_atlas_texture_get_width,
|
2010-04-26 09:01:43 +00:00
|
|
|
_cogl_atlas_texture_get_height,
|
|
|
|
NULL /* is_foreign */
|
2009-12-04 13:06:32 +00:00
|
|
|
};
|