diff --git a/clutter/cogl/cogl/cogl-primitives.c b/clutter/cogl/cogl/cogl-primitives.c index 23244ebb1..0c548009b 100644 --- a/clutter/cogl/cogl/cogl-primitives.c +++ b/clutter/cogl/cogl/cogl-primitives.c @@ -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) diff --git a/clutter/cogl/cogl/cogl-sub-texture.c b/clutter/cogl/cogl/cogl-sub-texture.c index 56aaa863b..9260f13cc 100644 --- a/clutter/cogl/cogl/cogl-sub-texture.c +++ b/clutter/cogl/cogl/cogl-sub-texture.c @@ -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); } diff --git a/clutter/cogl/cogl/cogl-texture-2d-sliced.c b/clutter/cogl/cogl/cogl-texture-2d-sliced.c index ef2c7d90e..dbaa7460e 100644 --- a/clutter/cogl/cogl/cogl-texture-2d-sliced.c +++ b/clutter/cogl/cogl/cogl-texture-2d-sliced.c @@ -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); diff --git a/clutter/cogl/cogl/cogl-texture-2d.c b/clutter/cogl/cogl/cogl-texture-2d.c index e29291805..343dffc60 100644 --- a/clutter/cogl/cogl/cogl-texture-2d.c +++ b/clutter/cogl/cogl/cogl-texture-2d.c @@ -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); diff --git a/clutter/cogl/cogl/cogl-texture-3d.c b/clutter/cogl/cogl/cogl-texture-3d.c index 9bbdfe170..3f24a1329 100644 --- a/clutter/cogl/cogl/cogl-texture-3d.c +++ b/clutter/cogl/cogl/cogl-texture-3d.c @@ -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); diff --git a/clutter/cogl/cogl/cogl-texture-private.h b/clutter/cogl/cogl/cogl-texture-private.h index f0c666133..0e45e33a2 100644 --- a/clutter/cogl/cogl/cogl-texture-private.h +++ b/clutter/cogl/cogl/cogl-texture-private.h @@ -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); diff --git a/clutter/cogl/cogl/cogl-texture-rectangle.c b/clutter/cogl/cogl/cogl-texture-rectangle.c index cf6365f5b..5d6e5cdd7 100644 --- a/clutter/cogl/cogl/cogl-texture-rectangle.c +++ b/clutter/cogl/cogl/cogl-texture-rectangle.c @@ -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);