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

cogl: Drop no longer used Indices.new_for_buffer

Browse Source 
And drop the offset field with it as nothing sets it anymore.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4184>
This commit is contained in:
Bilal Elmoussaoui 2024-12-13 12:50:53 +01:00
parent aad237a04a
commit 07fa87907e
4 changed files with 8 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cogl/cogl/cogl-indices-private.h
View File

@ -41,7 +41,6 @@ struct _CoglIndices
GObject parent_instance; GObject parent_instance;
CoglIndexBuffer *buffer; CoglIndexBuffer *buffer;
size_t offset;
CoglIndicesType type; CoglIndicesType type;

39
cogl/cogl/cogl-indices.c
View File

@ -82,21 +82,6 @@ cogl_indices_type_get_size (CoglIndicesType type)
g_return_val_if_reached (0); g_return_val_if_reached (0);
} }
CoglIndices *
cogl_indices_new_for_buffer (CoglIndicesType type,
CoglIndexBuffer *buffer,
size_t offset)
{
CoglIndices *indices = g_object_new (COGL_TYPE_INDICES, NULL);
indices->buffer = g_object_ref (buffer);
indices->offset = offset;
indices->type = type;
return indices;
}
CoglIndices * CoglIndices *
cogl_indices_new (CoglContext *context, cogl_indices_new (CoglContext *context,
CoglIndicesType type, CoglIndicesType type,
@ -104,21 +89,19 @@ cogl_indices_new (CoglContext *context,
int n_indices) int n_indices)
{ {
size_t buffer_bytes = cogl_indices_type_get_size (type) * n_indices; size_t buffer_bytes = cogl_indices_type_get_size (type) * n_indices;
CoglIndexBuffer *index_buffer = cogl_index_buffer_new (context, buffer_bytes); g_autoptr (CoglIndexBuffer) index_buffer =
CoglBuffer *buffer = COGL_BUFFER (index_buffer); cogl_index_buffer_new (context, buffer_bytes);
CoglIndices *indices; CoglIndices *indices;
if (!cogl_buffer_set_data (buffer, if (!cogl_buffer_set_data (COGL_BUFFER (index_buffer),
0, 0,
indices_data, indices_data,
buffer_bytes)) buffer_bytes))
{ return NULL;
g_object_unref (index_buffer);
return NULL;
}
indices = cogl_indices_new_for_buffer (type, index_buffer, 0); indices = g_object_new (COGL_TYPE_INDICES, NULL);
g_object_unref (index_buffer); indices->buffer = g_steal_pointer (&index_buffer);
indices->type = type;
return indices; return indices;
} }
@ -137,14 +120,6 @@ cogl_indices_get_indices_type (CoglIndices *indices)
return indices->type; return indices->type;
} }
size_t
cogl_indices_get_offset (CoglIndices *indices)
{
g_return_val_if_fail (COGL_IS_INDICES (indices), 0);
return indices->offset;
}
CoglIndices * CoglIndices *
cogl_context_get_rectangle_indices (CoglContext *ctx, cogl_context_get_rectangle_indices (CoglContext *ctx,
int n_rectangles) int n_rectangles)

9
cogl/cogl/cogl-indices.h
View File

@ -114,11 +114,6 @@ cogl_indices_new (CoglContext *context,
const void *indices_data, const void *indices_data,
int n_indices); int n_indices);
COGL_EXPORT CoglIndices *
cogl_indices_new_for_buffer (CoglIndicesType type,
CoglIndexBuffer *buffer,
size_t offset);
/** /**
* cogl_indices_get_buffer: * cogl_indices_get_buffer:
* *
@ -130,8 +125,4 @@ cogl_indices_get_buffer (CoglIndices *indices);
COGL_EXPORT CoglIndicesType COGL_EXPORT CoglIndicesType
cogl_indices_get_indices_type (CoglIndices *indices); cogl_indices_get_indices_type (CoglIndices *indices);
COGL_EXPORT size_t
cogl_indices_get_offset (CoglIndices *indices);
G_END_DECLS G_END_DECLS

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

@ -348,7 +348,6 @@ cogl_gl_framebuffer_draw_indexed_attributes (CoglFramebufferDriver *driver,
cogl_framebuffer_driver_get_framebuffer (driver); cogl_framebuffer_driver_get_framebuffer (driver);
CoglBuffer *buffer; CoglBuffer *buffer;
uint8_t *base; uint8_t *base;
size_t buffer_offset;
size_t index_size; size_t index_size;
GLenum indices_gl_type = 0; GLenum indices_gl_type = 0;
@ -364,7 +363,6 @@ cogl_gl_framebuffer_draw_indexed_attributes (CoglFramebufferDriver *driver,
*/ */
base = _cogl_buffer_gl_bind (buffer, base = _cogl_buffer_gl_bind (buffer,
COGL_BUFFER_BIND_TARGET_INDEX_BUFFER, NULL); COGL_BUFFER_BIND_TARGET_INDEX_BUFFER, NULL);
buffer_offset = cogl_indices_get_offset (indices);
index_size = cogl_indices_type_get_size (cogl_indices_get_indices_type (indices)); index_size = cogl_indices_type_get_size (cogl_indices_get_indices_type (indices));
switch (cogl_indices_get_indices_type (indices)) switch (cogl_indices_get_indices_type (indices))
@ -384,7 +382,7 @@ cogl_gl_framebuffer_draw_indexed_attributes (CoglFramebufferDriver *driver,
glDrawElements ((GLenum)mode, glDrawElements ((GLenum)mode,
n_vertices, n_vertices,
indices_gl_type, indices_gl_type,
base + buffer_offset + index_size * first_vertex)); base + index_size * first_vertex));
_cogl_buffer_gl_unbind (buffer); _cogl_buffer_gl_unbind (buffer);
} }