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

cogl: Avoid pointer arithmetic on void* pointers

Browse Source 
Some code was doing pointer arithmetic on the return value from
cogl_buffer_map which is void* pointer. This is a GCC extension so we
should try to avoid it. This patch adds casts to guint8* where
appropriate.

Based on a patch by Fan, Chun-wei.

http://bugzilla.clutter-project.org/show_bug.cgi?id=2561
This commit is contained in:
Neil Roberts 2011-02-15 12:43:26 +00:00
parent c4cfdd59d3
commit dd7b1326eb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cogl/cogl-attribute.c
View File

@ -600,7 +600,7 @@ enable_gl_state (CoglDrawFlags flags,
CoglAttribute *attribute = attributes[i]; CoglAttribute *attribute = attributes[i];
CoglVertexArray *vertex_array; CoglVertexArray *vertex_array;
CoglBuffer *buffer; CoglBuffer *buffer;
void *base; guint8 *base;
#ifdef HAVE_COGL_GLES2 #ifdef HAVE_COGL_GLES2
int attrib_location; int attrib_location;
#endif #endif
@ -1186,7 +1186,7 @@ _cogl_draw_indexed_attributes_array (CoglVerticesMode mode,
ValidateLayerState state; ValidateLayerState state;
CoglPipeline *source; CoglPipeline *source;
CoglBuffer *buffer; CoglBuffer *buffer;
void *base; guint8 *base;
size_t array_offset; size_t array_offset;
size_t index_size; size_t index_size;
GLenum indices_gl_type = 0; GLenum indices_gl_type = 0;

4
cogl/cogl-journal.c
View File

@ -628,8 +628,8 @@ _cogl_journal_flush_vbo_offsets_and_entries (CoglJournalEntry *batch_start,
/* Mapping a buffer for read is probably a really bad thing to /* Mapping a buffer for read is probably a really bad thing to
do but this will only happen during debugging so it probably do but this will only happen during debugging so it probably
doesn't matter */ doesn't matter */
verts = (cogl_buffer_map (COGL_BUFFER (state->vertex_array), verts = ((guint8 *) cogl_buffer_map (COGL_BUFFER (state->vertex_array),
COGL_BUFFER_ACCESS_READ, 0) + COGL_BUFFER_ACCESS_READ, 0) +
state->array_offset); state->array_offset);
_cogl_journal_dump_quad_batch (verts, _cogl_journal_dump_quad_batch (verts,