Module: Mesa Branch: gallium-context-transfers Commit: c552595333f860c2a4807e195596acdf5d6a5ef8 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c552595333f860c2a4807e195596acdf5d6a5ef8
Author: Keith Whitwell <[email protected]> Date: Thu Mar 11 12:31:06 2010 +0000 util: fix compilation after merge --- src/gallium/auxiliary/util/u_debug.c | 5 +++-- src/gallium/auxiliary/util/u_debug.h | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/gallium/auxiliary/util/u_debug.c b/src/gallium/auxiliary/util/u_debug.c index dacf643..de775a2 100644 --- a/src/gallium/auxiliary/util/u_debug.c +++ b/src/gallium/auxiliary/util/u_debug.c @@ -463,7 +463,8 @@ error: } -void debug_dump_texture(const char *prefix, +void debug_dump_texture(struct pipe_context *pipe, + const char *prefix, struct pipe_texture *texture) { struct pipe_surface *surface; @@ -478,7 +479,7 @@ void debug_dump_texture(const char *prefix, surface = screen->get_tex_surface(screen, texture, 0, 0, 0, PIPE_TEXTURE_USAGE_SAMPLER); if (surface) { - debug_dump_surface(prefix, surface); + debug_dump_surface(pipe, prefix, surface); screen->tex_surface_destroy(surface); } } diff --git a/src/gallium/auxiliary/util/u_debug.h b/src/gallium/auxiliary/util/u_debug.h index 9021e0f..a383837 100644 --- a/src/gallium/auxiliary/util/u_debug.h +++ b/src/gallium/auxiliary/util/u_debug.h @@ -325,9 +325,11 @@ void debug_dump_image(const char *prefix, void debug_dump_surface(struct pipe_context *pipe, const char *prefix, struct pipe_surface *surface); -void debug_dump_texture(const char *prefix, +void debug_dump_texture(struct pipe_context *pipe, + const char *prefix, struct pipe_texture *texture); void debug_dump_surface_bmp(struct pipe_context *pipe, + const char *filename, struct pipe_surface *surface); void debug_dump_transfer_bmp(const char *filename, struct pipe_transfer *transfer); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
