From e091c08089f43e0a4f4edf8e5e24f2617364f044 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Wed, 5 Nov 2014 10:42:13 -0500 Subject: [PATCH] freedreno: rename draw->draw_vbo Gets rid of a namespace conflict w/ a4xx which wants an fd4_draw() version of fd_draw().. Signed-off-by: Rob Clark --- src/gallium/drivers/freedreno/a2xx/fd2_draw.c | 4 ++-- src/gallium/drivers/freedreno/a3xx/fd3_draw.c | 4 ++-- src/gallium/drivers/freedreno/freedreno_context.h | 2 +- src/gallium/drivers/freedreno/freedreno_draw.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/freedreno/a2xx/fd2_draw.c b/src/gallium/drivers/freedreno/a2xx/fd2_draw.c index 6c1a590..764f3be 100644 --- a/src/gallium/drivers/freedreno/a2xx/fd2_draw.c +++ b/src/gallium/drivers/freedreno/a2xx/fd2_draw.c @@ -80,7 +80,7 @@ emit_vertexbufs(struct fd_context *ctx) } static void -fd2_draw(struct fd_context *ctx, const struct pipe_draw_info *info) +fd2_draw_vbo(struct fd_context *ctx, const struct pipe_draw_info *info) { struct fd_ringbuffer *ring = ctx->ring; @@ -276,6 +276,6 @@ void fd2_draw_init(struct pipe_context *pctx) { struct fd_context *ctx = fd_context(pctx); - ctx->draw = fd2_draw; + ctx->draw_vbo = fd2_draw_vbo; ctx->clear = fd2_clear; } diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_draw.c b/src/gallium/drivers/freedreno/a3xx/fd3_draw.c index c4e3d8d..b289e76 100644 --- a/src/gallium/drivers/freedreno/a3xx/fd3_draw.c +++ b/src/gallium/drivers/freedreno/a3xx/fd3_draw.c @@ -111,7 +111,7 @@ fixup_shader_state(struct fd_context *ctx, struct ir3_shader_key *key) } static void -fd3_draw(struct fd_context *ctx, const struct pipe_draw_info *info) +fd3_draw_vbo(struct fd_context *ctx, const struct pipe_draw_info *info) { struct fd3_context *fd3_ctx = fd3_context(ctx); struct fd3_emit emit = { @@ -355,6 +355,6 @@ void fd3_draw_init(struct pipe_context *pctx) { struct fd_context *ctx = fd_context(pctx); - ctx->draw = fd3_draw; + ctx->draw_vbo = fd3_draw_vbo; ctx->clear = fd3_clear; } diff --git a/src/gallium/drivers/freedreno/freedreno_context.h b/src/gallium/drivers/freedreno/freedreno_context.h index 22d950c..bf9abaf 100644 --- a/src/gallium/drivers/freedreno/freedreno_context.h +++ b/src/gallium/drivers/freedreno/freedreno_context.h @@ -347,7 +347,7 @@ struct fd_context { void (*emit_sysmem_prep)(struct fd_context *ctx); /* draw: */ - void (*draw)(struct fd_context *pctx, const struct pipe_draw_info *info); + void (*draw_vbo)(struct fd_context *pctx, const struct pipe_draw_info *info); void (*clear)(struct fd_context *ctx, unsigned buffers, const union pipe_color_union *color, double depth, unsigned stencil); }; diff --git a/src/gallium/drivers/freedreno/freedreno_draw.c b/src/gallium/drivers/freedreno/freedreno_draw.c index 525215e..213bad8 100644 --- a/src/gallium/drivers/freedreno/freedreno_draw.c +++ b/src/gallium/drivers/freedreno/freedreno_draw.c @@ -117,7 +117,7 @@ fd_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info) util_format_short_name(pipe_surface_format(pfb->zsbuf))); fd_hw_query_set_stage(ctx, ctx->ring, FD_STAGE_DRAW); - ctx->draw(ctx, info); + ctx->draw_vbo(ctx, info); /* if an app (or, well, piglit test) does many thousands of draws * without flush (or anything which implicitly flushes, like -- 2.7.4