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 <robclark@freedesktop.org>

diff --git a/src/gallium/drivers/freedreno/a2xx/fd2_draw.c b/src/gallium/drivers/freedreno/a2xx/fd2_draw.c
index 6c1a590433204e8b9e58734e58594acd7c017d9d..764f3be22d45952cbae6a591e0aea296c7a366ca 100644 (file)
--- 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 c4e3d8dffe2d949b3436dbb50462cff4afe0b78b..b289e76fa24afca6bee5e8add2df76d2b66f1a1f 100644 (file)
--- 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 22d950c090c15ce9980283124217ff899635848f..bf9abaf8855d5fb0957bf64335a8956cef983750 100644 (file)
--- 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 525215e4cbba73e95fd087fac3925be5018d4b83..213bad84e84ad1e6109fcb28214d58c7e192bd11 100644 (file)
--- 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