brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cogl: Move all of the fields from CoglTexture to CoglTexture2DSliced

Browse Source 
Most of the fields that were previously in CoglTexture are specific to
the implementation of CoglTexture2DSliced so they should be placed
there instead. For example, the 'mipmaps_dirty' flag is an
implementation detail of the ensure_mipmaps function so it doesn't
make sense to force all texture backends to have this function.

Other fields such as width, height, gl_format and format may make
sense for all textures but I've added them as virtual functions
instead. This may make more sense for a sub-texture backend for
example where it can calculate these based on the full texture.
This commit is contained in:
Neil Roberts 2009-11-26 18:58:17 +00:00
parent 5030356e0e
commit 25f3b993c6
4 changed files with 149 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cogl/cogl-texture-2d-sliced-private.h
View File

@ -54,6 +54,21 @@ struct _CoglTexture2DSliced
GArray *slice_gl_handles; GArray *slice_gl_handles;
gint max_waste; gint max_waste;
/* The internal format of the GL texture represented as a
CoglPixelFormat */
CoglPixelFormat format;
/* The internal format of the GL texture represented as a GL enum */
GLenum gl_format;
GLenum gl_target;
gint width;
gint height;
GLenum min_filter;
GLenum mag_filter;
gboolean is_foreign;
GLint wrap_mode;
gboolean auto_mipmap;
gboolean mipmaps_dirty;
/* This holds a copy of the first pixel in each slice. It is only /* This holds a copy of the first pixel in each slice. It is only
used to force an automatic update of the mipmaps when used to force an automatic update of the mipmaps when
glGenerateMipmap is not available. */ glGenerateMipmap is not available. */

204
cogl/cogl-texture-2d-sliced.c
View File

@ -71,12 +71,12 @@ _cogl_texture_2d_sliced_foreach_sub_texture_in_region (
void *user_data) void *user_data)
{ {
CoglTexture2DSliced *tex_2ds = COGL_TEXTURE_2D_SLICED (tex); CoglTexture2DSliced *tex_2ds = COGL_TEXTURE_2D_SLICED (tex);
float width = tex->width; float width = tex_2ds->width;
float height = tex->height; float height = tex_2ds->height;
CoglSpanIter iter_x; CoglSpanIter iter_x;
CoglSpanIter iter_y; CoglSpanIter iter_y;
g_assert (tex->gl_target == GL_TEXTURE_2D); g_assert (tex_2ds->gl_target == GL_TEXTURE_2D);
/* Slice spans are stored in denormalized coordinates, and this is what /* Slice spans are stored in denormalized coordinates, and this is what
* the _cogl_span_iter_* funcs expect to be given, so we scale the given * the _cogl_span_iter_* funcs expect to be given, so we scale the given
@ -173,7 +173,7 @@ _cogl_texture_2d_sliced_foreach_sub_texture_in_region (
callback (tex, callback (tex,
gl_handle, gl_handle,
tex->gl_target, tex_2ds->gl_target,
slice_coords, slice_coords,
virtual_coords, virtual_coords,
user_data); user_data);
@ -221,7 +221,6 @@ _cogl_texture_2d_sliced_upload_to_gl (CoglTexture2DSliced *tex_2ds,
gint bpp; gint bpp;
gint x,y; gint x,y;
guchar *waste_buf; guchar *waste_buf;
CoglTexture *tex = COGL_TEXTURE (tex_2ds);
bpp = _cogl_get_format_bpp (upload_data->bitmap.format); bpp = _cogl_get_format_bpp (upload_data->bitmap.format);
@ -245,7 +244,7 @@ _cogl_texture_2d_sliced_upload_to_gl (CoglTexture2DSliced *tex_2ds,
gl_handle = g_array_index (tex_2ds->slice_gl_handles, GLuint, slice_num); gl_handle = g_array_index (tex_2ds->slice_gl_handles, GLuint, slice_num);
_cogl_texture_driver_upload_subregion_to_gl ( _cogl_texture_driver_upload_subregion_to_gl (
tex->gl_target, tex_2ds->gl_target,
gl_handle, gl_handle,
x_span->start, /* src x */ x_span->start, /* src x */
y_span->start, /* src y */ y_span->start, /* src y */
@ -292,7 +291,7 @@ _cogl_texture_2d_sliced_upload_to_gl (CoglTexture2DSliced *tex_2ds,
x_span->waste * bpp, x_span->waste * bpp,
bpp); bpp);
GE( glTexSubImage2D (tex->gl_target, 0, GE( glTexSubImage2D (tex_2ds->gl_target, 0,
x_span->size - x_span->waste, x_span->size - x_span->waste,
0, 0,
x_span->waste, x_span->waste,
@ -326,7 +325,7 @@ _cogl_texture_2d_sliced_upload_to_gl (CoglTexture2DSliced *tex_2ds,
x_span->size * bpp, x_span->size * bpp,
bpp); bpp);
GE( glTexSubImage2D (tex->gl_target, 0, GE( glTexSubImage2D (tex_2ds->gl_target, 0,
0, 0,
y_span->size - y_span->waste, y_span->size - y_span->waste,
x_span->size, x_span->size,
@ -340,7 +339,7 @@ _cogl_texture_2d_sliced_upload_to_gl (CoglTexture2DSliced *tex_2ds,
if (waste_buf) if (waste_buf)
g_free (waste_buf); g_free (waste_buf);
tex->mipmaps_dirty = TRUE; tex_2ds->mipmaps_dirty = TRUE;
return TRUE; return TRUE;
} }
@ -357,7 +356,6 @@ _cogl_texture_2d_sliced_upload_subregion_to_gl (CoglTexture2DSliced *tex_2ds,
GLuint source_gl_format, GLuint source_gl_format,
GLuint source_gl_type) GLuint source_gl_type)
{ {
CoglTexture *tex = COGL_TEXTURE (tex_2ds);
CoglSpan *x_span; CoglSpan *x_span;
CoglSpan *y_span; CoglSpan *y_span;
gint bpp; gint bpp;
@ -378,7 +376,7 @@ _cogl_texture_2d_sliced_upload_subregion_to_gl (CoglTexture2DSliced *tex_2ds,
for (source_y = src_y, for (source_y = src_y,
_cogl_span_iter_begin (&y_iter, _cogl_span_iter_begin (&y_iter,
tex_2ds->slice_y_spans, tex_2ds->slice_y_spans,
tex->height, tex_2ds->height,
dst_y, dst_y,
dst_y + height); dst_y + height);
@ -401,7 +399,7 @@ _cogl_texture_2d_sliced_upload_subregion_to_gl (CoglTexture2DSliced *tex_2ds,
for (source_x = src_x, for (source_x = src_x,
_cogl_span_iter_begin (&x_iter, _cogl_span_iter_begin (&x_iter,
tex_2ds->slice_x_spans, tex_2ds->slice_x_spans,
tex->width, tex_2ds->width,
dst_x, dst_x,
dst_x + width); dst_x + width);
@ -435,7 +433,7 @@ _cogl_texture_2d_sliced_upload_subregion_to_gl (CoglTexture2DSliced *tex_2ds,
/* Pick slice GL handle */ /* Pick slice GL handle */
gl_handle = g_array_index (tex_2ds->slice_gl_handles, GLuint, slice_num); gl_handle = g_array_index (tex_2ds->slice_gl_handles, GLuint, slice_num);
_cogl_texture_driver_upload_subregion_to_gl (tex->gl_target, _cogl_texture_driver_upload_subregion_to_gl (tex_2ds->gl_target,
gl_handle, gl_handle,
source_x, source_x,
source_y, source_y,
@ -493,7 +491,7 @@ _cogl_texture_2d_sliced_upload_subregion_to_gl (CoglTexture2DSliced *tex_2ds,
x_span->waste * bpp, x_span->waste * bpp,
bpp); bpp);
GE( glTexSubImage2D (tex->gl_target, 0, GE( glTexSubImage2D (tex_2ds->gl_target, 0,
x_span->size - x_span->waste, x_span->size - x_span->waste,
local_y, local_y,
x_span->waste, x_span->waste,
@ -544,7 +542,7 @@ _cogl_texture_2d_sliced_upload_subregion_to_gl (CoglTexture2DSliced *tex_2ds,
copy_width * bpp, copy_width * bpp,
bpp); bpp);
GE( glTexSubImage2D (tex->gl_target, 0, GE( glTexSubImage2D (tex_2ds->gl_target, 0,
local_x, local_x,
y_span->size - y_span->waste, y_span->size - y_span->waste,
copy_width, copy_width,
@ -559,7 +557,7 @@ _cogl_texture_2d_sliced_upload_subregion_to_gl (CoglTexture2DSliced *tex_2ds,
if (waste_buf) if (waste_buf)
g_free (waste_buf); g_free (waste_buf);
tex->mipmaps_dirty = TRUE; tex_2ds->mipmaps_dirty = TRUE;
return TRUE; return TRUE;
} }
@ -664,7 +662,7 @@ _cogl_texture_2d_sliced_set_wrap_mode_parameter (CoglTexture *tex,
/* Only set the wrap mode if it's different from the current /* Only set the wrap mode if it's different from the current
value to avoid too many GL calls */ value to avoid too many GL calls */
if (tex->wrap_mode != wrap_mode) if (tex_2ds->wrap_mode != wrap_mode)
{ {
int i; int i;
@ -676,12 +674,12 @@ _cogl_texture_2d_sliced_set_wrap_mode_parameter (CoglTexture *tex,
{ {
GLuint texnum = g_array_index (tex_2ds->slice_gl_handles, GLuint, i); GLuint texnum = g_array_index (tex_2ds->slice_gl_handles, GLuint, i);
GE( glBindTexture (tex->gl_target, texnum) ); GE( glBindTexture (tex_2ds->gl_target, texnum) );
GE( glTexParameteri (tex->gl_target, GL_TEXTURE_WRAP_S, wrap_mode) ); GE( glTexParameteri (tex_2ds->gl_target, GL_TEXTURE_WRAP_S, wrap_mode) );
GE( glTexParameteri (tex->gl_target, GL_TEXTURE_WRAP_T, wrap_mode) ); GE( glTexParameteri (tex_2ds->gl_target, GL_TEXTURE_WRAP_T, wrap_mode) );
} }
tex->wrap_mode = wrap_mode; tex_2ds->wrap_mode = wrap_mode;
} }
} }
@ -689,7 +687,6 @@ static gboolean
_cogl_texture_2d_sliced_slices_create (CoglTexture2DSliced *tex_2ds, _cogl_texture_2d_sliced_slices_create (CoglTexture2DSliced *tex_2ds,
const CoglTextureUploadData *upload_data) const CoglTextureUploadData *upload_data)
{ {
CoglTexture *tex = COGL_TEXTURE (tex_2ds);
gint max_width; gint max_width;
gint max_height; gint max_height;
GLuint *gl_handles; GLuint *gl_handles;
@ -708,14 +705,14 @@ _cogl_texture_2d_sliced_slices_create (CoglTexture2DSliced *tex_2ds,
{ {
max_width = upload_data->bitmap.width; max_width = upload_data->bitmap.width;
max_height = upload_data->bitmap.height; max_height = upload_data->bitmap.height;
tex->gl_target = GL_TEXTURE_2D; tex_2ds->gl_target = GL_TEXTURE_2D;
slices_for_size = _cogl_rect_slices_for_size; slices_for_size = _cogl_rect_slices_for_size;
} }
else else
{ {
max_width = cogl_util_next_p2 (upload_data->bitmap.width); max_width = cogl_util_next_p2 (upload_data->bitmap.width);
max_height = cogl_util_next_p2 (upload_data->bitmap.height); max_height = cogl_util_next_p2 (upload_data->bitmap.height);
tex->gl_target = GL_TEXTURE_2D; tex_2ds->gl_target = GL_TEXTURE_2D;
slices_for_size = _cogl_pot_slices_for_size; slices_for_size = _cogl_pot_slices_for_size;
} }
@ -725,7 +722,7 @@ _cogl_texture_2d_sliced_slices_create (CoglTexture2DSliced *tex_2ds,
CoglSpan span; CoglSpan span;
/* Check if size supported else bail out */ /* Check if size supported else bail out */
if (!_cogl_texture_driver_size_supported (tex->gl_target, if (!_cogl_texture_driver_size_supported (tex_2ds->gl_target,
upload_data->gl_intformat, upload_data->gl_intformat,
upload_data->gl_type, upload_data->gl_type,
max_width, max_width,
@ -759,7 +756,7 @@ _cogl_texture_2d_sliced_slices_create (CoglTexture2DSliced *tex_2ds,
else else
{ {
/* Decrease the size of largest slice until supported by GL */ /* Decrease the size of largest slice until supported by GL */
while (!_cogl_texture_driver_size_supported (tex->gl_target, while (!_cogl_texture_driver_size_supported (tex_2ds->gl_target,
upload_data->gl_intformat, upload_data->gl_intformat,
upload_data->gl_type, upload_data->gl_type,
max_width, max_width,
@ -821,7 +818,7 @@ _cogl_texture_2d_sliced_slices_create (CoglTexture2DSliced *tex_2ds,
tex_2ds->first_pixels = g_new (CoglTexturePixel, n_slices); tex_2ds->first_pixels = g_new (CoglTexturePixel, n_slices);
/* Wrap mode not yet set */ /* Wrap mode not yet set */
tex->wrap_mode = GL_FALSE; tex_2ds->wrap_mode = GL_FALSE;
/* Generate a "working set" of GL texture objects /* Generate a "working set" of GL texture objects
* (some implementations might supported faster * (some implementations might supported faster
@ -846,15 +843,15 @@ _cogl_texture_2d_sliced_slices_create (CoglTexture2DSliced *tex_2ds,
y_span->size - y_span->waste); y_span->size - y_span->waste);
/* Setup texture parameters */ /* Setup texture parameters */
GE( _cogl_texture_driver_bind (tex->gl_target, GE( _cogl_texture_driver_bind (tex_2ds->gl_target,
gl_handles[y * n_x_slices + x], gl_handles[y * n_x_slices + x],
upload_data->gl_intformat) ); upload_data->gl_intformat) );
_cogl_texture_driver_try_setting_gl_border_color (tex->gl_target, _cogl_texture_driver_try_setting_gl_border_color (tex_2ds->gl_target,
transparent_color); transparent_color);
/* Pass NULL data to init size and internal format */ /* Pass NULL data to init size and internal format */
GE( glTexImage2D (tex->gl_target, 0, upload_data->gl_intformat, GE( glTexImage2D (tex_2ds->gl_target, 0, upload_data->gl_intformat,
x_span->size, y_span->size, 0, x_span->size, y_span->size, 0,
upload_data->gl_format, upload_data->gl_type, 0) ); upload_data->gl_format, upload_data->gl_type, 0) );
} }
@ -866,8 +863,6 @@ _cogl_texture_2d_sliced_slices_create (CoglTexture2DSliced *tex_2ds,
static void static void
_cogl_texture_2d_sliced_slices_free (CoglTexture2DSliced *tex_2ds) _cogl_texture_2d_sliced_slices_free (CoglTexture2DSliced *tex_2ds)
{ {
CoglTexture *tex = COGL_TEXTURE (tex_2ds);
if (tex_2ds->slice_x_spans != NULL) if (tex_2ds->slice_x_spans != NULL)
g_array_free (tex_2ds->slice_x_spans, TRUE); g_array_free (tex_2ds->slice_x_spans, TRUE);
@ -876,7 +871,7 @@ _cogl_texture_2d_sliced_slices_free (CoglTexture2DSliced *tex_2ds)
if (tex_2ds->slice_gl_handles != NULL) if (tex_2ds->slice_gl_handles != NULL)
{ {
if (tex->is_foreign == FALSE) if (tex_2ds->is_foreign == FALSE)
{ {
GE( glDeleteTextures (tex_2ds->slice_gl_handles->len, GE( glDeleteTextures (tex_2ds->slice_gl_handles->len,
(GLuint*) tex_2ds->slice_gl_handles->data) ); (GLuint*) tex_2ds->slice_gl_handles->data) );
@ -906,9 +901,9 @@ _cogl_texture_2d_sliced_upload_from_data
tex->vtable = &cogl_texture_2d_sliced_vtable; tex->vtable = &cogl_texture_2d_sliced_vtable;
tex->is_foreign = FALSE; tex_2ds->is_foreign = FALSE;
tex->auto_mipmap = FALSE; tex_2ds->auto_mipmap = FALSE;
tex->mipmaps_dirty = TRUE; tex_2ds->mipmaps_dirty = TRUE;
tex_2ds->first_pixels = NULL; tex_2ds->first_pixels = NULL;
tex_2ds->slice_x_spans = NULL; tex_2ds->slice_x_spans = NULL;
@ -916,8 +911,8 @@ _cogl_texture_2d_sliced_upload_from_data
tex_2ds->slice_gl_handles = NULL; tex_2ds->slice_gl_handles = NULL;
/* Unknown filter */ /* Unknown filter */
tex->min_filter = GL_FALSE; tex_2ds->min_filter = GL_FALSE;
tex->mag_filter = GL_FALSE; tex_2ds->mag_filter = GL_FALSE;
if (upload_data->bitmap.data) if (upload_data->bitmap.data)
{ {
@ -945,10 +940,10 @@ _cogl_texture_2d_sliced_upload_from_data
return FALSE; return FALSE;
} }
tex->gl_format = upload_data->gl_intformat; tex_2ds->gl_format = upload_data->gl_intformat;
tex->width = upload_data->bitmap.width; tex_2ds->width = upload_data->bitmap.width;
tex->height = upload_data->bitmap.height; tex_2ds->height = upload_data->bitmap.height;
tex->format = upload_data->bitmap.format; tex_2ds->format = upload_data->bitmap.format;
return TRUE; return TRUE;
} }
@ -990,7 +985,7 @@ _cogl_texture_2d_sliced_new_with_size (unsigned int width,
return COGL_INVALID_HANDLE; return COGL_INVALID_HANDLE;
} }
tex->auto_mipmap = (flags & COGL_TEXTURE_NO_AUTO_MIPMAP) == 0; tex_2ds->auto_mipmap = (flags & COGL_TEXTURE_NO_AUTO_MIPMAP) == 0;
_cogl_texture_upload_data_free (&upload_data); _cogl_texture_upload_data_free (&upload_data);
@ -1053,7 +1048,7 @@ _cogl_texture_2d_sliced_new_from_data (unsigned int width,
_cogl_texture_upload_data_free (&upload_data); _cogl_texture_upload_data_free (&upload_data);
tex->auto_mipmap = (flags & COGL_TEXTURE_NO_AUTO_MIPMAP) == 0; tex_2ds->auto_mipmap = (flags & COGL_TEXTURE_NO_AUTO_MIPMAP) == 0;
return _cogl_texture_2d_sliced_handle_new (tex_2ds); return _cogl_texture_2d_sliced_handle_new (tex_2ds);
} }
@ -1099,7 +1094,7 @@ _cogl_texture_2d_sliced_new_from_bitmap (CoglHandle bmp_handle,
return COGL_INVALID_HANDLE; return COGL_INVALID_HANDLE;
} }
tex->auto_mipmap = (flags & COGL_TEXTURE_NO_AUTO_MIPMAP) == 0; tex_2ds->auto_mipmap = (flags & COGL_TEXTURE_NO_AUTO_MIPMAP) == 0;
_cogl_texture_upload_data_free (&upload_data); _cogl_texture_upload_data_free (&upload_data);
@ -1236,24 +1231,24 @@ _cogl_texture_2d_sliced_new_from_foreign (GLuint gl_handle,
tex->vtable = &cogl_texture_2d_sliced_vtable; tex->vtable = &cogl_texture_2d_sliced_vtable;
/* Setup bitmap info */ /* Setup bitmap info */
tex->is_foreign = TRUE; tex_2ds->is_foreign = TRUE;
tex->auto_mipmap = (gl_gen_mipmap == GL_TRUE) ? TRUE : FALSE; tex_2ds->auto_mipmap = (gl_gen_mipmap == GL_TRUE) ? TRUE : FALSE;
tex->mipmaps_dirty = TRUE; tex_2ds->mipmaps_dirty = TRUE;
tex_2ds->first_pixels = NULL; tex_2ds->first_pixels = NULL;
tex->format = format; tex_2ds->format = format;
tex->width = gl_width - x_pot_waste; tex_2ds->width = gl_width - x_pot_waste;
tex->height = gl_height - y_pot_waste; tex_2ds->height = gl_height - y_pot_waste;
tex->gl_target = gl_target; tex_2ds->gl_target = gl_target;
tex->gl_format = gl_int_format; tex_2ds->gl_format = gl_int_format;
/* Unknown filter */ /* Unknown filter */
tex->min_filter = GL_FALSE; tex_2ds->min_filter = GL_FALSE;
tex->mag_filter = GL_FALSE; tex_2ds->mag_filter = GL_FALSE;
tex_2ds->max_waste = 0; tex_2ds->max_waste = 0;
/* Wrap mode not yet set */ /* Wrap mode not yet set */
tex->wrap_mode = GL_FALSE; tex_2ds->wrap_mode = GL_FALSE;
/* Create slice arrays */ /* Create slice arrays */
tex_2ds->slice_x_spans = tex_2ds->slice_x_spans =
@ -1318,6 +1313,12 @@ _cogl_texture_2d_sliced_can_hardware_repeat (CoglTexture *tex)
x_span = &g_array_index (tex_2ds->slice_x_spans, CoglSpan, 0); x_span = &g_array_index (tex_2ds->slice_x_spans, CoglSpan, 0);
y_span = &g_array_index (tex_2ds->slice_y_spans, CoglSpan, 0); y_span = &g_array_index (tex_2ds->slice_y_spans, CoglSpan, 0);
#if HAVE_COGL_GL
/* TODO: COGL_TEXTURE_TYPE_2D_RECTANGLE */
if (tex_2ds->gl_target == GL_TEXTURE_RECTANGLE_ARB)
return FALSE;
#endif
return (x_span->waste || y_span->waste) ? FALSE : TRUE; return (x_span->waste || y_span->waste) ? FALSE : TRUE;
} }
@ -1336,12 +1337,12 @@ _cogl_texture_2d_sliced_transform_coords_to_gl (CoglTexture *tex,
x_span = &g_array_index (tex_2ds->slice_x_spans, CoglSpan, 0); x_span = &g_array_index (tex_2ds->slice_x_spans, CoglSpan, 0);
y_span = &g_array_index (tex_2ds->slice_y_spans, CoglSpan, 0); y_span = &g_array_index (tex_2ds->slice_y_spans, CoglSpan, 0);
*s *= tex->width / (float)x_span->size; *s *= tex_2ds->width / (float)x_span->size;
*t *= tex->height / (float)y_span->size; *t *= tex_2ds->height / (float)y_span->size;
#if HAVE_COGL_GL #if HAVE_COGL_GL
/* Denormalize texture coordinates for rectangle textures */ /* Denormalize texture coordinates for rectangle textures */
if (tex->gl_target == GL_TEXTURE_RECTANGLE_ARB) if (tex_2ds->gl_target == GL_TEXTURE_RECTANGLE_ARB)
{ {
*s *= x_span->size; *s *= x_span->size;
*t *= y_span->size; *t *= y_span->size;
@ -1366,7 +1367,7 @@ _cogl_texture_2d_sliced_get_gl_texture (CoglTexture *tex,
*out_gl_handle = g_array_index (tex_2ds->slice_gl_handles, GLuint, 0); *out_gl_handle = g_array_index (tex_2ds->slice_gl_handles, GLuint, 0);
if (out_gl_target != NULL) if (out_gl_target != NULL)
*out_gl_target = tex->gl_target; *out_gl_target = tex_2ds->gl_target;
return TRUE; return TRUE;
} }
@ -1384,23 +1385,23 @@ _cogl_texture_2d_sliced_set_filters (CoglTexture *tex,
if (tex_2ds->slice_gl_handles == NULL) if (tex_2ds->slice_gl_handles == NULL)
return; return;
if (min_filter == tex->min_filter if (min_filter == tex_2ds->min_filter
&& mag_filter == tex->mag_filter) && mag_filter == tex_2ds->mag_filter)
return; return;
/* Store new values */ /* Store new values */
tex->min_filter = min_filter; tex_2ds->min_filter = min_filter;
tex->mag_filter = mag_filter; tex_2ds->mag_filter = mag_filter;
/* Apply new filters to every slice */ /* Apply new filters to every slice */
for (i=0; i<tex_2ds->slice_gl_handles->len; ++i) for (i=0; i<tex_2ds->slice_gl_handles->len; ++i)
{ {
gl_handle = g_array_index (tex_2ds->slice_gl_handles, GLuint, i); gl_handle = g_array_index (tex_2ds->slice_gl_handles, GLuint, i);
GE( glBindTexture (tex->gl_target, gl_handle) ); GE( glBindTexture (tex_2ds->gl_target, gl_handle) );
GE( glTexParameteri (tex->gl_target, GL_TEXTURE_MAG_FILTER, GE( glTexParameteri (tex_2ds->gl_target, GL_TEXTURE_MAG_FILTER,
tex->mag_filter) ); tex_2ds->mag_filter) );
GE( glTexParameteri (tex->gl_target, GL_TEXTURE_MIN_FILTER, GE( glTexParameteri (tex_2ds->gl_target, GL_TEXTURE_MIN_FILTER,
tex->min_filter) ); tex_2ds->min_filter) );
} }
} }
@ -1413,7 +1414,7 @@ _cogl_texture_2d_sliced_ensure_mipmaps (CoglTexture *tex)
_COGL_GET_CONTEXT (ctx, NO_RETVAL); _COGL_GET_CONTEXT (ctx, NO_RETVAL);
/* Only update if the mipmaps are dirty */ /* Only update if the mipmaps are dirty */
if (!tex->auto_mipmap || !tex->mipmaps_dirty) if (!tex_2ds->auto_mipmap || !tex_2ds->mipmaps_dirty)
return; return;
/* Make sure slices were created */ /* Make sure slices were created */
@ -1424,25 +1425,25 @@ _cogl_texture_2d_sliced_ensure_mipmaps (CoglTexture *tex)
for (i = 0; i < tex_2ds->slice_gl_handles->len; i++) for (i = 0; i < tex_2ds->slice_gl_handles->len; i++)
{ {
GLuint gl_handle = g_array_index (tex_2ds->slice_gl_handles, GLuint, i); GLuint gl_handle = g_array_index (tex_2ds->slice_gl_handles, GLuint, i);
GE( glBindTexture (tex->gl_target, gl_handle) ); GE( glBindTexture (tex_2ds->gl_target, gl_handle) );
/* glGenerateMipmap is defined in the FBO extension */ /* glGenerateMipmap is defined in the FBO extension */
if (cogl_features_available (COGL_FEATURE_OFFSCREEN)) if (cogl_features_available (COGL_FEATURE_OFFSCREEN))
_cogl_texture_driver_gl_generate_mipmaps (tex->gl_target); _cogl_texture_driver_gl_generate_mipmaps (tex_2ds->gl_target);
else if (tex_2ds->first_pixels) else if (tex_2ds->first_pixels)
{ {
CoglTexturePixel *pixel = tex_2ds->first_pixels + i; CoglTexturePixel *pixel = tex_2ds->first_pixels + i;
/* Temporarily enable automatic mipmap generation and /* Temporarily enable automatic mipmap generation and
re-upload the first pixel to cause a regeneration */ re-upload the first pixel to cause a regeneration */
GE( glTexParameteri (tex->gl_target, GL_GENERATE_MIPMAP, GL_TRUE) ); GE( glTexParameteri (tex_2ds->gl_target, GL_GENERATE_MIPMAP, GL_TRUE) );
GE( glTexSubImage2D (tex->gl_target, 0, 0, 0, 1, 1, GE( glTexSubImage2D (tex_2ds->gl_target, 0, 0, 0, 1, 1,
pixel->gl_format, pixel->gl_type, pixel->gl_format, pixel->gl_type,
pixel->data) ); pixel->data) );
GE( glTexParameteri (tex->gl_target, GL_GENERATE_MIPMAP, GL_FALSE) ); GE( glTexParameteri (tex_2ds->gl_target, GL_GENERATE_MIPMAP, GL_FALSE) );
} }
} }
tex->mipmaps_dirty = FALSE; tex_2ds->mipmaps_dirty = FALSE;
} }
static gboolean static gboolean
@ -1488,7 +1489,7 @@ _cogl_texture_2d_sliced_set_region (CoglTexture *tex,
source_bmp.rowstride = (rowstride == 0) ? width * bpp : rowstride; source_bmp.rowstride = (rowstride == 0) ? width * bpp : rowstride;
/* Find closest format to internal that's supported by GL */ /* Find closest format to internal that's supported by GL */
closest_format = _cogl_pixel_format_to_gl (tex->format, closest_format = _cogl_pixel_format_to_gl (tex_2ds->format,
NULL, /* don't need */ NULL, /* don't need */
&closest_gl_format, &closest_gl_format,
&closest_gl_type); &closest_gl_type);
@ -1530,7 +1531,6 @@ _cogl_texture_2d_sliced_download_from_gl (
GLuint target_gl_format, GLuint target_gl_format,
GLuint target_gl_type) GLuint target_gl_type)
{ {
CoglTexture *tex = COGL_TEXTURE (tex_2ds);
CoglSpan *x_span; CoglSpan *x_span;
CoglSpan *y_span; CoglSpan *y_span;
GLuint gl_handle; GLuint gl_handle;
@ -1574,9 +1574,9 @@ _cogl_texture_2d_sliced_download_from_gl (
bpp); bpp);
/* Download slice image data into temp bmp */ /* Download slice image data into temp bmp */
GE( glBindTexture (tex->gl_target, gl_handle) ); GE( glBindTexture (tex_2ds->gl_target, gl_handle) );
if (!_cogl_texture_driver_gl_get_tex_image (tex->gl_target, if (!_cogl_texture_driver_gl_get_tex_image (tex_2ds->gl_target,
target_gl_format, target_gl_format,
target_gl_type, target_gl_type,
slice_bmp.data)) slice_bmp.data))
@ -1608,9 +1608,9 @@ _cogl_texture_2d_sliced_download_from_gl (
bpp); bpp);
/* Download slice image data */ /* Download slice image data */
GE( glBindTexture (tex->gl_target, gl_handle) ); GE( glBindTexture (tex_2ds->gl_target, gl_handle) );
if (!_cogl_texture_driver_gl_get_tex_image (tex->gl_target, if (!_cogl_texture_driver_gl_get_tex_image (tex_2ds->gl_target,
target_gl_format, target_gl_format,
target_gl_type, target_gl_type,
dst)) dst))
@ -1646,14 +1646,14 @@ _cogl_texture_2d_sliced_get_data (CoglTexture *tex,
/* Default to internal format if none specified */ /* Default to internal format if none specified */
if (format == COGL_PIXEL_FORMAT_ANY) if (format == COGL_PIXEL_FORMAT_ANY)
format = tex->format; format = tex_2ds->format;
/* Rowstride from texture width if none specified */ /* Rowstride from texture width if none specified */
bpp = _cogl_get_format_bpp (format); bpp = _cogl_get_format_bpp (format);
if (rowstride == 0) rowstride = tex->width * bpp; if (rowstride == 0) rowstride = tex_2ds->width * bpp;
/* Return byte size if only that requested */ /* Return byte size if only that requested */
byte_size = tex->height * rowstride; byte_size = tex_2ds->height * rowstride;
if (data == NULL) return byte_size; if (data == NULL) return byte_size;
closest_format = closest_format =
@ -1662,8 +1662,8 @@ _cogl_texture_2d_sliced_get_data (CoglTexture *tex,
&closest_gl_type); &closest_gl_type);
closest_bpp = _cogl_get_format_bpp (closest_format); closest_bpp = _cogl_get_format_bpp (closest_format);
target_bmp.width = tex->width; target_bmp.width = tex_2ds->width;
target_bmp.height = tex->height; target_bmp.height = tex_2ds->height;
/* Is the requested format supported? */ /* Is the requested format supported? */
if (closest_format == format) if (closest_format == format)
@ -1723,6 +1723,30 @@ _cogl_texture_2d_sliced_get_data (CoglTexture *tex,
return byte_size; return byte_size;
} }
static CoglPixelFormat
_cogl_texture_2d_sliced_get_format (CoglTexture *tex)
{
return COGL_TEXTURE_2D_SLICED (tex)->format;
}
static GLenum
_cogl_texture_2d_sliced_get_gl_format (CoglTexture *tex)
{
return COGL_TEXTURE_2D_SLICED (tex)->gl_format;
}
static gint
_cogl_texture_2d_sliced_get_width (CoglTexture *tex)
{
return COGL_TEXTURE_2D_SLICED (tex)->width;
}
static gint
_cogl_texture_2d_sliced_get_height (CoglTexture *tex)
{
return COGL_TEXTURE_2D_SLICED (tex)->height;
}
static const CoglTextureVtable static const CoglTextureVtable
cogl_texture_2d_sliced_vtable = cogl_texture_2d_sliced_vtable =
{ {
@ -1736,5 +1760,9 @@ cogl_texture_2d_sliced_vtable =
_cogl_texture_2d_sliced_get_gl_texture, _cogl_texture_2d_sliced_get_gl_texture,
_cogl_texture_2d_sliced_set_filters, _cogl_texture_2d_sliced_set_filters,
_cogl_texture_2d_sliced_ensure_mipmaps, _cogl_texture_2d_sliced_ensure_mipmaps,
_cogl_texture_2d_sliced_set_wrap_mode_parameter _cogl_texture_2d_sliced_set_wrap_mode_parameter,
_cogl_texture_2d_sliced_get_format,
_cogl_texture_2d_sliced_get_gl_format,
_cogl_texture_2d_sliced_get_width,
_cogl_texture_2d_sliced_get_height
}; };

21
cogl/cogl-texture-private.h
View File

@ -94,6 +94,11 @@ struct _CoglTextureVtable
void (* set_wrap_mode_parameter) (CoglTexture *tex, void (* set_wrap_mode_parameter) (CoglTexture *tex,
GLenum wrap_mode); GLenum wrap_mode);
CoglPixelFormat (* get_format) (CoglTexture *tex);
GLenum (* get_gl_format) (CoglTexture *tex);
gint (* get_width) (CoglTexture *tex);
gint (* get_height) (CoglTexture *tex);
}; };
/* This represents the state needed to upload texture data. There are /* This represents the state needed to upload texture data. There are
@ -111,20 +116,6 @@ struct _CoglTexture
{ {
CoglHandleObject _parent; CoglHandleObject _parent;
const CoglTextureVtable *vtable; const CoglTextureVtable *vtable;
/* The internal format of the GL texture represented as a
CoglPixelFormat */
CoglPixelFormat format;
/* The internal format of the GL texture represented as a GL enum */
GLenum gl_format;
GLenum gl_target;
gint width;
gint height;
GLenum min_filter;
GLenum mag_filter;
gboolean is_foreign;
GLint wrap_mode;
gboolean auto_mipmap;
gboolean mipmaps_dirty;
}; };
void void
@ -144,7 +135,7 @@ _cogl_texture_transform_coords_to_gl (CoglHandle handle,
float *s, float *s,
float *t); float *t);
GLenum GLenum
_cogl_texture_get_internal_gl_format (CoglHandle handle); _cogl_texture_get_gl_format (CoglHandle handle);
void void
_cogl_texture_set_wrap_mode_parameter (CoglHandle handle, _cogl_texture_set_wrap_mode_parameter (CoglHandle handle,

19
cogl/cogl-texture.c
View File

@ -275,7 +275,7 @@ cogl_texture_get_width (CoglHandle handle)
tex = COGL_TEXTURE (handle); tex = COGL_TEXTURE (handle);
return tex->width; return tex->vtable->get_width (tex);
} }
guint guint
@ -288,7 +288,7 @@ cogl_texture_get_height (CoglHandle handle)
tex = COGL_TEXTURE (handle); tex = COGL_TEXTURE (handle);
return tex->height; return tex->vtable->get_height (tex);
} }
CoglPixelFormat CoglPixelFormat
@ -301,7 +301,7 @@ cogl_texture_get_format (CoglHandle handle)
tex = COGL_TEXTURE (handle); tex = COGL_TEXTURE (handle);
return tex->format; return tex->vtable->get_format (tex);
} }
guint guint
@ -319,7 +319,8 @@ cogl_texture_get_rowstride (CoglHandle handle)
tex = COGL_TEXTURE (handle); tex = COGL_TEXTURE (handle);
/* Just guess at a suitable rowstride */ /* Just guess at a suitable rowstride */
return _cogl_get_format_bpp (tex->format) * tex->width; return (_cogl_get_format_bpp (cogl_texture_get_format (tex))
* cogl_texture_get_width (tex));
} }
gint gint
@ -388,12 +389,6 @@ _cogl_texture_can_hardware_repeat (CoglHandle handle)
{ {
CoglTexture *tex = (CoglTexture *)handle; CoglTexture *tex = (CoglTexture *)handle;
#if HAVE_COGL_GL
/* TODO: COGL_TEXTURE_TYPE_2D_RECTANGLE */
if (tex->gl_target == GL_TEXTURE_RECTANGLE_ARB)
return FALSE;
#endif
return tex->vtable->can_hardware_repeat (tex); return tex->vtable->can_hardware_repeat (tex);
} }
@ -411,11 +406,11 @@ _cogl_texture_transform_coords_to_gl (CoglHandle handle,
} }
GLenum GLenum
_cogl_texture_get_internal_gl_format (CoglHandle handle) _cogl_texture_get_gl_format (CoglHandle handle)
{ {
CoglTexture *tex = COGL_TEXTURE (handle); CoglTexture *tex = COGL_TEXTURE (handle);
return tex->gl_format; return tex->vtable->get_gl_format (tex);
} }
gboolean gboolean