fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-19 06:40:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

trace: Fix trace_context_transfer_unmap methods.

Browse source 
The emitted buffer_subdata/texture_subdata call didn't match the
respective signatures.

v2: Actually emit buffer_subdata call.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
This commit is contained in:
Jose Fonseca 2018-05-24 16:50:58 +01:00
parent a9a7993441
commit 8652ff7cdf
1 changed files with 42 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
src/gallium/auxiliary/driver_trace/tr_context.c
View file

@ -1430,35 +1430,59 @@ trace_context_transfer_unmap(struct pipe_context *_context,
*/
struct pipe_resource *resource = transfer->resource;
unsigned level = transfer->level;
unsigned usage = transfer->usage;
const struct pipe_box *box = &transfer->box;
unsigned stride = transfer->stride;
unsigned layer_stride = transfer->layer_stride;
if (resource->target == PIPE_BUFFER)
if (resource->target == PIPE_BUFFER) {
unsigned offset = box->x;
unsigned size = box->width;
trace_dump_call_begin("pipe_context", "buffer_subdata");
else
trace_dump_arg(ptr, context);
trace_dump_arg(ptr, resource);
trace_dump_arg(uint, usage);
trace_dump_arg(uint, offset);
trace_dump_arg(uint, size);
trace_dump_arg_begin("data");
trace_dump_box_bytes(tr_trans->map,
resource,
box,
stride,
layer_stride);
trace_dump_arg_end();
trace_dump_arg(uint, stride);
trace_dump_arg(uint, layer_stride);
trace_dump_call_end();
} else {
unsigned level = transfer->level;
trace_dump_call_begin("pipe_context", "texture_subdata");
trace_dump_arg(ptr, context);
trace_dump_arg(ptr, resource);
trace_dump_arg(uint, level);
trace_dump_arg(uint, usage);
trace_dump_arg(box, box);
trace_dump_arg(ptr, context);
trace_dump_arg(ptr, resource);
trace_dump_arg(uint, level);
trace_dump_arg(uint, usage);
trace_dump_arg(box, box);
trace_dump_arg_begin("data");
trace_dump_box_bytes(tr_trans->map,
resource,
box,
stride,
layer_stride);
trace_dump_arg_end();
trace_dump_arg_begin("data");
trace_dump_box_bytes(tr_trans->map,
resource,
box,
stride,
layer_stride);
trace_dump_arg_end();
trace_dump_arg(uint, stride);
trace_dump_arg(uint, layer_stride);
trace_dump_arg(uint, stride);
trace_dump_arg(uint, layer_stride);
trace_dump_call_end();
trace_dump_call_end();
}
tr_trans->map = NULL;
}