diff options
author | Eric Anholt <[email protected]> | 2018-07-23 13:23:07 -0700 |
---|---|---|
committer | Eric Anholt <[email protected]> | 2018-07-26 11:00:34 -0700 |
commit | 47f5d158aebe69136a844f82c59b6b70336248e6 (patch) | |
tree | d2f79394f1555f28d80bd5174e04776659833873 /src/gallium/drivers/v3d/v3dx_draw.c | |
parent | d934d3206e764bbb15c0cacf357e4ce9279f22b0 (diff) |
v3d: Rename cleared/resolve to clear/store.
These describe what the fields mean in RCL generation. "resolve" is left
over from VC4, and sounds like MSAA resolves (which may or may not be
involved in the store we generate).
Diffstat (limited to 'src/gallium/drivers/v3d/v3dx_draw.c')
-rw-r--r-- | src/gallium/drivers/v3d/v3dx_draw.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/drivers/v3d/v3dx_draw.c b/src/gallium/drivers/v3d/v3dx_draw.c index 38f9e6beed4..5ecb814b81a 100644 --- a/src/gallium/drivers/v3d/v3dx_draw.c +++ b/src/gallium/drivers/v3d/v3dx_draw.c @@ -577,7 +577,7 @@ v3d_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info) struct v3d_resource *rsc = v3d_resource(job->zsbuf->texture); v3d_job_add_bo(job, rsc->bo); - job->resolve |= PIPE_CLEAR_DEPTH; + job->store |= PIPE_CLEAR_DEPTH; rsc->initialized_buffers = PIPE_CLEAR_DEPTH; } @@ -588,18 +588,18 @@ v3d_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info) v3d_job_add_bo(job, rsc->bo); - job->resolve |= PIPE_CLEAR_STENCIL; + job->store |= PIPE_CLEAR_STENCIL; rsc->initialized_buffers |= PIPE_CLEAR_STENCIL; } for (int i = 0; i < VC5_MAX_DRAW_BUFFERS; i++) { uint32_t bit = PIPE_CLEAR_COLOR0 << i; - if (job->resolve & bit || !job->cbufs[i]) + if (job->store & bit || !job->cbufs[i]) continue; struct v3d_resource *rsc = v3d_resource(job->cbufs[i]->texture); - job->resolve |= bit; + job->store |= bit; v3d_job_add_bo(job, rsc->bo); } @@ -732,8 +732,8 @@ v3d_clear(struct pipe_context *pctx, unsigned buffers, job->draw_min_y = 0; job->draw_max_x = v3d->framebuffer.width; job->draw_max_y = v3d->framebuffer.height; - job->cleared |= buffers; - job->resolve |= buffers; + job->clear |= buffers; + job->store |= buffers; v3d_start_draw(v3d); } |