[Mesa-dev] [PATCH 2/2] trace: remove leftover assertions after pipe_resource wrapping removal

Marek Olšák maraeo at gmail.com
Sun Mar 12 16:14:19 UTC 2017


From: Marek Olšák <marek.olsak at amd.com>

---
 src/gallium/drivers/trace/tr_context.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/gallium/drivers/trace/tr_context.c b/src/gallium/drivers/trace/tr_context.c
index 40a56df..81c1a46 100644
--- a/src/gallium/drivers/trace/tr_context.c
+++ b/src/gallium/drivers/trace/tr_context.c
@@ -1489,22 +1489,20 @@ trace_context_transfer_unmap(struct pipe_context *_context,
 static void
 trace_context_buffer_subdata(struct pipe_context *_context,
                              struct pipe_resource *resource,
                              unsigned usage, unsigned offset,
                              unsigned size, const void *data)
 {
    struct trace_context *tr_context = trace_context(_context);
    struct pipe_context *context = tr_context->pipe;
    struct pipe_box box;
 
-   assert(resource->screen == context->screen);
-
    trace_dump_call_begin("pipe_context", "buffer_subdata");
 
    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");
    u_box_1d(offset, size, &box);
@@ -1523,22 +1521,20 @@ trace_context_texture_subdata(struct pipe_context *_context,
                               unsigned level,
                               unsigned usage,
                               const struct pipe_box *box,
                               const void *data,
                               unsigned stride,
                               unsigned layer_stride)
 {
    struct trace_context *tr_context = trace_context(_context);
    struct pipe_context *context = tr_context->pipe;
 
-   assert(resource->screen == context->screen);
-
    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_begin("data");
    trace_dump_box_bytes(data,
@@ -1557,22 +1553,20 @@ trace_context_texture_subdata(struct pipe_context *_context,
                             data, stride, layer_stride);
 }
 
 static void
 trace_context_invalidate_resource(struct pipe_context *_context,
                                   struct pipe_resource *resource)
 {
    struct trace_context *tr_context = trace_context(_context);
    struct pipe_context *context = tr_context->pipe;
 
-   assert(resource->screen == context->screen);
-
    trace_dump_call_begin("pipe_context", "invalidate_resource");
 
    trace_dump_arg(ptr, context);
    trace_dump_arg(ptr, resource);
 
    trace_dump_call_end();
 
    context->invalidate_resource(context, resource);
 }
 
-- 
2.7.4



More information about the mesa-dev mailing list