2009-11-27 18:45:36 +00:00
|
|
|
/*
|
|
|
|
* 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
|
2010-03-01 12:56:10 +00:00
|
|
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*
|
|
|
|
*
|
2009-11-27 18:45:36 +00:00
|
|
|
*
|
|
|
|
* Authors:
|
|
|
|
* Neil Roberts <neil@linux.intel.com>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include "config.h"
|
|
|
|
#endif
|
|
|
|
|
2012-02-13 23:02:04 +00:00
|
|
|
#include "cogl-private.h"
|
2009-11-27 18:45:36 +00:00
|
|
|
#include "cogl-util.h"
|
|
|
|
#include "cogl-texture-private.h"
|
|
|
|
#include "cogl-texture-2d-private.h"
|
2012-09-10 20:45:33 +00:00
|
|
|
#include "cogl-texture-2d-gl-private.h"
|
2009-11-27 18:45:36 +00:00
|
|
|
#include "cogl-texture-driver.h"
|
2010-11-04 22:25:52 +00:00
|
|
|
#include "cogl-context-private.h"
|
2012-04-16 13:14:10 +00:00
|
|
|
#include "cogl-object-private.h"
|
2010-02-10 18:18:30 +00:00
|
|
|
#include "cogl-journal-private.h"
|
2010-10-27 17:54:57 +00:00
|
|
|
#include "cogl-pipeline-opengl-private.h"
|
2011-02-10 18:22:27 +00:00
|
|
|
#include "cogl-framebuffer-private.h"
|
2012-08-31 18:28:27 +00:00
|
|
|
#include "cogl-error-private.h"
|
2011-11-28 22:55:58 +00:00
|
|
|
#ifdef COGL_HAS_EGL_SUPPORT
|
2011-05-24 21:34:10 +00:00
|
|
|
#include "cogl-winsys-egl-private.h"
|
2011-11-28 22:55:58 +00:00
|
|
|
#endif
|
2009-11-27 18:45:36 +00:00
|
|
|
|
|
|
|
#include <string.h>
|
|
|
|
#include <math.h>
|
|
|
|
|
2011-05-25 00:37:56 +00:00
|
|
|
#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
|
2012-03-20 13:21:18 +00:00
|
|
|
#include "cogl-wayland-server.h"
|
2011-05-25 00:37:56 +00:00
|
|
|
#endif
|
|
|
|
|
2009-11-27 18:45:36 +00:00
|
|
|
static void _cogl_texture_2d_free (CoglTexture2D *tex_2d);
|
|
|
|
|
2011-05-16 23:05:54 +00:00
|
|
|
COGL_TEXTURE_DEFINE (Texture2D, texture_2d);
|
2009-11-27 18:45:36 +00:00
|
|
|
|
|
|
|
static const CoglTextureVtable cogl_texture_2d_vtable;
|
|
|
|
|
|
|
|
typedef struct _CoglTexture2DManualRepeatData
|
|
|
|
{
|
|
|
|
CoglTexture2D *tex_2d;
|
2011-10-08 13:13:03 +00:00
|
|
|
CoglMetaTextureCallback callback;
|
2009-11-27 18:45:36 +00:00
|
|
|
void *user_data;
|
|
|
|
} CoglTexture2DManualRepeatData;
|
|
|
|
|
|
|
|
static void
|
|
|
|
_cogl_texture_2d_free (CoglTexture2D *tex_2d)
|
|
|
|
{
|
2012-09-10 20:45:33 +00:00
|
|
|
CoglContext *ctx = COGL_TEXTURE (tex_2d)->context;
|
|
|
|
|
|
|
|
ctx->driver_vtable->texture_2d_free (tex_2d);
|
2010-04-26 09:01:43 +00:00
|
|
|
|
|
|
|
/* Chain up */
|
|
|
|
_cogl_texture_free (COGL_TEXTURE (tex_2d));
|
2009-11-27 18:45:36 +00:00
|
|
|
}
|
|
|
|
|
Switch use of primitive glib types to c99 equivalents
The coding style has for a long time said to avoid using redundant glib
data types such as gint or gchar etc because we feel that they make the
code look unnecessarily foreign to developers coming from outside of the
Gnome developer community.
Note: When we tried to find the historical rationale for the types we
just found that they were apparently only added for consistent syntax
highlighting which didn't seem that compelling.
Up until now we have been continuing to use some of the platform
specific type such as gint{8,16,32,64} and gsize but this patch switches
us over to using the standard c99 equivalents instead so we can further
ensure that our code looks familiar to the widest range of C developers
who might potentially contribute to Cogl.
So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this
switches all Cogl code to instead use the int{8,16,32,64}_t and
uint{8,16,32,64}_t c99 types instead.
Instead of gsize we now use size_t
For now we are not going to use the c99 _Bool type and instead we have
introduced a new CoglBool type to use instead of gboolean.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
2012-04-16 20:56:40 +00:00
|
|
|
static CoglBool
|
2012-09-07 14:26:34 +00:00
|
|
|
_cogl_texture_2d_can_create (CoglContext *ctx,
|
|
|
|
unsigned int width,
|
2009-11-27 18:45:36 +00:00
|
|
|
unsigned int height,
|
|
|
|
CoglPixelFormat internal_format)
|
|
|
|
{
|
|
|
|
/* If NPOT textures aren't supported then the size must be a power
|
|
|
|
of two */
|
2012-04-24 16:44:38 +00:00
|
|
|
if (!cogl_has_feature (ctx, COGL_FEATURE_ID_TEXTURE_NPOT_BASIC) &&
|
2010-07-01 10:07:03 +00:00
|
|
|
(!_cogl_util_is_pot (width) ||
|
|
|
|
!_cogl_util_is_pot (height)))
|
2009-11-27 18:45:36 +00:00
|
|
|
return FALSE;
|
|
|
|
|
2012-09-10 20:45:33 +00:00
|
|
|
return ctx->driver_vtable->texture_2d_can_create (ctx,
|
|
|
|
width,
|
|
|
|
height,
|
|
|
|
internal_format);
|
2009-11-27 18:45:36 +00:00
|
|
|
}
|
|
|
|
|
2012-09-10 20:45:33 +00:00
|
|
|
void
|
2012-04-04 14:09:43 +00:00
|
|
|
_cogl_texture_2d_set_auto_mipmap (CoglTexture *tex,
|
Switch use of primitive glib types to c99 equivalents
The coding style has for a long time said to avoid using redundant glib
data types such as gint or gchar etc because we feel that they make the
code look unnecessarily foreign to developers coming from outside of the
Gnome developer community.
Note: When we tried to find the historical rationale for the types we
just found that they were apparently only added for consistent syntax
highlighting which didn't seem that compelling.
Up until now we have been continuing to use some of the platform
specific type such as gint{8,16,32,64} and gsize but this patch switches
us over to using the standard c99 equivalents instead so we can further
ensure that our code looks familiar to the widest range of C developers
who might potentially contribute to Cogl.
So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this
switches all Cogl code to instead use the int{8,16,32,64}_t and
uint{8,16,32,64}_t c99 types instead.
Instead of gsize we now use size_t
For now we are not going to use the c99 _Bool type and instead we have
introduced a new CoglBool type to use instead of gboolean.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
2012-04-16 20:56:40 +00:00
|
|
|
CoglBool value)
|
2012-04-04 14:09:43 +00:00
|
|
|
{
|
|
|
|
CoglTexture2D *tex_2d = COGL_TEXTURE_2D (tex);
|
|
|
|
|
|
|
|
tex_2d->auto_mipmap = value;
|
|
|
|
}
|
|
|
|
|
2012-09-10 20:45:33 +00:00
|
|
|
CoglTexture2D *
|
2012-09-07 14:26:34 +00:00
|
|
|
_cogl_texture_2d_create_base (CoglContext *ctx,
|
|
|
|
int width,
|
|
|
|
int height,
|
|
|
|
CoglPixelFormat internal_format)
|
2009-11-27 18:45:36 +00:00
|
|
|
{
|
|
|
|
CoglTexture2D *tex_2d = g_new (CoglTexture2D, 1);
|
|
|
|
CoglTexture *tex = COGL_TEXTURE (tex_2d);
|
|
|
|
|
2012-11-22 21:46:54 +00:00
|
|
|
_cogl_texture_init (tex, ctx, width, height, &cogl_texture_2d_vtable);
|
2009-11-27 18:45:36 +00:00
|
|
|
|
|
|
|
tex_2d->mipmaps_dirty = TRUE;
|
2012-04-04 14:09:43 +00:00
|
|
|
tex_2d->auto_mipmap = TRUE;
|
2009-11-27 18:45:36 +00:00
|
|
|
|
2010-10-04 14:27:38 +00:00
|
|
|
tex_2d->is_foreign = FALSE;
|
|
|
|
|
2012-11-22 23:01:08 +00:00
|
|
|
tex_2d->internal_format = internal_format;
|
2009-11-27 18:45:36 +00:00
|
|
|
|
2012-09-10 20:45:33 +00:00
|
|
|
ctx->driver_vtable->texture_2d_init (tex_2d);
|
|
|
|
|
|
|
|
return _cogl_texture_2d_object_new (tex_2d);
|
2009-11-27 18:45:36 +00:00
|
|
|
}
|
|
|
|
|
2011-05-16 23:05:54 +00:00
|
|
|
CoglTexture2D *
|
|
|
|
cogl_texture_2d_new_with_size (CoglContext *ctx,
|
|
|
|
int width,
|
|
|
|
int height,
|
2012-11-22 23:01:08 +00:00
|
|
|
CoglPixelFormat internal_format)
|
2009-11-27 18:45:36 +00:00
|
|
|
{
|
|
|
|
/* Since no data, we need some internal format */
|
|
|
|
if (internal_format == COGL_PIXEL_FORMAT_ANY)
|
|
|
|
internal_format = COGL_PIXEL_FORMAT_RGBA_8888_PRE;
|
|
|
|
|
2012-11-22 23:01:08 +00:00
|
|
|
return _cogl_texture_2d_create_base (ctx,
|
|
|
|
width, height,
|
|
|
|
internal_format);
|
|
|
|
}
|
2009-11-27 18:45:36 +00:00
|
|
|
|
2012-11-22 23:01:08 +00:00
|
|
|
static CoglBool
|
|
|
|
_cogl_texture_2d_allocate (CoglTexture *tex,
|
|
|
|
CoglError **error)
|
|
|
|
{
|
|
|
|
CoglContext *ctx = tex->context;
|
|
|
|
return ctx->driver_vtable->texture_2d_allocate (tex, error);
|
2009-11-27 18:45:36 +00:00
|
|
|
}
|
|
|
|
|
2012-04-04 14:10:04 +00:00
|
|
|
CoglTexture2D *
|
2013-06-07 23:28:14 +00:00
|
|
|
_cogl_texture_2d_new_from_bitmap (CoglBitmap *bmp,
|
|
|
|
CoglPixelFormat internal_format,
|
|
|
|
CoglBool can_convert_in_place,
|
|
|
|
CoglError **error)
|
2009-11-27 18:45:36 +00:00
|
|
|
{
|
Switch use of primitive glib types to c99 equivalents
The coding style has for a long time said to avoid using redundant glib
data types such as gint or gchar etc because we feel that they make the
code look unnecessarily foreign to developers coming from outside of the
Gnome developer community.
Note: When we tried to find the historical rationale for the types we
just found that they were apparently only added for consistent syntax
highlighting which didn't seem that compelling.
Up until now we have been continuing to use some of the platform
specific type such as gint{8,16,32,64} and gsize but this patch switches
us over to using the standard c99 equivalents instead so we can further
ensure that our code looks familiar to the widest range of C developers
who might potentially contribute to Cogl.
So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this
switches all Cogl code to instead use the int{8,16,32,64}_t and
uint{8,16,32,64}_t c99 types instead.
Instead of gsize we now use size_t
For now we are not going to use the c99 _Bool type and instead we have
introduced a new CoglBool type to use instead of gboolean.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
2012-04-16 20:56:40 +00:00
|
|
|
CoglContext *ctx;
|
2011-07-07 11:48:24 +00:00
|
|
|
|
2012-04-16 13:14:10 +00:00
|
|
|
_COGL_RETURN_VAL_IF_FAIL (bmp != NULL, NULL);
|
2009-11-27 18:45:36 +00:00
|
|
|
|
2012-04-04 12:57:42 +00:00
|
|
|
ctx = _cogl_bitmap_get_context (bmp);
|
|
|
|
|
2010-07-07 17:44:16 +00:00
|
|
|
internal_format =
|
2012-02-25 20:18:05 +00:00
|
|
|
_cogl_texture_determine_internal_format (cogl_bitmap_get_format (bmp),
|
2010-07-07 17:44:16 +00:00
|
|
|
internal_format);
|
2010-03-10 00:37:52 +00:00
|
|
|
|
2012-09-07 14:26:34 +00:00
|
|
|
if (!_cogl_texture_2d_can_create (ctx,
|
|
|
|
cogl_bitmap_get_width (bmp),
|
2012-02-25 20:18:05 +00:00
|
|
|
cogl_bitmap_get_height (bmp),
|
2010-07-07 17:44:16 +00:00
|
|
|
internal_format))
|
2011-05-16 23:05:54 +00:00
|
|
|
{
|
2012-08-31 18:28:27 +00:00
|
|
|
_cogl_set_error (error, COGL_TEXTURE_ERROR,
|
|
|
|
COGL_TEXTURE_ERROR_SIZE,
|
|
|
|
"Failed to create texture 2d due to size/format"
|
|
|
|
" constraints");
|
2011-05-16 23:05:54 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2010-03-01 18:54:03 +00:00
|
|
|
|
2012-09-10 20:45:33 +00:00
|
|
|
return ctx->driver_vtable->texture_2d_new_from_bitmap (bmp,
|
|
|
|
internal_format,
|
2013-06-07 23:28:14 +00:00
|
|
|
can_convert_in_place,
|
2012-09-10 20:45:33 +00:00
|
|
|
error);
|
2009-11-27 18:45:36 +00:00
|
|
|
}
|
|
|
|
|
2013-06-07 23:28:14 +00:00
|
|
|
CoglTexture2D *
|
|
|
|
cogl_texture_2d_new_from_bitmap (CoglBitmap *bmp,
|
|
|
|
CoglPixelFormat internal_format,
|
|
|
|
CoglError **error)
|
|
|
|
{
|
|
|
|
return _cogl_texture_2d_new_from_bitmap (bmp, internal_format, FALSE, error);
|
|
|
|
}
|
|
|
|
|
2013-06-08 01:10:15 +00:00
|
|
|
CoglTexture2D *
|
|
|
|
cogl_texture_2d_new_from_file (CoglContext *ctx,
|
|
|
|
const char *filename,
|
|
|
|
CoglPixelFormat internal_format,
|
|
|
|
CoglError **error)
|
|
|
|
{
|
|
|
|
CoglBitmap *bmp;
|
|
|
|
CoglTexture2D *tex_2d = NULL;
|
|
|
|
|
|
|
|
_COGL_RETURN_VAL_IF_FAIL (error == NULL || *error == NULL, NULL);
|
|
|
|
|
|
|
|
bmp = _cogl_bitmap_from_file (ctx, filename, error);
|
|
|
|
if (bmp == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
tex_2d = _cogl_texture_2d_new_from_bitmap (bmp,
|
|
|
|
internal_format,
|
|
|
|
TRUE, /* can convert in-place */
|
|
|
|
error);
|
|
|
|
|
|
|
|
cogl_object_unref (bmp);
|
|
|
|
|
|
|
|
return tex_2d;
|
|
|
|
}
|
|
|
|
|
2011-05-16 23:05:54 +00:00
|
|
|
CoglTexture2D *
|
|
|
|
cogl_texture_2d_new_from_data (CoglContext *ctx,
|
|
|
|
int width,
|
|
|
|
int height,
|
|
|
|
CoglPixelFormat format,
|
|
|
|
CoglPixelFormat internal_format,
|
|
|
|
int rowstride,
|
Switch use of primitive glib types to c99 equivalents
The coding style has for a long time said to avoid using redundant glib
data types such as gint or gchar etc because we feel that they make the
code look unnecessarily foreign to developers coming from outside of the
Gnome developer community.
Note: When we tried to find the historical rationale for the types we
just found that they were apparently only added for consistent syntax
highlighting which didn't seem that compelling.
Up until now we have been continuing to use some of the platform
specific type such as gint{8,16,32,64} and gsize but this patch switches
us over to using the standard c99 equivalents instead so we can further
ensure that our code looks familiar to the widest range of C developers
who might potentially contribute to Cogl.
So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this
switches all Cogl code to instead use the int{8,16,32,64}_t and
uint{8,16,32,64}_t c99 types instead.
Instead of gsize we now use size_t
For now we are not going to use the c99 _Bool type and instead we have
introduced a new CoglBool type to use instead of gboolean.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
2012-04-16 20:56:40 +00:00
|
|
|
const uint8_t *data,
|
2012-08-31 18:28:27 +00:00
|
|
|
CoglError **error)
|
2011-05-16 23:05:54 +00:00
|
|
|
{
|
|
|
|
CoglBitmap *bmp;
|
2012-04-16 13:14:10 +00:00
|
|
|
CoglTexture2D *tex_2d;
|
2011-05-16 23:05:54 +00:00
|
|
|
|
2011-10-13 21:34:30 +00:00
|
|
|
_COGL_RETURN_VAL_IF_FAIL (format != COGL_PIXEL_FORMAT_ANY, NULL);
|
|
|
|
_COGL_RETURN_VAL_IF_FAIL (data != NULL, NULL);
|
2011-05-16 23:05:54 +00:00
|
|
|
|
|
|
|
/* Rowstride from width if not given */
|
|
|
|
if (rowstride == 0)
|
2012-02-13 23:02:04 +00:00
|
|
|
rowstride = width * _cogl_pixel_format_get_bytes_per_pixel (format);
|
2011-05-16 23:05:54 +00:00
|
|
|
|
|
|
|
/* Wrap the data into a bitmap */
|
2012-03-13 14:46:18 +00:00
|
|
|
bmp = cogl_bitmap_new_for_data (ctx,
|
|
|
|
width, height,
|
|
|
|
format,
|
|
|
|
rowstride,
|
Switch use of primitive glib types to c99 equivalents
The coding style has for a long time said to avoid using redundant glib
data types such as gint or gchar etc because we feel that they make the
code look unnecessarily foreign to developers coming from outside of the
Gnome developer community.
Note: When we tried to find the historical rationale for the types we
just found that they were apparently only added for consistent syntax
highlighting which didn't seem that compelling.
Up until now we have been continuing to use some of the platform
specific type such as gint{8,16,32,64} and gsize but this patch switches
us over to using the standard c99 equivalents instead so we can further
ensure that our code looks familiar to the widest range of C developers
who might potentially contribute to Cogl.
So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this
switches all Cogl code to instead use the int{8,16,32,64}_t and
uint{8,16,32,64}_t c99 types instead.
Instead of gsize we now use size_t
For now we are not going to use the c99 _Bool type and instead we have
introduced a new CoglBool type to use instead of gboolean.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
2012-04-16 20:56:40 +00:00
|
|
|
(uint8_t *) data);
|
2011-05-16 23:05:54 +00:00
|
|
|
|
2012-04-16 13:14:10 +00:00
|
|
|
tex_2d = cogl_texture_2d_new_from_bitmap (bmp,
|
|
|
|
internal_format,
|
|
|
|
error);
|
2011-05-16 23:05:54 +00:00
|
|
|
|
|
|
|
cogl_object_unref (bmp);
|
|
|
|
|
2012-04-16 13:14:10 +00:00
|
|
|
return tex_2d;
|
2011-05-16 23:05:54 +00:00
|
|
|
}
|
|
|
|
|
2011-05-24 21:34:10 +00:00
|
|
|
#if defined (COGL_HAS_EGL_SUPPORT) && defined (EGL_KHR_image_base)
|
|
|
|
/* NB: The reason we require the width, height and format to be passed
|
|
|
|
* even though they may seem redundant is because GLES 1/2 don't
|
|
|
|
* provide a way to query these properties. */
|
|
|
|
CoglTexture2D *
|
|
|
|
_cogl_egl_texture_2d_new_from_image (CoglContext *ctx,
|
|
|
|
int width,
|
|
|
|
int height,
|
|
|
|
CoglPixelFormat format,
|
|
|
|
EGLImageKHR image,
|
2012-08-31 18:28:27 +00:00
|
|
|
CoglError **error)
|
2011-05-24 21:34:10 +00:00
|
|
|
{
|
2012-01-13 16:48:26 +00:00
|
|
|
_COGL_RETURN_VAL_IF_FAIL (_cogl_context_get_winsys (ctx)->constraints &
|
|
|
|
COGL_RENDERER_CONSTRAINT_USES_EGL,
|
2011-12-13 18:57:53 +00:00
|
|
|
NULL);
|
2011-05-24 21:34:10 +00:00
|
|
|
|
2013-11-25 16:11:36 +00:00
|
|
|
_COGL_RETURN_VAL_IF_FAIL (_cogl_has_private_feature
|
|
|
|
(ctx,
|
|
|
|
COGL_PRIVATE_FEATURE_TEXTURE_2D_FROM_EGL_IMAGE),
|
|
|
|
NULL);
|
2011-05-24 21:34:10 +00:00
|
|
|
|
2012-09-10 20:45:33 +00:00
|
|
|
if (ctx->driver_vtable->egl_texture_2d_new_from_image)
|
|
|
|
return ctx->driver_vtable->egl_texture_2d_new_from_image (ctx,
|
|
|
|
width,
|
|
|
|
height,
|
|
|
|
format,
|
|
|
|
image,
|
|
|
|
error);
|
|
|
|
else
|
2011-05-24 21:34:10 +00:00
|
|
|
{
|
2012-08-31 18:28:27 +00:00
|
|
|
_cogl_set_error (error,
|
2012-09-10 20:45:33 +00:00
|
|
|
COGL_SYSTEM_ERROR,
|
|
|
|
COGL_SYSTEM_ERROR_UNSUPPORTED,
|
|
|
|
"Creating 2D textures from EGL images is not "
|
|
|
|
"supported by the current driver");
|
2011-05-24 21:34:10 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif /* defined (COGL_HAS_EGL_SUPPORT) && defined (EGL_KHR_image_base) */
|
|
|
|
|
2011-05-25 00:37:56 +00:00
|
|
|
#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
|
2013-11-25 17:04:16 +00:00
|
|
|
static void
|
|
|
|
shm_buffer_get_cogl_pixel_format (struct wl_shm_buffer *shm_buffer,
|
|
|
|
CoglPixelFormat *format_out,
|
|
|
|
CoglPixelFormat *internal_format_out)
|
|
|
|
{
|
|
|
|
CoglPixelFormat format;
|
|
|
|
CoglPixelFormat internal_format = COGL_PIXEL_FORMAT_ANY;
|
|
|
|
|
|
|
|
switch (wl_shm_buffer_get_format (shm_buffer))
|
|
|
|
{
|
|
|
|
#if G_BYTE_ORDER == G_BIG_ENDIAN
|
|
|
|
case WL_SHM_FORMAT_ARGB8888:
|
|
|
|
format = COGL_PIXEL_FORMAT_ARGB_8888_PRE;
|
|
|
|
break;
|
|
|
|
case WL_SHM_FORMAT_XRGB8888:
|
|
|
|
format = COGL_PIXEL_FORMAT_ARGB_8888;
|
|
|
|
internal_format = COGL_PIXEL_FORMAT_RGB_888;
|
|
|
|
break;
|
|
|
|
#elif G_BYTE_ORDER == G_LITTLE_ENDIAN
|
|
|
|
case WL_SHM_FORMAT_ARGB8888:
|
|
|
|
format = COGL_PIXEL_FORMAT_BGRA_8888_PRE;
|
|
|
|
break;
|
|
|
|
case WL_SHM_FORMAT_XRGB8888:
|
|
|
|
format = COGL_PIXEL_FORMAT_BGRA_8888;
|
|
|
|
internal_format = COGL_PIXEL_FORMAT_BGR_888;
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
default:
|
|
|
|
g_warn_if_reached ();
|
|
|
|
format = COGL_PIXEL_FORMAT_ARGB_8888;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (format_out)
|
|
|
|
*format_out = format;
|
|
|
|
if (internal_format_out)
|
|
|
|
*internal_format_out = internal_format;
|
|
|
|
}
|
|
|
|
|
|
|
|
CoglBool
|
|
|
|
cogl_wayland_texture_set_region_from_shm_buffer (CoglTexture *texture,
|
|
|
|
int src_x,
|
|
|
|
int src_y,
|
|
|
|
int width,
|
|
|
|
int height,
|
|
|
|
struct wl_shm_buffer *
|
|
|
|
shm_buffer,
|
|
|
|
int dst_x,
|
|
|
|
int dst_y,
|
|
|
|
int level,
|
|
|
|
CoglError **error)
|
|
|
|
{
|
|
|
|
const uint8_t *data = wl_shm_buffer_get_data (shm_buffer);
|
|
|
|
int32_t stride = wl_shm_buffer_get_stride (shm_buffer);
|
|
|
|
CoglPixelFormat format;
|
|
|
|
int bpp;
|
|
|
|
|
|
|
|
shm_buffer_get_cogl_pixel_format (shm_buffer, &format, NULL);
|
|
|
|
bpp = _cogl_pixel_format_get_bytes_per_pixel (format);
|
|
|
|
|
|
|
|
return _cogl_texture_set_region (COGL_TEXTURE (texture),
|
|
|
|
width, height,
|
|
|
|
format,
|
|
|
|
stride,
|
|
|
|
data + src_x * bpp + src_y * stride,
|
|
|
|
dst_x, dst_y,
|
|
|
|
level,
|
|
|
|
error);
|
|
|
|
}
|
|
|
|
|
2011-05-25 00:37:56 +00:00
|
|
|
CoglTexture2D *
|
|
|
|
cogl_wayland_texture_2d_new_from_buffer (CoglContext *ctx,
|
2013-10-15 18:02:46 +00:00
|
|
|
struct wl_resource *buffer,
|
2012-08-31 18:28:27 +00:00
|
|
|
CoglError **error)
|
2011-05-25 00:37:56 +00:00
|
|
|
{
|
2013-06-27 13:22:41 +00:00
|
|
|
struct wl_shm_buffer *shm_buffer;
|
2013-04-30 13:09:11 +00:00
|
|
|
|
2013-10-15 18:02:46 +00:00
|
|
|
shm_buffer = wl_shm_buffer_get (buffer);
|
2013-06-27 13:22:41 +00:00
|
|
|
|
|
|
|
if (shm_buffer)
|
2011-05-25 00:37:56 +00:00
|
|
|
{
|
2013-06-27 13:22:41 +00:00
|
|
|
int stride = wl_shm_buffer_get_stride (shm_buffer);
|
|
|
|
int width = wl_shm_buffer_get_width (shm_buffer);
|
|
|
|
int height = wl_shm_buffer_get_height (shm_buffer);
|
2013-11-25 17:04:16 +00:00
|
|
|
CoglPixelFormat format, internal_format;
|
2011-12-01 22:52:59 +00:00
|
|
|
|
2013-11-25 17:04:16 +00:00
|
|
|
shm_buffer_get_cogl_pixel_format (shm_buffer, &format, &internal_format);
|
2011-12-01 22:52:59 +00:00
|
|
|
|
2011-05-25 00:37:56 +00:00
|
|
|
return cogl_texture_2d_new_from_data (ctx,
|
2013-06-27 13:22:41 +00:00
|
|
|
width, height,
|
2011-05-25 00:37:56 +00:00
|
|
|
format,
|
2011-12-01 22:52:59 +00:00
|
|
|
internal_format,
|
2011-05-25 00:37:56 +00:00
|
|
|
stride,
|
2013-06-27 13:22:41 +00:00
|
|
|
wl_shm_buffer_get_data (shm_buffer),
|
2011-05-25 00:37:56 +00:00
|
|
|
error);
|
|
|
|
}
|
2013-06-27 13:22:41 +00:00
|
|
|
else
|
2011-05-25 00:37:56 +00:00
|
|
|
{
|
2013-06-27 13:22:41 +00:00
|
|
|
int format, width, height;
|
|
|
|
|
|
|
|
if (_cogl_egl_query_wayland_buffer (ctx,
|
|
|
|
buffer,
|
|
|
|
EGL_TEXTURE_FORMAT,
|
|
|
|
&format) &&
|
|
|
|
_cogl_egl_query_wayland_buffer (ctx,
|
|
|
|
buffer,
|
|
|
|
EGL_WIDTH,
|
|
|
|
&width) &&
|
|
|
|
_cogl_egl_query_wayland_buffer (ctx,
|
|
|
|
buffer,
|
|
|
|
EGL_HEIGHT,
|
|
|
|
&height))
|
2013-04-30 13:09:11 +00:00
|
|
|
{
|
2013-06-27 13:22:41 +00:00
|
|
|
EGLImageKHR image;
|
|
|
|
CoglTexture2D *tex = NULL;
|
|
|
|
CoglPixelFormat internal_format;
|
|
|
|
|
|
|
|
_COGL_RETURN_VAL_IF_FAIL (_cogl_context_get_winsys (ctx)->constraints &
|
|
|
|
COGL_RENDERER_CONSTRAINT_USES_EGL,
|
|
|
|
NULL);
|
|
|
|
|
|
|
|
switch (format)
|
|
|
|
{
|
|
|
|
case EGL_TEXTURE_RGB:
|
|
|
|
internal_format = COGL_PIXEL_FORMAT_RGB_888;
|
|
|
|
break;
|
|
|
|
case EGL_TEXTURE_RGBA:
|
|
|
|
internal_format = COGL_PIXEL_FORMAT_RGBA_8888_PRE;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
_cogl_set_error (error,
|
|
|
|
COGL_SYSTEM_ERROR,
|
|
|
|
COGL_SYSTEM_ERROR_UNSUPPORTED,
|
|
|
|
"Can't create texture from unknown "
|
|
|
|
"wayland buffer format %d\n", format);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
image = _cogl_egl_create_image (ctx,
|
|
|
|
EGL_WAYLAND_BUFFER_WL,
|
|
|
|
buffer,
|
|
|
|
NULL);
|
|
|
|
tex = _cogl_egl_texture_2d_new_from_image (ctx,
|
|
|
|
width, height,
|
|
|
|
internal_format,
|
|
|
|
image,
|
|
|
|
error);
|
|
|
|
_cogl_egl_destroy_image (ctx, image);
|
|
|
|
return tex;
|
2013-04-30 13:09:11 +00:00
|
|
|
}
|
2011-05-25 00:37:56 +00:00
|
|
|
}
|
2013-04-30 13:09:11 +00:00
|
|
|
|
|
|
|
_cogl_set_error (error,
|
|
|
|
COGL_SYSTEM_ERROR,
|
|
|
|
COGL_SYSTEM_ERROR_UNSUPPORTED,
|
|
|
|
"Can't create texture from unknown "
|
|
|
|
"wayland buffer type\n");
|
|
|
|
return NULL;
|
2011-05-25 00:37:56 +00:00
|
|
|
}
|
|
|
|
#endif /* COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT */
|
|
|
|
|
2010-06-03 14:06:47 +00:00
|
|
|
void
|
2012-04-16 13:14:10 +00:00
|
|
|
_cogl_texture_2d_externally_modified (CoglTexture *texture)
|
2010-06-03 14:06:47 +00:00
|
|
|
{
|
2012-04-16 13:14:10 +00:00
|
|
|
if (!cogl_is_texture_2d (texture))
|
2010-06-03 14:06:47 +00:00
|
|
|
return;
|
|
|
|
|
2012-04-16 13:14:10 +00:00
|
|
|
COGL_TEXTURE_2D (texture)->mipmaps_dirty = TRUE;
|
2010-06-03 14:06:47 +00:00
|
|
|
}
|
|
|
|
|
2011-02-10 18:22:27 +00:00
|
|
|
void
|
2012-04-16 13:14:10 +00:00
|
|
|
_cogl_texture_2d_copy_from_framebuffer (CoglTexture2D *tex_2d,
|
2011-02-10 18:22:27 +00:00
|
|
|
int src_x,
|
|
|
|
int src_y,
|
|
|
|
int width,
|
2012-11-09 17:55:54 +00:00
|
|
|
int height,
|
|
|
|
CoglFramebuffer *src_fb,
|
|
|
|
int dst_x,
|
|
|
|
int dst_y,
|
|
|
|
int level)
|
2011-02-10 18:22:27 +00:00
|
|
|
{
|
2012-11-22 23:01:08 +00:00
|
|
|
CoglTexture *tex = COGL_TEXTURE (tex_2d);
|
|
|
|
CoglContext *ctx = tex->context;
|
|
|
|
|
|
|
|
/* Assert that the storage for this texture has been allocated */
|
|
|
|
cogl_texture_allocate (tex, NULL); /* (abort on error) */
|
2012-09-07 14:26:34 +00:00
|
|
|
|
2012-09-10 20:45:33 +00:00
|
|
|
ctx->driver_vtable->texture_2d_copy_from_framebuffer (tex_2d,
|
|
|
|
src_x,
|
|
|
|
src_y,
|
|
|
|
width,
|
2012-11-09 17:55:54 +00:00
|
|
|
height,
|
|
|
|
src_fb,
|
|
|
|
dst_x,
|
|
|
|
dst_y,
|
|
|
|
level);
|
2011-02-10 18:22:27 +00:00
|
|
|
|
|
|
|
tex_2d->mipmaps_dirty = TRUE;
|
|
|
|
}
|
|
|
|
|
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-11-27 18:45:36 +00:00
|
|
|
_cogl_texture_2d_get_max_waste (CoglTexture *tex)
|
|
|
|
{
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
Switch use of primitive glib types to c99 equivalents
The coding style has for a long time said to avoid using redundant glib
data types such as gint or gchar etc because we feel that they make the
code look unnecessarily foreign to developers coming from outside of the
Gnome developer community.
Note: When we tried to find the historical rationale for the types we
just found that they were apparently only added for consistent syntax
highlighting which didn't seem that compelling.
Up until now we have been continuing to use some of the platform
specific type such as gint{8,16,32,64} and gsize but this patch switches
us over to using the standard c99 equivalents instead so we can further
ensure that our code looks familiar to the widest range of C developers
who might potentially contribute to Cogl.
So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this
switches all Cogl code to instead use the int{8,16,32,64}_t and
uint{8,16,32,64}_t c99 types instead.
Instead of gsize we now use size_t
For now we are not going to use the c99 _Bool type and instead we have
introduced a new CoglBool type to use instead of gboolean.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
2012-04-16 20:56:40 +00:00
|
|
|
static CoglBool
|
2009-11-27 18:45:36 +00:00
|
|
|
_cogl_texture_2d_is_sliced (CoglTexture *tex)
|
|
|
|
{
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
Switch use of primitive glib types to c99 equivalents
The coding style has for a long time said to avoid using redundant glib
data types such as gint or gchar etc because we feel that they make the
code look unnecessarily foreign to developers coming from outside of the
Gnome developer community.
Note: When we tried to find the historical rationale for the types we
just found that they were apparently only added for consistent syntax
highlighting which didn't seem that compelling.
Up until now we have been continuing to use some of the platform
specific type such as gint{8,16,32,64} and gsize but this patch switches
us over to using the standard c99 equivalents instead so we can further
ensure that our code looks familiar to the widest range of C developers
who might potentially contribute to Cogl.
So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this
switches all Cogl code to instead use the int{8,16,32,64}_t and
uint{8,16,32,64}_t c99 types instead.
Instead of gsize we now use size_t
For now we are not going to use the c99 _Bool type and instead we have
introduced a new CoglBool type to use instead of gboolean.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
2012-04-16 20:56:40 +00:00
|
|
|
static CoglBool
|
2009-11-27 18:45:36 +00:00
|
|
|
_cogl_texture_2d_can_hardware_repeat (CoglTexture *tex)
|
|
|
|
{
|
2012-09-07 14:26:34 +00:00
|
|
|
CoglContext *ctx = tex->context;
|
2012-04-24 16:44:38 +00:00
|
|
|
|
|
|
|
if (cogl_has_feature (ctx, COGL_FEATURE_ID_TEXTURE_NPOT_REPEAT) ||
|
2012-11-22 21:46:54 +00:00
|
|
|
(_cogl_util_is_pot (tex->width) &&
|
|
|
|
_cogl_util_is_pot (tex->height)))
|
2012-04-24 16:44:38 +00:00
|
|
|
return TRUE;
|
|
|
|
else
|
|
|
|
return FALSE;
|
2009-11-27 18:45:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
_cogl_texture_2d_transform_coords_to_gl (CoglTexture *tex,
|
|
|
|
float *s,
|
|
|
|
float *t)
|
|
|
|
{
|
|
|
|
/* The texture coordinates map directly so we don't need to do
|
|
|
|
anything */
|
|
|
|
}
|
|
|
|
|
2010-03-01 21:49:04 +00:00
|
|
|
static CoglTransformResult
|
2010-01-18 09:22:04 +00:00
|
|
|
_cogl_texture_2d_transform_quad_coords_to_gl (CoglTexture *tex,
|
|
|
|
float *coords)
|
|
|
|
{
|
|
|
|
/* The texture coordinates map directly so we don't need to do
|
2010-03-01 21:49:04 +00:00
|
|
|
anything other than check for repeats */
|
|
|
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < 4; i++)
|
|
|
|
if (coords[i] < 0.0f || coords[i] > 1.0f)
|
2012-04-24 16:44:38 +00:00
|
|
|
{
|
|
|
|
/* Repeat is needed */
|
|
|
|
return (_cogl_texture_2d_can_hardware_repeat (tex) ?
|
|
|
|
COGL_TRANSFORM_HARDWARE_REPEAT :
|
|
|
|
COGL_TRANSFORM_SOFTWARE_REPEAT);
|
|
|
|
}
|
2010-03-01 21:49:04 +00:00
|
|
|
|
2012-04-24 16:44:38 +00:00
|
|
|
/* No repeat is needed */
|
|
|
|
return COGL_TRANSFORM_NO_REPEAT;
|
2010-01-18 09:22:04 +00:00
|
|
|
}
|
|
|
|
|
Switch use of primitive glib types to c99 equivalents
The coding style has for a long time said to avoid using redundant glib
data types such as gint or gchar etc because we feel that they make the
code look unnecessarily foreign to developers coming from outside of the
Gnome developer community.
Note: When we tried to find the historical rationale for the types we
just found that they were apparently only added for consistent syntax
highlighting which didn't seem that compelling.
Up until now we have been continuing to use some of the platform
specific type such as gint{8,16,32,64} and gsize but this patch switches
us over to using the standard c99 equivalents instead so we can further
ensure that our code looks familiar to the widest range of C developers
who might potentially contribute to Cogl.
So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this
switches all Cogl code to instead use the int{8,16,32,64}_t and
uint{8,16,32,64}_t c99 types instead.
Instead of gsize we now use size_t
For now we are not going to use the c99 _Bool type and instead we have
introduced a new CoglBool type to use instead of gboolean.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
2012-04-16 20:56:40 +00:00
|
|
|
static CoglBool
|
2009-11-27 18:45:36 +00:00
|
|
|
_cogl_texture_2d_get_gl_texture (CoglTexture *tex,
|
|
|
|
GLuint *out_gl_handle,
|
|
|
|
GLenum *out_gl_target)
|
|
|
|
{
|
2012-09-10 20:45:33 +00:00
|
|
|
CoglContext *ctx = tex->context;
|
2009-11-27 18:45:36 +00:00
|
|
|
CoglTexture2D *tex_2d = COGL_TEXTURE_2D (tex);
|
|
|
|
|
2012-09-10 20:45:33 +00:00
|
|
|
if (ctx->driver_vtable->texture_2d_get_gl_handle)
|
|
|
|
{
|
|
|
|
GLuint handle;
|
2009-11-27 18:45:36 +00:00
|
|
|
|
2012-09-10 20:45:33 +00:00
|
|
|
if (out_gl_target)
|
|
|
|
*out_gl_target = GL_TEXTURE_2D;
|
2009-11-27 18:45:36 +00:00
|
|
|
|
2012-09-10 20:45:33 +00:00
|
|
|
handle = ctx->driver_vtable->texture_2d_get_gl_handle (tex_2d);
|
2009-11-27 18:45:36 +00:00
|
|
|
|
2012-09-10 20:45:33 +00:00
|
|
|
if (out_gl_handle)
|
|
|
|
*out_gl_handle = handle;
|
2009-11-27 18:45:36 +00:00
|
|
|
|
2012-09-10 20:45:33 +00:00
|
|
|
return handle ? TRUE : FALSE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return FALSE;
|
2009-11-27 18:45:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2010-06-09 16:39:59 +00:00
|
|
|
_cogl_texture_2d_pre_paint (CoglTexture *tex, CoglTexturePrePaintFlags flags)
|
2009-11-27 18:45:36 +00:00
|
|
|
{
|
|
|
|
CoglTexture2D *tex_2d = COGL_TEXTURE_2D (tex);
|
|
|
|
|
|
|
|
/* Only update if the mipmaps are dirty */
|
2010-06-09 16:39:59 +00:00
|
|
|
if ((flags & COGL_TEXTURE_NEEDS_MIPMAP) &&
|
|
|
|
tex_2d->auto_mipmap && tex_2d->mipmaps_dirty)
|
|
|
|
{
|
2012-09-10 20:45:33 +00:00
|
|
|
CoglContext *ctx = tex->context;
|
|
|
|
|
|
|
|
ctx->driver_vtable->texture_2d_generate_mipmap (tex_2d);
|
2009-11-27 18:45:36 +00:00
|
|
|
|
2010-06-09 16:39:59 +00:00
|
|
|
tex_2d->mipmaps_dirty = FALSE;
|
|
|
|
}
|
2009-11-27 18:45:36 +00:00
|
|
|
}
|
|
|
|
|
2010-01-18 09:22:04 +00:00
|
|
|
static void
|
|
|
|
_cogl_texture_2d_ensure_non_quad_rendering (CoglTexture *tex)
|
|
|
|
{
|
|
|
|
/* Nothing needs to be done */
|
|
|
|
}
|
|
|
|
|
Switch use of primitive glib types to c99 equivalents
The coding style has for a long time said to avoid using redundant glib
data types such as gint or gchar etc because we feel that they make the
code look unnecessarily foreign to developers coming from outside of the
Gnome developer community.
Note: When we tried to find the historical rationale for the types we
just found that they were apparently only added for consistent syntax
highlighting which didn't seem that compelling.
Up until now we have been continuing to use some of the platform
specific type such as gint{8,16,32,64} and gsize but this patch switches
us over to using the standard c99 equivalents instead so we can further
ensure that our code looks familiar to the widest range of C developers
who might potentially contribute to Cogl.
So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this
switches all Cogl code to instead use the int{8,16,32,64}_t and
uint{8,16,32,64}_t c99 types instead.
Instead of gsize we now use size_t
For now we are not going to use the c99 _Bool type and instead we have
introduced a new CoglBool type to use instead of gboolean.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
2012-04-16 20:56:40 +00:00
|
|
|
static CoglBool
|
2012-11-08 17:54:10 +00:00
|
|
|
_cogl_texture_2d_set_region (CoglTexture *tex,
|
|
|
|
int src_x,
|
|
|
|
int src_y,
|
|
|
|
int dst_x,
|
|
|
|
int dst_y,
|
|
|
|
int width,
|
|
|
|
int height,
|
2012-11-09 17:55:54 +00:00
|
|
|
int level,
|
2012-11-08 17:54:10 +00:00
|
|
|
CoglBitmap *bmp,
|
|
|
|
CoglError **error)
|
2009-11-27 18:45:36 +00:00
|
|
|
{
|
2012-09-07 14:26:34 +00:00
|
|
|
CoglContext *ctx = tex->context;
|
2012-09-10 20:45:33 +00:00
|
|
|
CoglTexture2D *tex_2d = COGL_TEXTURE_2D (tex);
|
2010-07-13 17:41:01 +00:00
|
|
|
|
2012-11-08 17:54:10 +00:00
|
|
|
if (!ctx->driver_vtable->texture_2d_copy_from_bitmap (tex_2d,
|
|
|
|
src_x,
|
|
|
|
src_y,
|
|
|
|
width,
|
|
|
|
height,
|
2012-11-09 17:55:54 +00:00
|
|
|
bmp,
|
|
|
|
dst_x,
|
|
|
|
dst_y,
|
|
|
|
level,
|
2012-11-08 17:54:10 +00:00
|
|
|
error))
|
|
|
|
{
|
|
|
|
return FALSE;
|
|
|
|
}
|
2009-11-27 18:45:36 +00:00
|
|
|
|
2010-05-28 17:12:53 +00:00
|
|
|
tex_2d->mipmaps_dirty = TRUE;
|
|
|
|
|
2009-11-27 18:45:36 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
Switch use of primitive glib types to c99 equivalents
The coding style has for a long time said to avoid using redundant glib
data types such as gint or gchar etc because we feel that they make the
code look unnecessarily foreign to developers coming from outside of the
Gnome developer community.
Note: When we tried to find the historical rationale for the types we
just found that they were apparently only added for consistent syntax
highlighting which didn't seem that compelling.
Up until now we have been continuing to use some of the platform
specific type such as gint{8,16,32,64} and gsize but this patch switches
us over to using the standard c99 equivalents instead so we can further
ensure that our code looks familiar to the widest range of C developers
who might potentially contribute to Cogl.
So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this
switches all Cogl code to instead use the int{8,16,32,64}_t and
uint{8,16,32,64}_t c99 types instead.
Instead of gsize we now use size_t
For now we are not going to use the c99 _Bool type and instead we have
introduced a new CoglBool type to use instead of gboolean.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
2012-04-16 20:56:40 +00:00
|
|
|
static CoglBool
|
|
|
|
_cogl_texture_2d_get_data (CoglTexture *tex,
|
|
|
|
CoglPixelFormat format,
|
2012-09-26 16:05:01 +00:00
|
|
|
int rowstride,
|
Switch use of primitive glib types to c99 equivalents
The coding style has for a long time said to avoid using redundant glib
data types such as gint or gchar etc because we feel that they make the
code look unnecessarily foreign to developers coming from outside of the
Gnome developer community.
Note: When we tried to find the historical rationale for the types we
just found that they were apparently only added for consistent syntax
highlighting which didn't seem that compelling.
Up until now we have been continuing to use some of the platform
specific type such as gint{8,16,32,64} and gsize but this patch switches
us over to using the standard c99 equivalents instead so we can further
ensure that our code looks familiar to the widest range of C developers
who might potentially contribute to Cogl.
So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this
switches all Cogl code to instead use the int{8,16,32,64}_t and
uint{8,16,32,64}_t c99 types instead.
Instead of gsize we now use size_t
For now we are not going to use the c99 _Bool type and instead we have
introduced a new CoglBool type to use instead of gboolean.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
2012-04-16 20:56:40 +00:00
|
|
|
uint8_t *data)
|
2009-11-27 18:45:36 +00:00
|
|
|
{
|
2012-09-07 14:26:34 +00:00
|
|
|
CoglContext *ctx = tex->context;
|
2012-09-10 20:45:33 +00:00
|
|
|
|
|
|
|
if (ctx->driver_vtable->texture_2d_get_data)
|
|
|
|
{
|
|
|
|
CoglTexture2D *tex_2d = COGL_TEXTURE_2D (tex);
|
|
|
|
ctx->driver_vtable->texture_2d_get_data (tex_2d, format, rowstride, data);
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return FALSE;
|
2009-11-27 18:45:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static CoglPixelFormat
|
|
|
|
_cogl_texture_2d_get_format (CoglTexture *tex)
|
|
|
|
{
|
2012-11-22 23:01:08 +00:00
|
|
|
return COGL_TEXTURE_2D (tex)->internal_format;
|
2009-11-27 18:45:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static GLenum
|
|
|
|
_cogl_texture_2d_get_gl_format (CoglTexture *tex)
|
|
|
|
{
|
2012-11-09 17:55:54 +00:00
|
|
|
return COGL_TEXTURE_2D (tex)->gl_internal_format;
|
2009-11-27 18:45:36 +00:00
|
|
|
}
|
|
|
|
|
Switch use of primitive glib types to c99 equivalents
The coding style has for a long time said to avoid using redundant glib
data types such as gint or gchar etc because we feel that they make the
code look unnecessarily foreign to developers coming from outside of the
Gnome developer community.
Note: When we tried to find the historical rationale for the types we
just found that they were apparently only added for consistent syntax
highlighting which didn't seem that compelling.
Up until now we have been continuing to use some of the platform
specific type such as gint{8,16,32,64} and gsize but this patch switches
us over to using the standard c99 equivalents instead so we can further
ensure that our code looks familiar to the widest range of C developers
who might potentially contribute to Cogl.
So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this
switches all Cogl code to instead use the int{8,16,32,64}_t and
uint{8,16,32,64}_t c99 types instead.
Instead of gsize we now use size_t
For now we are not going to use the c99 _Bool type and instead we have
introduced a new CoglBool type to use instead of gboolean.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
2012-04-16 20:56:40 +00:00
|
|
|
static CoglBool
|
2010-10-04 14:27:38 +00:00
|
|
|
_cogl_texture_2d_is_foreign (CoglTexture *tex)
|
|
|
|
{
|
|
|
|
return COGL_TEXTURE_2D (tex)->is_foreign;
|
|
|
|
}
|
|
|
|
|
2012-02-09 11:19:04 +00:00
|
|
|
static CoglTextureType
|
|
|
|
_cogl_texture_2d_get_type (CoglTexture *tex)
|
|
|
|
{
|
|
|
|
return COGL_TEXTURE_TYPE_2D;
|
|
|
|
}
|
|
|
|
|
2009-11-27 18:45:36 +00:00
|
|
|
static const CoglTextureVtable
|
|
|
|
cogl_texture_2d_vtable =
|
|
|
|
{
|
2012-04-04 14:09:43 +00:00
|
|
|
TRUE, /* primitive */
|
2012-11-22 23:01:08 +00:00
|
|
|
_cogl_texture_2d_allocate,
|
2009-11-27 18:45:36 +00:00
|
|
|
_cogl_texture_2d_set_region,
|
|
|
|
_cogl_texture_2d_get_data,
|
2011-10-08 13:13:03 +00:00
|
|
|
NULL, /* foreach_sub_texture_in_region */
|
2009-11-27 18:45:36 +00:00
|
|
|
_cogl_texture_2d_get_max_waste,
|
|
|
|
_cogl_texture_2d_is_sliced,
|
|
|
|
_cogl_texture_2d_can_hardware_repeat,
|
|
|
|
_cogl_texture_2d_transform_coords_to_gl,
|
2010-01-18 09:22:04 +00:00
|
|
|
_cogl_texture_2d_transform_quad_coords_to_gl,
|
2009-11-27 18:45:36 +00:00
|
|
|
_cogl_texture_2d_get_gl_texture,
|
2012-09-10 19:35:39 +00:00
|
|
|
_cogl_texture_2d_gl_flush_legacy_texobj_filters,
|
2010-06-09 16:39:59 +00:00
|
|
|
_cogl_texture_2d_pre_paint,
|
2010-01-18 09:22:04 +00:00
|
|
|
_cogl_texture_2d_ensure_non_quad_rendering,
|
2012-09-10 19:35:39 +00:00
|
|
|
_cogl_texture_2d_gl_flush_legacy_texobj_wrap_modes,
|
2009-11-27 18:45:36 +00:00
|
|
|
_cogl_texture_2d_get_format,
|
|
|
|
_cogl_texture_2d_get_gl_format,
|
2012-02-09 11:19:04 +00:00
|
|
|
_cogl_texture_2d_get_type,
|
2012-04-04 14:09:43 +00:00
|
|
|
_cogl_texture_2d_is_foreign,
|
|
|
|
_cogl_texture_2d_set_auto_mipmap
|
2009-11-27 18:45:36 +00:00
|
|
|
};
|