isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-23 00:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

cogl-texture-2d-sliced: Store the internal format not image format

Browse Source 
The 'format' member of CoglTexture2DSliced is returned by
cogl_texture_get_format. All of the other backends return the internal
format of the GL texture in this case. However the sliced backend was
returning the format of the image data used to create the texture. It
doesn't make any sense to retain this information because it doesn't
necessarily indicate the format of the actual texture. This patch
changes it to store the internal format instead.
This commit is contained in:
Neil Roberts 2010-07-14 13:21:54 +01:00
parent 7d269c6315
commit 41cd2ae2c8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -986,10 +986,10 @@ _cogl_texture_2d_sliced_upload_from_data
else else
{ {
/* Find closest GL format match */ /* Find closest GL format match */
_cogl_pixel_format_to_gl (internal_format, internal_format = _cogl_pixel_format_to_gl (internal_format,
&gl_intformat, &gl_intformat,
&gl_format, &gl_format,
&gl_type); &gl_type);
/* Create slices for the given format and size */ /* Create slices for the given format and size */
if (!_cogl_texture_2d_sliced_slices_create (tex_2ds, if (!_cogl_texture_2d_sliced_slices_create (tex_2ds,
@ -1004,7 +1004,7 @@ _cogl_texture_2d_sliced_upload_from_data
tex_2ds->gl_format = gl_intformat; tex_2ds->gl_format = gl_intformat;
tex_2ds->width = bmp->width; tex_2ds->width = bmp->width;
tex_2ds->height = bmp->height; tex_2ds->height = bmp->height;
tex_2ds->format = bmp->format; tex_2ds->format = internal_format;
return TRUE; return TRUE;
} }