KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trace: Simplify trace_buffer function

This commit is contained in:
Jakob Bornecrantz 2009-04-17 15:52:05 +02:00
parent dbb90436f8
commit 5800e0aad1
5 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gallium/drivers/trace/tr_buffer.c
View File

@ -64,7 +64,8 @@ void
trace_buffer_destroy(struct trace_screen *tr_scr,
struct pipe_buffer *buffer)
{
struct trace_buffer *tr_buf = trace_buffer(tr_scr, buffer);
struct trace_buffer *tr_buf = trace_buffer(buffer);
pipe_buffer_reference(&tr_buf->buffer, NULL);
FREE(tr_buf);
}

6
src/gallium/drivers/trace/tr_buffer.h
View File

@ -47,13 +47,11 @@ struct trace_buffer
static INLINE struct trace_buffer *
trace_buffer(struct trace_screen *tr_scr,
struct pipe_buffer *buffer)
trace_buffer(struct pipe_buffer *buffer)
{
if(!buffer)
return NULL;
assert(tr_scr);
assert(buffer->screen == &tr_scr->base);
(void)trace_screen(buffer->screen);
return (struct trace_buffer *)buffer;
}

8
src/gallium/drivers/trace/tr_context.c
View File

@ -46,7 +46,7 @@ trace_buffer_unwrap(struct trace_context *tr_ctx,
if(!buffer)
return NULL;
tr_buf = trace_buffer(tr_scr, buffer);
tr_buf = trace_buffer(buffer);
assert(tr_buf->buffer);
assert(tr_buf->buffer->screen == tr_scr->screen);
@ -142,9 +142,8 @@ trace_context_draw_elements(struct pipe_context *_pipe,
unsigned indexSize,
unsigned mode, unsigned start, unsigned count)
{
struct trace_screen *tr_scr = trace_screen(_pipe->screen);
struct trace_context *tr_ctx = trace_context(_pipe);
struct trace_buffer *tr_buf = trace_buffer(tr_scr, _indexBuffer);
struct trace_buffer *tr_buf = trace_buffer(_indexBuffer);
struct pipe_context *pipe = tr_ctx->pipe;
struct pipe_buffer *indexBuffer = tr_buf->buffer;
boolean result;
@ -180,9 +179,8 @@ trace_context_draw_range_elements(struct pipe_context *_pipe,
unsigned start,
unsigned count)
{
struct trace_screen *tr_scr = trace_screen(_pipe->screen);
struct trace_context *tr_ctx = trace_context(_pipe);
struct trace_buffer *tr_buf = trace_buffer(tr_scr, _indexBuffer);
struct trace_buffer *tr_buf = trace_buffer(_indexBuffer);
struct pipe_context *pipe = tr_ctx->pipe;
struct pipe_buffer *indexBuffer = tr_buf->buffer;
boolean result;

3
src/gallium/drivers/trace/tr_dump.c
View File

@ -425,8 +425,7 @@ void trace_dump_ptr(const void *value)
void trace_dump_buffer_ptr(struct pipe_buffer *_buffer)
{
if (_buffer) {
struct trace_screen *tr_scr = trace_screen(_buffer->screen);
struct trace_buffer *tr_buf = trace_buffer(tr_scr, _buffer);
struct trace_buffer *tr_buf = trace_buffer(_buffer);
trace_dump_ptr(tr_buf->buffer);
} else {
trace_dump_null();

10
src/gallium/drivers/trace/tr_screen.c
View File

@ -603,7 +603,7 @@ trace_screen_buffer_map(struct pipe_screen *_screen,
unsigned usage)
{
struct trace_screen *tr_scr = trace_screen(_screen);
struct trace_buffer *tr_buf = trace_buffer(tr_scr, _buffer);
struct trace_buffer *tr_buf = trace_buffer(_buffer);
struct pipe_screen *screen = tr_scr->screen;
struct pipe_buffer *buffer = tr_buf->buffer;
void *map;
@ -628,7 +628,7 @@ trace_screen_buffer_map_range(struct pipe_screen *_screen,
unsigned usage)
{
struct trace_screen *tr_scr = trace_screen(_screen);
struct trace_buffer *tr_buf = trace_buffer(tr_scr, _buffer);
struct trace_buffer *tr_buf = trace_buffer(_buffer);
struct pipe_screen *screen = tr_scr->screen;
struct pipe_buffer *buffer = tr_buf->buffer;
void *map;
@ -680,7 +680,7 @@ trace_screen_buffer_flush_mapped_range(struct pipe_screen *_screen,
unsigned length)
{
struct trace_screen *tr_scr = trace_screen(_screen);
struct trace_buffer *tr_buf = trace_buffer(tr_scr, _buffer);
struct trace_buffer *tr_buf = trace_buffer(_buffer);
struct pipe_screen *screen = tr_scr->screen;
struct pipe_buffer *buffer = tr_buf->buffer;
@ -696,7 +696,7 @@ trace_screen_buffer_unmap(struct pipe_screen *_screen,
struct pipe_buffer *_buffer)
{
struct trace_screen *tr_scr = trace_screen(_screen);
struct trace_buffer *tr_buf = trace_buffer(tr_scr, _buffer);
struct trace_buffer *tr_buf = trace_buffer(_buffer);
struct pipe_screen *screen = tr_scr->screen;
struct pipe_buffer *buffer = tr_buf->buffer;
@ -712,7 +712,7 @@ static void
trace_screen_buffer_destroy(struct pipe_buffer *_buffer)
{
struct trace_screen *tr_scr = trace_screen(_buffer->screen);
struct trace_buffer *tr_buf = trace_buffer(tr_scr, _buffer);
struct trace_buffer *tr_buf = trace_buffer(_buffer);
struct pipe_screen *screen = tr_scr->screen;
struct pipe_buffer *buffer = tr_buf->buffer;