Patches 6 & 7 return void, but patch 5 defines the return type as bool. With those fixed, patches 5-7 are:
Reviewed-by: Marek Olšák <marek.ol...@amd.com> Marek On Tue, Mar 28, 2017 at 11:11 AM, Nicolai Hähnle <nhaeh...@gmail.com> wrote: > From: Nicolai Hähnle <nicolai.haeh...@amd.com> > > --- > src/gallium/drivers/trace/tr_context.c | 20 ++++++++++++++++++++ > 1 file changed, 20 insertions(+) > > diff --git a/src/gallium/drivers/trace/tr_context.c > b/src/gallium/drivers/trace/tr_context.c > index 81c1a46..75a3748 100644 > --- a/src/gallium/drivers/trace/tr_context.c > +++ b/src/gallium/drivers/trace/tr_context.c > @@ -1621,20 +1621,39 @@ trace_context_memory_barrier(struct pipe_context > *_context, > trace_dump_call_begin("pipe_context", "memory_barrier"); > trace_dump_arg(ptr, context); > trace_dump_arg(uint, flags); > trace_dump_call_end(); > > context->memory_barrier(context, flags); > } > > > static void > +trace_context_resource_commit(struct pipe_context *_context, > + struct pipe_resource *resource, > + unsigned level, struct pipe_box *box, bool > commit) > +{ > + struct trace_context *tr_context = trace_context(_context); > + struct pipe_context *context = tr_context->pipe; > + > + trace_dump_call_begin("pipe_context", "resource_commit"); > + trace_dump_arg(ptr, context); > + trace_dump_arg(ptr, resource); > + trace_dump_arg(uint, level); > + trace_dump_arg(box, box); > + trace_dump_arg(bool, commit); > + trace_dump_call_end(); > + > + context->resource_commit(context, resource, level, box, commit); > +} > + > +static void > trace_context_set_tess_state(struct pipe_context *_context, > const float default_outer_level[4], > const float default_inner_level[2]) > { > struct trace_context *tr_context = trace_context(_context); > struct pipe_context *context = tr_context->pipe; > > trace_dump_call_begin("pipe_context", "set_tess_state"); > trace_dump_arg(ptr, context); > trace_dump_arg_array(float, default_outer_level, 4); > @@ -1793,20 +1812,21 @@ trace_context_create(struct trace_screen *tr_scr, > TR_CTX_INIT(blit); > TR_CTX_INIT(flush_resource); > TR_CTX_INIT(clear); > TR_CTX_INIT(clear_render_target); > TR_CTX_INIT(clear_depth_stencil); > TR_CTX_INIT(clear_texture); > TR_CTX_INIT(flush); > TR_CTX_INIT(generate_mipmap); > TR_CTX_INIT(texture_barrier); > TR_CTX_INIT(memory_barrier); > + TR_CTX_INIT(resource_commit); > TR_CTX_INIT(set_tess_state); > TR_CTX_INIT(set_shader_buffers); > TR_CTX_INIT(launch_grid); > TR_CTX_INIT(set_shader_images); > > TR_CTX_INIT(transfer_map); > TR_CTX_INIT(transfer_unmap); > TR_CTX_INIT(transfer_flush_region); > TR_CTX_INIT(buffer_subdata); > TR_CTX_INIT(texture_subdata); > -- > 2.9.3 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev