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

Move _cogl_texture_get_gl_format to -texture-gl.c

Browse Source 
This moves the _cogl_texture_get_gl_format function from cogl-texture.c
to cogl-texture-gl.c and renames it _cogl_texture_gl_get_format.

Reviewed-by: Neil Roberts <neil@linux.intel.com>

(cherry picked from commit f8deec01eff7d8d9900b509048cf1ff1c86ca879)
This commit is contained in:
Robert Bragg 2012-11-22 21:31:25 +00:00
parent a57195d16d
commit 0850eea162
10 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cogl/cogl-atlas-texture.c
View File

@ -629,7 +629,7 @@ _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);
return _cogl_texture_gl_get_format (atlas_tex->sub_texture);
}
static int

2
cogl/cogl-sub-texture.c
View File

@ -415,7 +415,7 @@ _cogl_sub_texture_get_gl_format (CoglTexture *tex)
{
CoglSubTexture *sub_tex = COGL_SUB_TEXTURE (tex);
return _cogl_texture_get_gl_format (sub_tex->full_texture);
return _cogl_texture_gl_get_format (sub_tex->full_texture);
}
static int

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

@ -1353,7 +1353,7 @@ _cogl_texture_2d_sliced_get_gl_format (CoglTexture *tex)
/* Pass the call on to the first slice */
slice_tex = g_array_index (tex_2ds->slice_textures, CoglTexture2D *, 0);
return _cogl_texture_get_gl_format (COGL_TEXTURE (slice_tex));
return _cogl_texture_gl_get_format (COGL_TEXTURE (slice_tex));
}
static int

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

@ -208,9 +208,6 @@ CoglTransformResult
_cogl_texture_transform_quad_coords_to_gl (CoglTexture *texture,
float *coords);
GLenum
_cogl_texture_get_gl_format (CoglTexture *texture);
void
_cogl_texture_pre_paint (CoglTexture *texture, CoglTexturePrePaintFlags flags);

6
cogl/cogl-texture.c
View File

@ -418,12 +418,6 @@ _cogl_texture_transform_quad_coords_to_gl (CoglTexture *texture,
return texture->vtable->transform_quad_coords_to_gl (texture, coords);
}
GLenum
_cogl_texture_get_gl_format (CoglTexture *texture)
{
return texture->vtable->get_gl_format (texture);
}
CoglBool
cogl_texture_get_gl_texture (CoglTexture *texture,
GLuint *out_gl_handle,

3
cogl/driver/gl/cogl-texture-gl-private.h
View File

@ -53,4 +53,7 @@ _cogl_texture_gl_maybe_update_max_level (CoglTexture *texture,
void
_cogl_texture_gl_generate_mipmaps (CoglTexture *texture);
GLenum
_cogl_texture_gl_get_format (CoglTexture *texture);
#endif /* _COGL_TEXTURE_GL_PRIVATE_H_ */

6
cogl/driver/gl/cogl-texture-gl.c
View File

@ -135,3 +135,9 @@ _cogl_texture_gl_generate_mipmaps (CoglTexture *texture)
_cogl_texture_is_foreign (texture));
GE( ctx, glGenerateMipmap (gl_target) );
}
GLenum
_cogl_texture_gl_get_format (CoglTexture *texture)
{
return texture->vtable->get_gl_format (texture);
}

4
cogl/driver/gl/gl/cogl-texture-driver-gl.c
View File

@ -244,7 +244,7 @@ _cogl_texture_driver_upload_subregion_to_gl (CoglContext *ctx,
*/
ctx->glTexImage2D (gl_target,
level,
_cogl_texture_get_gl_format (texture),
_cogl_texture_gl_get_format (texture),
width,
height,
0,
@ -265,7 +265,7 @@ _cogl_texture_driver_upload_subregion_to_gl (CoglContext *ctx,
{
ctx->glTexImage2D (gl_target,
level,
_cogl_texture_get_gl_format (texture),
_cogl_texture_gl_get_format (texture),
level_width,
level_height,
0,

4
cogl/driver/gl/gles/cogl-texture-driver-gles.c
View File

@ -283,7 +283,7 @@ _cogl_texture_driver_upload_subregion_to_gl (CoglContext *ctx,
*/
ctx->glTexImage2D (gl_target,
level,
_cogl_texture_get_gl_format (texture),
_cogl_texture_gl_get_format (texture),
width,
height,
0,
@ -303,7 +303,7 @@ _cogl_texture_driver_upload_subregion_to_gl (CoglContext *ctx,
{
ctx->glTexImage2D (gl_target,
level,
_cogl_texture_get_gl_format (texture),
_cogl_texture_gl_get_format (texture),
level_width,
level_height,
0,

2
cogl/winsys/cogl-texture-pixmap-x11.c
View File

@ -942,7 +942,7 @@ _cogl_texture_pixmap_x11_get_gl_format (CoglTexture *tex)
CoglTexturePixmapX11 *tex_pixmap = COGL_TEXTURE_PIXMAP_X11 (tex);
CoglTexture *child_tex = _cogl_texture_pixmap_x11_get_texture (tex_pixmap);
return _cogl_texture_get_gl_format (child_tex);
return _cogl_texture_gl_get_format (child_tex);
}
static int