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

freedreno: rename draw->draw_vbo

Browse Source 
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>
This commit is contained in:
Rob Clark
2014-11-05 10:42:13 -05:00
parent 2f024d2b10
commit e091c08089
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/freedreno/a2xx/fd2_draw.c
+2 -2
View File
@@ -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;
}
src/gallium/drivers/freedreno/a3xx/fd3_draw.c
+2 -2
View File
@@ -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;
}
src/gallium/drivers/freedreno/freedreno_context.h
+1 -1
View File
@@ -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);
};
src/gallium/drivers/freedreno/freedreno_draw.c
+1 -1
View File
@@ -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