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

cogl-texture: Remove the gl_handle from CoglTextureSliceCallback

Browse Source 
There's no longer any need to use the GL handle in the callback for
_cogl_texture_foreach_sub_texture_in_region because it can now work in
terms of primitive cogl textures so it has now been removed. This
would be helpful if we ever want to make the foreach function public
so that apps could implement their own primitives using sliced
textures.
This commit is contained in:
Neil Roberts 2010-11-11 16:24:54 +00:00
parent 49898d43dd
commit 1bcf15e1b8
7 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clutter/cogl/cogl/cogl-primitives.c
View File

@ -73,8 +73,6 @@ typedef struct _TextureSlicedPolygonState
static void
log_quad_sub_textures_cb (CoglHandle texture_handle,
GLuint gl_handle,
GLenum gl_target,
const float *subtexture_coords,
const float *virtual_coords,
void *user_data)

4
clutter/cogl/cogl/cogl-sub-texture.c
View File

@ -156,8 +156,6 @@ typedef struct _CoglSubTextureForeachData
static void
_cogl_sub_texture_foreach_cb (CoglHandle handle,
GLuint gl_handle,
GLenum gl_target,
const float *slice_coords,
const float *full_virtual_coords,
void *user_data)
@ -175,7 +173,7 @@ _cogl_sub_texture_foreach_cb (CoglHandle handle,
&virtual_coords[2],
&virtual_coords[3]);
data->callback (handle, gl_handle, gl_target,
data->callback (handle,
slice_coords, virtual_coords,
data->user_data);
}

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

@ -68,8 +68,6 @@ typedef struct
static void
_cogl_texture_2d_sliced_foreach_cb (CoglHandle handle,
GLuint gl_handle,
GLenum gl_target,
const float *slice_coords,
const float *virtual_coords_in,
void *user_data)
@ -89,8 +87,6 @@ _cogl_texture_2d_sliced_foreach_cb (CoglHandle handle,
data->y_span->start) / data->tex->height;
data->callback (handle,
gl_handle,
gl_target,
slice_coords,
virtual_coords_out,
data->user_data);

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

@ -91,8 +91,6 @@ _cogl_texture_2d_manual_repeat_cb (const float *coords,
slice_coords + 1, slice_coords + 3);
data->callback (COGL_TEXTURE (data->tex_2d),
data->tex_2d->gl_texture,
GL_TEXTURE_2D,
slice_coords,
coords,
data->user_data);

2
clutter/cogl/cogl/cogl-texture-3d.c
View File

@ -101,8 +101,6 @@ _cogl_texture_3d_manual_repeat_cb (const float *coords,
slice_coords + 1, slice_coords + 3);
data->callback (COGL_TEXTURE (data->tex_3d),
data->tex_3d->gl_texture,
GL_TEXTURE_3D,
slice_coords,
coords,
data->user_data);

2
clutter/cogl/cogl/cogl-texture-private.h
View File

@ -34,8 +34,6 @@ typedef struct _CoglTexture CoglTexture;
typedef struct _CoglTextureVtable CoglTextureVtable;
typedef void (*CoglTextureSliceCallback) (CoglHandle handle,
GLuint gl_handle,
GLenum gl_target,
const float *slice_coords,
const float *virtual_coords,
void *user_data);

2
clutter/cogl/cogl/cogl-texture-rectangle.c
View File

@ -107,8 +107,6 @@ _cogl_texture_rectangle_manual_repeat_cb (const float *coords,
slice_coords[3] *= data->tex_rect->height;
data->callback (COGL_TEXTURE (data->tex_rect),
data->tex_rect->gl_texture,
GL_TEXTURE_RECTANGLE_ARB,
slice_coords,
coords,
data->user_data);