diff options
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r-- | src/gallium/drivers/i915/i915_surface.c | 1 | ||||
-rw-r--r-- | src/gallium/drivers/llvmpipe/lp_texture.c | 1 | ||||
-rw-r--r-- | src/gallium/drivers/noop/noop_state.c | 1 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nouveau_video.c | 1 | ||||
-rw-r--r-- | src/gallium/drivers/nv30/nv30_miptree.c | 1 | ||||
-rw-r--r-- | src/gallium/drivers/nv50/nv50_miptree.c | 1 | ||||
-rw-r--r-- | src/gallium/drivers/nv50/nv50_resource.c | 1 | ||||
-rw-r--r-- | src/gallium/drivers/nv50/nv50_surface.c | 1 | ||||
-rw-r--r-- | src/gallium/drivers/nvc0/nvc0_surface.c | 1 | ||||
-rw-r--r-- | src/gallium/drivers/r300/r300_texture.c | 1 | ||||
-rw-r--r-- | src/gallium/drivers/r600/evergreen_compute_internal.c | 1 | ||||
-rw-r--r-- | src/gallium/drivers/r600/r600_blit.c | 4 | ||||
-rw-r--r-- | src/gallium/drivers/r600/r600_texture.c | 1 | ||||
-rw-r--r-- | src/gallium/drivers/radeonsi/r600_blit.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/radeonsi/r600_texture.c | 1 | ||||
-rw-r--r-- | src/gallium/drivers/softpipe/sp_texture.c | 1 | ||||
-rw-r--r-- | src/gallium/drivers/svga/svga_surface.c | 1 | ||||
-rw-r--r-- | src/gallium/drivers/trace/tr_dump_state.c | 2 |
18 files changed, 0 insertions, 23 deletions
diff --git a/src/gallium/drivers/i915/i915_surface.c b/src/gallium/drivers/i915/i915_surface.c index 08a6f343922..b8eef89ecd4 100644 --- a/src/gallium/drivers/i915/i915_surface.c +++ b/src/gallium/drivers/i915/i915_surface.c @@ -332,7 +332,6 @@ i915_create_surface(struct pipe_context *ctx, ps->u.tex.level = surf_tmpl->u.tex.level; ps->u.tex.first_layer = surf_tmpl->u.tex.first_layer; ps->u.tex.last_layer = surf_tmpl->u.tex.last_layer; - ps->usage = surf_tmpl->usage; ps->context = ctx; } return ps; diff --git a/src/gallium/drivers/llvmpipe/lp_texture.c b/src/gallium/drivers/llvmpipe/lp_texture.c index 31ea7dca50e..2e9c6bfe1ca 100644 --- a/src/gallium/drivers/llvmpipe/lp_texture.c +++ b/src/gallium/drivers/llvmpipe/lp_texture.c @@ -602,7 +602,6 @@ llvmpipe_create_surface(struct pipe_context *pipe, ps->format = surf_tmpl->format; ps->width = u_minify(pt->width0, surf_tmpl->u.tex.level); ps->height = u_minify(pt->height0, surf_tmpl->u.tex.level); - ps->usage = surf_tmpl->usage; ps->u.tex.level = surf_tmpl->u.tex.level; ps->u.tex.first_layer = surf_tmpl->u.tex.first_layer; diff --git a/src/gallium/drivers/noop/noop_state.c b/src/gallium/drivers/noop/noop_state.c index 16ce9b457d9..f56ff597c6c 100644 --- a/src/gallium/drivers/noop/noop_state.c +++ b/src/gallium/drivers/noop/noop_state.c @@ -116,7 +116,6 @@ static struct pipe_surface *noop_create_surface(struct pipe_context *ctx, surface->format = surf_tmpl->format; surface->width = texture->width0; surface->height = texture->height0; - surface->usage = surf_tmpl->usage; surface->texture = texture; surface->u.tex.first_layer = surf_tmpl->u.tex.first_layer; surface->u.tex.last_layer = surf_tmpl->u.tex.last_layer; diff --git a/src/gallium/drivers/nouveau/nouveau_video.c b/src/gallium/drivers/nouveau/nouveau_video.c index bd8f0961bc4..eeaabab4aea 100644 --- a/src/gallium/drivers/nouveau/nouveau_video.c +++ b/src/gallium/drivers/nouveau/nouveau_video.c @@ -744,7 +744,6 @@ nouveau_video_buffer_surfaces(struct pipe_video_buffer *buffer) if (!buf->surfaces[i]) { memset(&surf_templ, 0, sizeof(surf_templ)); surf_templ.format = buf->resources[i]->format; - surf_templ.usage = PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET; buf->surfaces[i] = pipe->create_surface(pipe, buf->resources[i], &surf_templ); if (!buf->surfaces[i]) goto error; diff --git a/src/gallium/drivers/nv30/nv30_miptree.c b/src/gallium/drivers/nv30/nv30_miptree.c index 5d941ab771e..d4dcacb8506 100644 --- a/src/gallium/drivers/nv30/nv30_miptree.c +++ b/src/gallium/drivers/nv30/nv30_miptree.c @@ -460,7 +460,6 @@ nv30_miptree_surface_new(struct pipe_context *pipe, pipe_resource_reference(&ps->texture, pt); ps->context = pipe; ps->format = tmpl->format; - ps->usage = tmpl->usage; ps->u.tex.level = tmpl->u.tex.level; ps->u.tex.first_layer = tmpl->u.tex.first_layer; ps->u.tex.last_layer = tmpl->u.tex.last_layer; diff --git a/src/gallium/drivers/nv50/nv50_miptree.c b/src/gallium/drivers/nv50/nv50_miptree.c index 568526c5933..fc9d7f360d0 100644 --- a/src/gallium/drivers/nv50/nv50_miptree.c +++ b/src/gallium/drivers/nv50/nv50_miptree.c @@ -378,7 +378,6 @@ nv50_surface_from_miptree(struct nv50_miptree *mt, pipe_resource_reference(&ps->texture, &mt->base.base); ps->format = templ->format; - ps->usage = templ->usage; ps->u.tex.level = templ->u.tex.level; ps->u.tex.first_layer = templ->u.tex.first_layer; ps->u.tex.last_layer = templ->u.tex.last_layer; diff --git a/src/gallium/drivers/nv50/nv50_resource.c b/src/gallium/drivers/nv50/nv50_resource.c index 42fefa61efc..d5c330decc4 100644 --- a/src/gallium/drivers/nv50/nv50_resource.c +++ b/src/gallium/drivers/nv50/nv50_resource.c @@ -43,7 +43,6 @@ nv50_surface_from_buffer(struct pipe_context *pipe, pipe_resource_reference(&sf->base.texture, pbuf); sf->base.format = templ->format; - sf->base.usage = templ->usage; sf->base.u.buf.first_element = templ->u.buf.first_element; sf->base.u.buf.last_element = templ->u.buf.last_element; diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c index d9722a86b29..b02550f437b 100644 --- a/src/gallium/drivers/nv50/nv50_surface.c +++ b/src/gallium/drivers/nv50/nv50_surface.c @@ -697,7 +697,6 @@ nv50_blit_set_dst(struct nv50_blitctx *ctx, else templ.format = format; - templ.usage = PIPE_USAGE_STREAM; templ.u.tex.level = level; templ.u.tex.first_layer = templ.u.tex.last_layer = layer; diff --git a/src/gallium/drivers/nvc0/nvc0_surface.c b/src/gallium/drivers/nvc0/nvc0_surface.c index dbd4fa3b794..2f81cf5c61e 100644 --- a/src/gallium/drivers/nvc0/nvc0_surface.c +++ b/src/gallium/drivers/nvc0/nvc0_surface.c @@ -573,7 +573,6 @@ nvc0_blit_set_dst(struct nvc0_blitctx *ctx, else templ.format = format; - templ.usage = PIPE_USAGE_STREAM; templ.u.tex.level = level; templ.u.tex.first_layer = templ.u.tex.last_layer = layer; diff --git a/src/gallium/drivers/r300/r300_texture.c b/src/gallium/drivers/r300/r300_texture.c index c16bb03e702..6197cf719ef 100644 --- a/src/gallium/drivers/r300/r300_texture.c +++ b/src/gallium/drivers/r300/r300_texture.c @@ -1109,7 +1109,6 @@ struct pipe_surface* r300_create_surface_custom(struct pipe_context * ctx, surface->base.format = surf_tmpl->format; surface->base.width = u_minify(width0_override, level); surface->base.height = u_minify(height0_override, level); - surface->base.usage = surf_tmpl->usage; surface->base.u.tex.level = level; surface->base.u.tex.first_layer = surf_tmpl->u.tex.first_layer; surface->base.u.tex.last_layer = surf_tmpl->u.tex.last_layer; diff --git a/src/gallium/drivers/r600/evergreen_compute_internal.c b/src/gallium/drivers/r600/evergreen_compute_internal.c index 7bc7fb43f6c..cbf66228518 100644 --- a/src/gallium/drivers/r600/evergreen_compute_internal.c +++ b/src/gallium/drivers/r600/evergreen_compute_internal.c @@ -272,7 +272,6 @@ void evergreen_set_rat( /* Create the RAT surface */ memset(&rat_templ, 0, sizeof(rat_templ)); - rat_templ.usage = RADEON_USAGE_READWRITE; rat_templ.format = PIPE_FORMAT_R32_UINT; rat_templ.u.tex.level = 0; rat_templ.u.tex.first_layer = 0; diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c index e39f4bd9cd1..f702f7bd4f0 100644 --- a/src/gallium/drivers/r600/r600_blit.c +++ b/src/gallium/drivers/r600/r600_blit.c @@ -182,7 +182,6 @@ void r600_blit_decompress_depth(struct pipe_context *ctx, surf_tmpl.u.tex.level = level; surf_tmpl.u.tex.first_layer = layer; surf_tmpl.u.tex.last_layer = layer; - surf_tmpl.usage = PIPE_BIND_DEPTH_STENCIL; zsurf = ctx->create_surface(ctx, &texture->resource.b.b, &surf_tmpl); @@ -190,7 +189,6 @@ void r600_blit_decompress_depth(struct pipe_context *ctx, surf_tmpl.u.tex.level = level; surf_tmpl.u.tex.first_layer = layer; surf_tmpl.u.tex.last_layer = layer; - surf_tmpl.usage = PIPE_BIND_RENDER_TARGET; cbsurf = ctx->create_surface(ctx, &flushed_depth_texture->resource.b.b, &surf_tmpl); @@ -231,7 +229,6 @@ static void r600_blit_decompress_depth_in_place(struct r600_context *rctx, rctx->db_misc_state.atom.dirty = true; surf_tmpl.format = texture->resource.b.b.format; - surf_tmpl.usage = PIPE_BIND_DEPTH_STENCIL; for (level = first_level; level <= last_level; level++) { if (!(texture->dirty_level_mask & (1 << level))) @@ -348,7 +345,6 @@ static void r600_blit_decompress_color(struct pipe_context *ctx, surf_tmpl.u.tex.level = level; surf_tmpl.u.tex.first_layer = layer; surf_tmpl.u.tex.last_layer = layer; - surf_tmpl.usage = PIPE_BIND_RENDER_TARGET; cbsurf = ctx->create_surface(ctx, &rtex->resource.b.b, &surf_tmpl); r600_blitter_begin(ctx, R600_DECOMPRESS); diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c index d6d1b3daff6..efff2c36297 100644 --- a/src/gallium/drivers/r600/r600_texture.c +++ b/src/gallium/drivers/r600/r600_texture.c @@ -567,7 +567,6 @@ struct pipe_surface *r600_create_surface_custom(struct pipe_context *pipe, surface->base.format = templ->format; surface->base.width = width; surface->base.height = height; - surface->base.usage = templ->usage; surface->base.u = templ->u; return &surface->base; } diff --git a/src/gallium/drivers/radeonsi/r600_blit.c b/src/gallium/drivers/radeonsi/r600_blit.c index 30736fcf8a7..40967d64ea5 100644 --- a/src/gallium/drivers/radeonsi/r600_blit.c +++ b/src/gallium/drivers/radeonsi/r600_blit.c @@ -133,12 +133,10 @@ void si_blit_uncompress_depth(struct pipe_context *ctx, struct r600_resource_tex surf_tmpl.u.tex.level = level; surf_tmpl.u.tex.first_layer = layer; surf_tmpl.u.tex.last_layer = layer; - surf_tmpl.usage = PIPE_BIND_DEPTH_STENCIL; zsurf = ctx->create_surface(ctx, &texture->resource.b.b, &surf_tmpl); surf_tmpl.format = texture->flushed_depth_texture->real_format; - surf_tmpl.usage = PIPE_BIND_RENDER_TARGET; cbsurf = ctx->create_surface(ctx, (struct pipe_resource*)texture->flushed_depth_texture, &surf_tmpl); diff --git a/src/gallium/drivers/radeonsi/r600_texture.c b/src/gallium/drivers/radeonsi/r600_texture.c index 676f4a9780a..fdfc8f3fa28 100644 --- a/src/gallium/drivers/radeonsi/r600_texture.c +++ b/src/gallium/drivers/radeonsi/r600_texture.c @@ -562,7 +562,6 @@ static struct pipe_surface *r600_create_surface(struct pipe_context *pipe, surface->base.format = surf_tmpl->format; surface->base.width = rtex->surface.level[level].npix_x; surface->base.height = rtex->surface.level[level].npix_y; - surface->base.usage = surf_tmpl->usage; surface->base.texture = texture; surface->base.u.tex.first_layer = surf_tmpl->u.tex.first_layer; surface->base.u.tex.last_layer = surf_tmpl->u.tex.last_layer; diff --git a/src/gallium/drivers/softpipe/sp_texture.c b/src/gallium/drivers/softpipe/sp_texture.c index 9c31daa63f3..0d1481af23f 100644 --- a/src/gallium/drivers/softpipe/sp_texture.c +++ b/src/gallium/drivers/softpipe/sp_texture.c @@ -296,7 +296,6 @@ softpipe_create_surface(struct pipe_context *pipe, ps->format = surf_tmpl->format; ps->width = u_minify(pt->width0, level); ps->height = u_minify(pt->height0, level); - ps->usage = surf_tmpl->usage; ps->u.tex.level = level; ps->u.tex.first_layer = surf_tmpl->u.tex.first_layer; diff --git a/src/gallium/drivers/svga/svga_surface.c b/src/gallium/drivers/svga/svga_surface.c index d3c228bf57d..f5619561269 100644 --- a/src/gallium/drivers/svga/svga_surface.c +++ b/src/gallium/drivers/svga/svga_surface.c @@ -216,7 +216,6 @@ svga_create_surface(struct pipe_context *pipe, s->base.format = surf_tmpl->format; s->base.width = u_minify(pt->width0, surf_tmpl->u.tex.level); s->base.height = u_minify(pt->height0, surf_tmpl->u.tex.level); - s->base.usage = surf_tmpl->usage; s->base.u.tex.level = surf_tmpl->u.tex.level; s->base.u.tex.first_layer = surf_tmpl->u.tex.first_layer; s->base.u.tex.last_layer = surf_tmpl->u.tex.last_layer; diff --git a/src/gallium/drivers/trace/tr_dump_state.c b/src/gallium/drivers/trace/tr_dump_state.c index 4cc25d24477..006082b7470 100644 --- a/src/gallium/drivers/trace/tr_dump_state.c +++ b/src/gallium/drivers/trace/tr_dump_state.c @@ -544,8 +544,6 @@ void trace_dump_surface_template(const struct pipe_surface *state, trace_dump_member(uint, state, width); trace_dump_member(uint, state, height); - trace_dump_member(uint, state, usage); - trace_dump_member_begin("u"); trace_dump_struct_begin(""); /* anonymous */ if (target == PIPE_BUFFER) { |