From 4e13067d0f95b280da3fef2deb7e59466ea73818 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 22 Jan 2008 11:34:46 -0800 Subject: [965] Add a wrapper around interleaved copy_array_to_vbo_array for profiling. If compiled with optimization, it shouldn't appear at all, and helps me for now. --- src/mesa/drivers/dri/i965/brw_draw_upload.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'src/mesa/drivers/dri') diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c index 19a496a199..bdb9b5e894 100644 --- a/src/mesa/drivers/dri/i965/brw_draw_upload.c +++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c @@ -303,8 +303,6 @@ static void get_space( struct brw_context *brw, brw->vb.upload.offset += size; } - - static struct gl_client_array * copy_array_to_vbo_array( struct brw_context *brw, GLuint i, @@ -358,7 +356,19 @@ copy_array_to_vbo_array( struct brw_context *brw, return vbo_array; } - +/** + * Just a wrapper to highlight which cause of copy_array_to_vbo_array + * is happening in the profile. + */ +static struct gl_client_array * +interleaved_copy_array_to_vbo_array(struct brw_context *brw, + GLuint i, + const struct gl_client_array *array, + GLuint element_size, + GLuint count) +{ + return copy_array_to_vbo_array(brw, i, array, element_size, count); +} static struct gl_client_array * interleaved_vbo_array( struct brw_context *brw, @@ -451,10 +461,11 @@ GLboolean brw_upload_vertices( struct brw_context *brw, if (nr_uploads > 1 && interleave && interleave <= 256) { - upload[0]->glarray = copy_array_to_vbo_array(brw, 0, - upload[0]->glarray, - interleave, - upload[0]->count); + upload[0]->glarray = + interleaved_copy_array_to_vbo_array(brw, 0, + upload[0]->glarray, + interleave, + upload[0]->count); for (i = 1; i < nr_uploads; i++) { upload[i]->glarray = interleaved_vbo_array(brw, -- cgit v1.2.3