diff options
| author | Marek Olšák <[email protected]> | 2014-02-03 03:42:17 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2014-02-06 17:37:34 +0100 |
| commit | c32114460dbb7f33885c181a0d7dee07b15b8751 (patch) | |
| tree | fd6d0a17ed48e93e42d61138d0bef80d8577f0a8 | |
| parent | eeb5a4a50e1317a7f8d9e168c962ce3b1d7b36f9 (diff) | |
gallium: remove PIPE_USAGE_STATIC
Reviewed-by: Brian Paul <[email protected]>
52 files changed, 69 insertions, 74 deletions
diff --git a/src/gallium/auxiliary/hud/font.c b/src/gallium/auxiliary/hud/font.c index 6747874eedc..03e35d945aa 100644 --- a/src/gallium/auxiliary/hud/font.c +++ b/src/gallium/auxiliary/hud/font.c @@ -401,7 +401,7 @@ util_font_create_fixed_8x13(struct pipe_context *pipe, tex_templ.height0 = 256; tex_templ.depth0 = 1; tex_templ.array_size = 1; - tex_templ.usage = PIPE_USAGE_STATIC; + tex_templ.usage = PIPE_USAGE_DEFAULT; tex_templ.bind = PIPE_BIND_SAMPLER_VIEW; tex = screen->resource_create(screen, &tex_templ); diff --git a/src/gallium/auxiliary/postprocess/pp_mlaa.c b/src/gallium/auxiliary/postprocess/pp_mlaa.c index 4f0c156f0b8..9827b8c9749 100644 --- a/src/gallium/auxiliary/postprocess/pp_mlaa.c +++ b/src/gallium/auxiliary/postprocess/pp_mlaa.c @@ -240,7 +240,7 @@ pp_jimenezmlaa_init_run(struct pp_queue_t *ppq, unsigned int n, ppq->constbuf = pipe_buffer_create(ppq->p->screen, PIPE_BIND_CONSTANT_BUFFER, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, sizeof(constants)); if (ppq->constbuf == NULL) { pp_debug("Failed to allocate constant buffer\n"); @@ -259,7 +259,7 @@ pp_jimenezmlaa_init_run(struct pp_queue_t *ppq, unsigned int n, res.format = PIPE_FORMAT_R8G8_UNORM; res.width0 = res.height0 = 165; res.bind = PIPE_BIND_SAMPLER_VIEW; - res.usage = PIPE_USAGE_STATIC; + res.usage = PIPE_USAGE_DEFAULT; res.depth0 = res.array_size = res.nr_samples = 1; if (!ppq->p->screen->is_format_supported(ppq->p->screen, res.format, diff --git a/src/gallium/auxiliary/postprocess/pp_program.c b/src/gallium/auxiliary/postprocess/pp_program.c index 19275d742e5..91cc78177f6 100644 --- a/src/gallium/auxiliary/postprocess/pp_program.c +++ b/src/gallium/auxiliary/postprocess/pp_program.c @@ -78,7 +78,7 @@ pp_init_prog(struct pp_queue_t *ppq, struct pipe_context *pipe, }; p->vbuf = pipe_buffer_create(pipe->screen, PIPE_BIND_VERTEX_BUFFER, - PIPE_USAGE_STATIC, sizeof(verts)); + PIPE_USAGE_DEFAULT, sizeof(verts)); pipe_buffer_write(p->pipe, p->vbuf, 0, sizeof(verts), verts); } diff --git a/src/gallium/auxiliary/util/u_index_modify.c b/src/gallium/auxiliary/util/u_index_modify.c index 5e3fd463eb4..e13489482ae 100644 --- a/src/gallium/auxiliary/util/u_index_modify.c +++ b/src/gallium/auxiliary/util/u_index_modify.c @@ -71,7 +71,7 @@ void util_shorten_ubyte_elts(struct pipe_context *context, new_elts = pipe_buffer_create(context->screen, PIPE_BIND_INDEX_BUFFER, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, 2 * count); out_map = pipe_buffer_map(context, new_elts, PIPE_TRANSFER_WRITE, @@ -130,7 +130,7 @@ void util_rebuild_ushort_elts(struct pipe_context *context, new_elts = pipe_buffer_create(context->screen, PIPE_BIND_INDEX_BUFFER, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, 2 * count); out_map = pipe_buffer_map(context, new_elts, @@ -189,7 +189,7 @@ void util_rebuild_uint_elts(struct pipe_context *context, new_elts = pipe_buffer_create(context->screen, PIPE_BIND_INDEX_BUFFER, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, 2 * count); out_map = pipe_buffer_map(context, new_elts, diff --git a/src/gallium/auxiliary/vl/vl_compositor.c b/src/gallium/auxiliary/vl/vl_compositor.c index 33b2a119356..3cea0447f10 100644 --- a/src/gallium/auxiliary/vl/vl_compositor.c +++ b/src/gallium/auxiliary/vl/vl_compositor.c @@ -1064,7 +1064,7 @@ vl_compositor_init_state(struct vl_compositor_state *s, struct pipe_context *pip ( pipe->screen, PIPE_BIND_CONSTANT_BUFFER, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, sizeof(csc_matrix) ); diff --git a/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c b/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c index 40dc2d5cd78..8579460e070 100644 --- a/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c +++ b/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c @@ -967,7 +967,7 @@ init_idct(struct vl_mpeg12_decoder *dec, const struct format_config* format_conf dec->idct_source = vl_video_buffer_create_ex ( dec->context, &templat, - formats, 1, 1, PIPE_USAGE_STATIC + formats, 1, 1, PIPE_USAGE_DEFAULT ); if (!dec->idct_source) @@ -981,7 +981,7 @@ init_idct(struct vl_mpeg12_decoder *dec, const struct format_config* format_conf dec->mc_source = vl_video_buffer_create_ex ( dec->context, &templat, - formats, nr_of_idct_render_targets, 1, PIPE_USAGE_STATIC + formats, nr_of_idct_render_targets, 1, PIPE_USAGE_DEFAULT ); if (!dec->mc_source) @@ -1032,7 +1032,7 @@ init_mc_source_widthout_idct(struct vl_mpeg12_decoder *dec, const struct format_ dec->mc_source = vl_video_buffer_create_ex ( dec->context, &templat, - formats, 1, 1, PIPE_USAGE_STATIC + formats, 1, 1, PIPE_USAGE_DEFAULT ); return dec->mc_source != NULL; diff --git a/src/gallium/auxiliary/vl/vl_vertex_buffers.c b/src/gallium/auxiliary/vl/vl_vertex_buffers.c index e3f0c497754..13d3f8c3032 100644 --- a/src/gallium/auxiliary/vl/vl_vertex_buffers.c +++ b/src/gallium/auxiliary/vl/vl_vertex_buffers.c @@ -53,7 +53,7 @@ vl_vb_upload_quads(struct pipe_context *pipe) ( pipe->screen, PIPE_BIND_VERTEX_BUFFER, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, sizeof(struct vertex2f) * 4 ); quad.user_buffer = NULL; @@ -98,7 +98,7 @@ vl_vb_upload_pos(struct pipe_context *pipe, unsigned width, unsigned height) ( pipe->screen, PIPE_BIND_VERTEX_BUFFER, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, sizeof(struct vertex2s) * width * height ); pos.user_buffer = NULL; diff --git a/src/gallium/auxiliary/vl/vl_video_buffer.c b/src/gallium/auxiliary/vl/vl_video_buffer.c index 092a03192cc..5e0ae0ecb8b 100644 --- a/src/gallium/auxiliary/vl/vl_video_buffer.c +++ b/src/gallium/auxiliary/vl/vl_video_buffer.c @@ -427,7 +427,7 @@ vl_video_buffer_create(struct pipe_context *pipe, result = vl_video_buffer_create_ex ( pipe, &templat, resource_formats, - 1, tmpl->interlaced ? 2 : 1, PIPE_USAGE_STATIC + 1, tmpl->interlaced ? 2 : 1, PIPE_USAGE_DEFAULT ); diff --git a/src/gallium/auxiliary/vl/vl_winsys_dri.c b/src/gallium/auxiliary/vl/vl_winsys_dri.c index 3e97c564f10..fb4aaadd48a 100644 --- a/src/gallium/auxiliary/vl/vl_winsys_dri.c +++ b/src/gallium/auxiliary/vl/vl_winsys_dri.c @@ -234,7 +234,7 @@ vl_screen_texture_from_drawable(struct vl_screen *vscreen, Drawable drawable) template.height0 = reply->height; template.depth0 = 1; template.array_size = 1; - template.usage = PIPE_USAGE_STATIC; + template.usage = PIPE_USAGE_DEFAULT; template.bind = PIPE_BIND_RENDER_TARGET; template.flags = 0; diff --git a/src/gallium/docs/source/screen.rst b/src/gallium/docs/source/screen.rst index 0c9c2749dfe..90e82786c92 100644 --- a/src/gallium/docs/source/screen.rst +++ b/src/gallium/docs/source/screen.rst @@ -348,7 +348,6 @@ no matter which hint they got. not expected to be mapped or changed (even by the GPU) after the first upload. * ``PIPE_USAGE_DYNAMIC``: Expect frequent write-only CPU access. What is uploaded is expected to be used at least several times by the GPU. -* ``PIPE_USAGE_STATIC``: Same as PIPE_USAGE_DEFAULT. * ``PIPE_USAGE_STREAM``: Expect frequent write-only CPU access. What is uploaded is expected to be used only once by the GPU. * ``PIPE_USAGE_STAGING``: Optimized for fast CPU access. diff --git a/src/gallium/drivers/nouveau/nouveau_buffer.c b/src/gallium/drivers/nouveau/nouveau_buffer.c index 0b21530e19b..5b0b93b4a62 100644 --- a/src/gallium/drivers/nouveau/nouveau_buffer.c +++ b/src/gallium/drivers/nouveau/nouveau_buffer.c @@ -626,7 +626,6 @@ nouveau_buffer_create(struct pipe_screen *pscreen, switch (buffer->base.usage) { case PIPE_USAGE_DEFAULT: case PIPE_USAGE_IMMUTABLE: - case PIPE_USAGE_STATIC: buffer->domain = NOUVEAU_BO_VRAM; break; case PIPE_USAGE_DYNAMIC: diff --git a/src/gallium/drivers/nouveau/nouveau_video.c b/src/gallium/drivers/nouveau/nouveau_video.c index f72a0967fc1..8795c9d3bc2 100644 --- a/src/gallium/drivers/nouveau/nouveau_video.c +++ b/src/gallium/drivers/nouveau/nouveau_video.c @@ -811,7 +811,7 @@ nouveau_video_buffer_create(struct pipe_context *pipe, templ.depth0 = 1; templ.array_size = 1; templ.bind = PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET; - templ.usage = PIPE_USAGE_STATIC; + templ.usage = PIPE_USAGE_DEFAULT; templ.flags = NOUVEAU_RESOURCE_FLAG_LINEAR; buffer->resources[0] = pipe->screen->resource_create(pipe->screen, &templ); diff --git a/src/gallium/drivers/r300/r300_blit.c b/src/gallium/drivers/r300/r300_blit.c index 696a61dc5f5..cc9ea8a8e0d 100644 --- a/src/gallium/drivers/r300/r300_blit.c +++ b/src/gallium/drivers/r300/r300_blit.c @@ -772,7 +772,7 @@ static void r300_msaa_resolve(struct pipe_context *pipe, templ.height0 = info->src.resource->height0; templ.depth0 = 1; templ.array_size = 1; - templ.usage = PIPE_USAGE_STATIC; + templ.usage = PIPE_USAGE_DEFAULT; templ.flags = R300_RESOURCE_FORCE_MICROTILING; tmp = screen->resource_create(screen, &templ); diff --git a/src/gallium/drivers/r300/r300_context.c b/src/gallium/drivers/r300/r300_context.c index 5627aafec59..e28dbfb4034 100644 --- a/src/gallium/drivers/r300/r300_context.c +++ b/src/gallium/drivers/r300/r300_context.c @@ -451,7 +451,7 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen, memset(&vb, 0, sizeof(vb)); vb.target = PIPE_BUFFER; vb.format = PIPE_FORMAT_R8_UNORM; - vb.usage = PIPE_USAGE_STATIC; + vb.usage = PIPE_USAGE_DEFAULT; vb.width0 = sizeof(float) * 16; vb.height0 = 1; vb.depth0 = 1; diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index cd54fb88785..2cf36778383 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -278,7 +278,7 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void } rctx->allocator_fetch_shader = u_suballocator_create(&rctx->b.b, 64 * 1024, 256, - 0, PIPE_USAGE_STATIC, FALSE); + 0, PIPE_USAGE_DEFAULT, FALSE); if (!rctx->allocator_fetch_shader) goto fail; @@ -647,7 +647,7 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws) templ.array_size = 1; templ.target = PIPE_TEXTURE_2D; templ.format = PIPE_FORMAT_R8G8B8A8_UNORM; - templ.usage = PIPE_USAGE_STATIC; + templ.usage = PIPE_USAGE_DEFAULT; struct r600_resource *res = r600_resource(rscreen->screen.resource_create(&rscreen->screen, &templ)); unsigned char *map = ws->buffer_map(res->cs_buf, NULL, PIPE_TRANSFER_WRITE); diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c index 1b73ce30213..0dfd4260a82 100644 --- a/src/gallium/drivers/r600/r600_state.c +++ b/src/gallium/drivers/r600/r600_state.c @@ -1244,7 +1244,7 @@ static struct r600_resource *r600_buffer_create_helper(struct r600_screen *rscre buffer.target = PIPE_BUFFER; buffer.format = PIPE_FORMAT_R8_UNORM; buffer.bind = PIPE_BIND_CUSTOM; - buffer.usage = PIPE_USAGE_STATIC; + buffer.usage = PIPE_USAGE_DEFAULT; buffer.flags = 0; buffer.width0 = size; buffer.height0 = 1; diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c index 208c073a7a8..22f2b062a96 100644 --- a/src/gallium/drivers/r600/r600_state_common.c +++ b/src/gallium/drivers/r600/r600_state_common.c @@ -1109,14 +1109,14 @@ static void update_gs_block_state(struct r600_context *rctx, unsigned enable) unsigned size = 0x1C000; rctx->gs_rings.esgs_ring.buffer = pipe_buffer_create(rctx->b.b.screen, PIPE_BIND_CUSTOM, - PIPE_USAGE_STATIC, size); + PIPE_USAGE_DEFAULT, size); rctx->gs_rings.esgs_ring.buffer_size = size; size = 0x4000000; rctx->gs_rings.gsvs_ring.buffer = pipe_buffer_create(rctx->b.b.screen, PIPE_BIND_CUSTOM, - PIPE_USAGE_STATIC, size); + PIPE_USAGE_DEFAULT, size); rctx->gs_rings.gsvs_ring.buffer_size = size; } diff --git a/src/gallium/drivers/r600/r600_uvd.c b/src/gallium/drivers/r600/r600_uvd.c index e0db492cf25..f42384c12ee 100644 --- a/src/gallium/drivers/r600/r600_uvd.c +++ b/src/gallium/drivers/r600/r600_uvd.c @@ -76,7 +76,7 @@ struct pipe_video_buffer *r600_video_buffer_create(struct pipe_context *pipe, template.width = align(tmpl->width, VL_MACROBLOCK_WIDTH); template.height = align(tmpl->height / array_size, VL_MACROBLOCK_HEIGHT); - vl_video_buffer_template(&templ, &template, resource_formats[0], 1, array_size, PIPE_USAGE_STATIC, 0); + vl_video_buffer_template(&templ, &template, resource_formats[0], 1, array_size, PIPE_USAGE_DEFAULT, 0); if (ctx->b.chip_class < EVERGREEN || tmpl->interlaced) templ.bind = PIPE_BIND_LINEAR; resources[0] = (struct r600_texture *) @@ -85,7 +85,7 @@ struct pipe_video_buffer *r600_video_buffer_create(struct pipe_context *pipe, goto error; if (resource_formats[1] != PIPE_FORMAT_NONE) { - vl_video_buffer_template(&templ, &template, resource_formats[1], 1, array_size, PIPE_USAGE_STATIC, 1); + vl_video_buffer_template(&templ, &template, resource_formats[1], 1, array_size, PIPE_USAGE_DEFAULT, 1); if (ctx->b.chip_class < EVERGREEN || tmpl->interlaced) templ.bind = PIPE_BIND_LINEAR; resources[1] = (struct r600_texture *) @@ -95,7 +95,7 @@ struct pipe_video_buffer *r600_video_buffer_create(struct pipe_context *pipe, } if (resource_formats[2] != PIPE_FORMAT_NONE) { - vl_video_buffer_template(&templ, &template, resource_formats[2], 1, array_size, PIPE_USAGE_STATIC, 2); + vl_video_buffer_template(&templ, &template, resource_formats[2], 1, array_size, PIPE_USAGE_DEFAULT, 2); if (ctx->b.chip_class < EVERGREEN || tmpl->interlaced) templ.bind = PIPE_BIND_LINEAR; resources[2] = (struct r600_texture *) diff --git a/src/gallium/drivers/radeon/r600_buffer_common.c b/src/gallium/drivers/radeon/r600_buffer_common.c index 59578e1ad53..068141c347d 100644 --- a/src/gallium/drivers/radeon/r600_buffer_common.c +++ b/src/gallium/drivers/radeon/r600_buffer_common.c @@ -115,7 +115,6 @@ bool r600_init_resource(struct r600_common_screen *rscreen, res->domains = RADEON_DOMAIN_GTT; break; case PIPE_USAGE_DEFAULT: - case PIPE_USAGE_STATIC: case PIPE_USAGE_IMMUTABLE: default: /* Not listing GTT here improves performance in some apps. */ diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c index b324d8e0f17..7af8124eb34 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.c +++ b/src/gallium/drivers/radeon/r600_pipe_common.c @@ -61,7 +61,7 @@ bool r600_common_context_init(struct r600_common_context *rctx, r600_query_init(rctx); rctx->allocator_so_filled_size = u_suballocator_create(&rctx->b, 4096, 4, - 0, PIPE_USAGE_STATIC, TRUE); + 0, PIPE_USAGE_DEFAULT, TRUE); if (!rctx->allocator_so_filled_size) return false; diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c index 84c3daa7728..356e0af35b7 100644 --- a/src/gallium/drivers/radeon/r600_texture.c +++ b/src/gallium/drivers/radeon/r600_texture.c @@ -453,7 +453,7 @@ void r600_texture_init_cmask(struct r600_common_screen *rscreen, rtex->cmask_buffer = (struct r600_resource *) pipe_buffer_create(&rscreen->b, PIPE_BIND_CUSTOM, - PIPE_USAGE_STATIC, rtex->cmask.size); + PIPE_USAGE_DEFAULT, rtex->cmask.size); if (rtex->cmask_buffer == NULL) { rtex->cmask.size = 0; } @@ -546,7 +546,7 @@ static void r600_texture_allocate_htile(struct r600_common_screen *rscreen, /* XXX don't allocate it separately */ rtex->htile_buffer = (struct r600_resource*) pipe_buffer_create(&rscreen->b, PIPE_BIND_CUSTOM, - PIPE_USAGE_STATIC, htile_size); + PIPE_USAGE_DEFAULT, htile_size); if (rtex->htile_buffer == NULL) { /* this is not a fatal error as we can still keep rendering * without htile buffer */ @@ -827,7 +827,7 @@ bool r600_init_flushed_depth_texture(struct pipe_context *ctx, resource.array_size = texture->array_size; resource.last_level = texture->last_level; resource.nr_samples = texture->nr_samples; - resource.usage = staging ? PIPE_USAGE_STAGING : PIPE_USAGE_STATIC; + resource.usage = staging ? PIPE_USAGE_STAGING : PIPE_USAGE_DEFAULT; resource.bind = texture->bind & ~PIPE_BIND_DEPTH_STENCIL; resource.flags = texture->flags | R600_RESOURCE_FLAG_FLUSHED_DEPTH; @@ -861,7 +861,7 @@ static void r600_init_temp_resource_from_box(struct pipe_resource *res, res->height0 = box->height; res->depth0 = 1; res->array_size = 1; - res->usage = flags & R600_RESOURCE_FLAG_TRANSFER ? PIPE_USAGE_STAGING : PIPE_USAGE_STATIC; + res->usage = flags & R600_RESOURCE_FLAG_TRANSFER ? PIPE_USAGE_STAGING : PIPE_USAGE_DEFAULT; res->flags = flags; /* We must set the correct texture target and dimensions for a 3D box. */ diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index f717371bb2a..d45bc805129 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -126,7 +126,7 @@ static void si_init_descriptors(struct si_context *sctx, desc->buffer = (struct r600_resource*) pipe_buffer_create(sctx->b.b.screen, PIPE_BIND_CUSTOM, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, SI_NUM_CONTEXTS * desc->context_size); r600_context_bo_reloc(&sctx->b, &sctx->b.rings.gfx, desc->buffer, RADEON_USAGE_READWRITE); diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 14dfd30bfb0..1c899269f04 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -183,7 +183,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, void * * with a NULL buffer). We need to use a dummy buffer instead. */ if (sctx->b.chip_class == CIK) { sctx->null_const_buf.buffer = pipe_buffer_create(screen, PIPE_BIND_CONSTANT_BUFFER, - PIPE_USAGE_STATIC, 16); + PIPE_USAGE_DEFAULT, 16); sctx->null_const_buf.buffer_size = sctx->null_const_buf.buffer->width0; for (shader = 0; shader < SI_NUM_SHADERS; shader++) { diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c index 7c8fe766951..480e3f8a520 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.c +++ b/src/gallium/drivers/radeonsi/si_state_draw.c @@ -548,13 +548,13 @@ static void si_init_gs_rings(struct si_context *sctx) sctx->esgs_ring.buffer = pipe_buffer_create(sctx->b.b.screen, PIPE_BIND_CUSTOM, - PIPE_USAGE_STATIC, size); + PIPE_USAGE_DEFAULT, size); sctx->esgs_ring.buffer_size = size; size = 64 * 1024 * 1024; sctx->gsvs_ring.buffer = pipe_buffer_create(sctx->b.b.screen, PIPE_BIND_CUSTOM, - PIPE_USAGE_STATIC, size); + PIPE_USAGE_DEFAULT, size); sctx->gsvs_ring.buffer_size = size; if (sctx->b.chip_class >= CIK) { diff --git a/src/gallium/drivers/radeonsi/si_uvd.c b/src/gallium/drivers/radeonsi/si_uvd.c index 98f1340f6aa..241288f08bd 100644 --- a/src/gallium/drivers/radeonsi/si_uvd.c +++ b/src/gallium/drivers/radeonsi/si_uvd.c @@ -62,7 +62,7 @@ struct pipe_video_buffer *si_video_buffer_create(struct pipe_context *pipe, template.width = align(tmpl->width, VL_MACROBLOCK_WIDTH); template.height = align(tmpl->height / array_size, VL_MACROBLOCK_HEIGHT); - vl_video_buffer_template(&templ, &template, resource_formats[0], 1, array_size, PIPE_USAGE_STATIC, 0); + vl_video_buffer_template(&templ, &template, resource_formats[0], 1, array_size, PIPE_USAGE_DEFAULT, 0); /* TODO: get tiling working */ templ.bind = PIPE_BIND_LINEAR; resources[0] = (struct r600_texture *) @@ -71,7 +71,7 @@ struct pipe_video_buffer *si_video_buffer_create(struct pipe_context *pipe, goto error; if (resource_formats[1] != PIPE_FORMAT_NONE) { - vl_video_buffer_template(&templ, &template, resource_formats[1], 1, array_size, PIPE_USAGE_STATIC, 1); + vl_video_buffer_template(&templ, &template, resource_formats[1], 1, array_size, PIPE_USAGE_DEFAULT, 1); templ.bind = PIPE_BIND_LINEAR; resources[1] = (struct r600_texture *) pipe->screen->resource_create(pipe->screen, &templ); @@ -80,7 +80,7 @@ struct pipe_video_buffer *si_video_buffer_create(struct pipe_context *pipe, } if (resource_formats[2] != PIPE_FORMAT_NONE) { - vl_video_buffer_template(&templ, &template, resource_formats[2], 1, array_size, PIPE_USAGE_STATIC, 2); + vl_video_buffer_template(&templ, &template, resource_formats[2], 1, array_size, PIPE_USAGE_DEFAULT, 2); templ.bind = PIPE_BIND_LINEAR; resources[2] = (struct r600_texture *) pipe->screen->resource_create(pipe->screen, &templ); diff --git a/src/gallium/drivers/svga/svga_draw_arrays.c b/src/gallium/drivers/svga/svga_draw_arrays.c index 89a5dc1da77..d4d77200f59 100644 --- a/src/gallium/drivers/svga/svga_draw_arrays.c +++ b/src/gallium/drivers/svga/svga_draw_arrays.c @@ -50,7 +50,7 @@ generate_indices(struct svga_hwtnl *hwtnl, void *dst_map = NULL; dst = pipe_buffer_create(pipe->screen, - PIPE_BIND_INDEX_BUFFER, PIPE_USAGE_STATIC, size); + PIPE_BIND_INDEX_BUFFER, PIPE_USAGE_DEFAULT, size); if (dst == NULL) goto fail; diff --git a/src/gallium/drivers/svga/svga_draw_elements.c b/src/gallium/drivers/svga/svga_draw_elements.c index 411b8d9b9f1..3384095e6f5 100644 --- a/src/gallium/drivers/svga/svga_draw_elements.c +++ b/src/gallium/drivers/svga/svga_draw_elements.c @@ -58,7 +58,7 @@ translate_indices(struct svga_hwtnl *hwtnl, struct pipe_resource *src, size = index_size * nr; dst = pipe_buffer_create(pipe->screen, - PIPE_BIND_INDEX_BUFFER, PIPE_USAGE_STATIC, size); + PIPE_BIND_INDEX_BUFFER, PIPE_USAGE_DEFAULT, size); if (dst == NULL) goto fail; diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index 85385380970..dbedd87a6d3 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -363,7 +363,6 @@ enum pipe_flush_flags { #define PIPE_USAGE_DYNAMIC 2 /* uploaded data is used multiple times */ #define PIPE_USAGE_STREAM 3 /* uploaded data is used once */ #define PIPE_USAGE_STAGING 4 /* fast CPU access */ -#define PIPE_USAGE_STATIC 5 /* same as DEFAULT, will be removed */ /** diff --git a/src/gallium/state_trackers/vdpau/bitmap.c b/src/gallium/state_trackers/vdpau/bitmap.c index 335c224f700..a06892132e9 100644 --- a/src/gallium/state_trackers/vdpau/bitmap.c +++ b/src/gallium/state_trackers/vdpau/bitmap.c @@ -77,7 +77,7 @@ vlVdpBitmapSurfaceCreate(VdpDevice device, res_tmpl.depth0 = 1; res_tmpl.array_size = 1; res_tmpl.bind = PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET; - res_tmpl.usage = frequently_accessed ? PIPE_USAGE_DYNAMIC : PIPE_USAGE_STATIC; + res_tmpl.usage = frequently_accessed ? PIPE_USAGE_DYNAMIC : PIPE_USAGE_DEFAULT; pipe_mutex_lock(dev->mutex); diff --git a/src/gallium/state_trackers/vdpau/output.c b/src/gallium/state_trackers/vdpau/output.c index aa7e997b591..5882bb23ea8 100644 --- a/src/gallium/state_trackers/vdpau/output.c +++ b/src/gallium/state_trackers/vdpau/output.c @@ -80,7 +80,7 @@ vlVdpOutputSurfaceCreate(VdpDevice device, res_tmpl.depth0 = 1; res_tmpl.array_size = 1; res_tmpl.bind = PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET; - res_tmpl.usage = PIPE_USAGE_STATIC; + res_tmpl.usage = PIPE_USAGE_DEFAULT; pipe_mutex_lock(dev->mutex); diff --git a/src/gallium/state_trackers/vega/renderer.c b/src/gallium/state_trackers/vega/renderer.c index 35795fc8682..931924ca407 100644 --- a/src/gallium/state_trackers/vega/renderer.c +++ b/src/gallium/state_trackers/vega/renderer.c @@ -173,7 +173,7 @@ static void renderer_set_mvp(struct renderer *renderer, pipe_resource_reference(&cbuf, NULL); cbuf = pipe_buffer_create(renderer->pipe->screen, PIPE_BIND_CONSTANT_BUFFER, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, sizeof(consts)); if (cbuf) { pipe_buffer_write(renderer->pipe, cbuf, @@ -476,7 +476,7 @@ static void renderer_set_custom_fs(struct renderer *renderer, pipe_resource_reference(&cbuf, NULL); cbuf = pipe_buffer_create(renderer->pipe->screen, - PIPE_BIND_CONSTANT_BUFFER, PIPE_USAGE_STATIC, + PIPE_BIND_CONSTANT_BUFFER, PIPE_USAGE_DEFAULT, const_buffer_len); pipe_buffer_write(renderer->pipe, cbuf, 0, const_buffer_len, const_buffer); diff --git a/src/gallium/state_trackers/xa/xa_renderer.c b/src/gallium/state_trackers/xa/xa_renderer.c index b7755095a37..9ba78bed4df 100644 --- a/src/gallium/state_trackers/xa/xa_renderer.c +++ b/src/gallium/state_trackers/xa/xa_renderer.c @@ -380,7 +380,7 @@ renderer_set_constants(struct xa_context *r, pipe_resource_reference(cbuf, NULL); *cbuf = pipe_buffer_create(r->pipe->screen, - PIPE_BIND_CONSTANT_BUFFER, PIPE_USAGE_STATIC, + PIPE_BIND_CONSTANT_BUFFER, PIPE_USAGE_DEFAULT, param_bytes); if (*cbuf) { diff --git a/src/gallium/state_trackers/xvmc/subpicture.c b/src/gallium/state_trackers/xvmc/subpicture.c index 2a4bdbf5c4e..34973998d01 100644 --- a/src/gallium/state_trackers/xvmc/subpicture.c +++ b/src/gallium/state_trackers/xvmc/subpicture.c @@ -270,7 +270,7 @@ Status XvMCCreateSubpicture(Display *dpy, XvMCContext *context, XvMCSubpicture * tex_templ.format = PIPE_FORMAT_R8G8B8X8_UNORM; tex_templ.width0 = subpicture->num_palette_entries; tex_templ.height0 = 1; - tex_templ.usage = PIPE_USAGE_STATIC; + tex_templ.usage = PIPE_USAGE_DEFAULT; tex = pipe->screen->resource_create(pipe->screen, &tex_templ); diff --git a/src/gallium/tests/graw/fs-fragcoord.c b/src/gallium/tests/graw/fs-fragcoord.c index 75225b6e858..9b85cf79fb2 100644 --- a/src/gallium/tests/graw/fs-fragcoord.c +++ b/src/gallium/tests/graw/fs-fragcoord.c @@ -70,7 +70,7 @@ set_vertices(void) vbuf.buffer_offset = 0; vbuf.buffer = pipe_buffer_create_with_data(info.ctx, PIPE_BIND_VERTEX_BUFFER, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, sizeof(vertices), vertices); diff --git a/src/gallium/tests/graw/fs-frontface.c b/src/gallium/tests/graw/fs-frontface.c index faa43f335c9..a0c8a2d5d63 100644 --- a/src/gallium/tests/graw/fs-frontface.c +++ b/src/gallium/tests/graw/fs-frontface.c @@ -92,7 +92,7 @@ set_vertices(void) vbuf.buffer_offset = 0; vbuf.buffer = pipe_buffer_create_with_data(info.ctx, PIPE_BIND_VERTEX_BUFFER, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, sizeof(vertices), vertices); diff --git a/src/gallium/tests/graw/fs-test.c b/src/gallium/tests/graw/fs-test.c index 0560e31723e..e335bc6d469 100644 --- a/src/gallium/tests/graw/fs-test.c +++ b/src/gallium/tests/graw/fs-test.c @@ -177,7 +177,7 @@ static void set_vertices( void ) vbuf.buffer_offset = 0; vbuf.buffer = pipe_buffer_create_with_data(ctx, PIPE_BIND_VERTEX_BUFFER, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, sizeof(vertices), vertices); diff --git a/src/gallium/tests/graw/fs-write-z.c b/src/gallium/tests/graw/fs-write-z.c index 74ab2f475ba..eabae6424a0 100644 --- a/src/gallium/tests/graw/fs-write-z.c +++ b/src/gallium/tests/graw/fs-write-z.c @@ -96,7 +96,7 @@ set_vertices(void) vbuf.buffer_offset = 0; vbuf.buffer = pipe_buffer_create_with_data(info.ctx, PIPE_BIND_VERTEX_BUFFER, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, sizeof(vertices), vertices); diff --git a/src/gallium/tests/graw/gs-test.c b/src/gallium/tests/graw/gs-test.c index 879bf3e8324..c522a8f5c65 100644 --- a/src/gallium/tests/graw/gs-test.c +++ b/src/gallium/tests/graw/gs-test.c @@ -255,13 +255,13 @@ static void set_vertices( void ) if (draw_strip) { vbuf.buffer = pipe_buffer_create_with_data(ctx, PIPE_BIND_VERTEX_BUFFER, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, sizeof(vertices_strip), vertices_strip); } else { vbuf.buffer = pipe_buffer_create_with_data(ctx, PIPE_BIND_VERTEX_BUFFER, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, sizeof(vertices), vertices); } diff --git a/src/gallium/tests/graw/occlusion-query.c b/src/gallium/tests/graw/occlusion-query.c index 51d6326c2ba..f5227e33e9d 100644 --- a/src/gallium/tests/graw/occlusion-query.c +++ b/src/gallium/tests/graw/occlusion-query.c @@ -96,7 +96,7 @@ set_vertices(struct vertex *vertices, unsigned bytes) vbuf.buffer_offset = 0; vbuf.buffer = pipe_buffer_create_with_data(info.ctx, PIPE_BIND_VERTEX_BUFFER, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, bytes, vertices); diff --git a/src/gallium/tests/graw/quad-sample.c b/src/gallium/tests/graw/quad-sample.c index 2e248a8a6f4..4d5a59769f3 100644 --- a/src/gallium/tests/graw/quad-sample.c +++ b/src/gallium/tests/graw/quad-sample.c @@ -103,7 +103,7 @@ static void set_vertices( void ) vbuf.buffer_offset = 0; vbuf.buffer = pipe_buffer_create_with_data(ctx, PIPE_BIND_VERTEX_BUFFER, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, sizeof(vertices), vertices); diff --git a/src/gallium/tests/graw/quad-tex.c b/src/gallium/tests/graw/quad-tex.c index 9e4407e442e..5f90166830f 100644 --- a/src/gallium/tests/graw/quad-tex.c +++ b/src/gallium/tests/graw/quad-tex.c @@ -59,7 +59,7 @@ static void set_vertices( void ) vbuf.buffer_offset = 0; vbuf.buffer = pipe_buffer_create_with_data(info.ctx, PIPE_BIND_VERTEX_BUFFER, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, sizeof(vertices), vertices); diff --git a/src/gallium/tests/graw/shader-leak.c b/src/gallium/tests/graw/shader-leak.c index 754ada6cf10..fce3683bf3d 100644 --- a/src/gallium/tests/graw/shader-leak.c +++ b/src/gallium/tests/graw/shader-leak.c @@ -93,7 +93,7 @@ static void set_vertices( void ) vbuf.buffer_offset = 0; vbuf.buffer = pipe_buffer_create_with_data(ctx, PIPE_BIND_VERTEX_BUFFER, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, sizeof(vertices), vertices); diff --git a/src/gallium/tests/graw/tex-srgb.c b/src/gallium/tests/graw/tex-srgb.c index dce91188ebe..af989d72a2e 100644 --- a/src/gallium/tests/graw/tex-srgb.c +++ b/src/gallium/tests/graw/tex-srgb.c @@ -75,7 +75,7 @@ set_vertices(struct vertex *verts, unsigned num_verts) vbuf.buffer_offset = 0; vbuf.buffer = pipe_buffer_create_with_data(info.ctx, PIPE_BIND_VERTEX_BUFFER, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, num_verts * sizeof(struct vertex), verts); diff --git a/src/gallium/tests/graw/tex-swizzle.c b/src/gallium/tests/graw/tex-swizzle.c index 910a8ca3e45..e45b848b48e 100644 --- a/src/gallium/tests/graw/tex-swizzle.c +++ b/src/gallium/tests/graw/tex-swizzle.c @@ -57,7 +57,7 @@ static void set_vertices(void) vbuf.buffer_offset = 0; vbuf.buffer = pipe_buffer_create_with_data(info.ctx, PIPE_BIND_VERTEX_BUFFER, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, sizeof(vertices), vertices); diff --git a/src/gallium/tests/graw/tri-gs.c b/src/gallium/tests/graw/tri-gs.c index 24de12b723c..ab92dd02325 100644 --- a/src/gallium/tests/graw/tri-gs.c +++ b/src/gallium/tests/graw/tri-gs.c @@ -94,7 +94,7 @@ static void set_vertices( void ) vbuf.buffer_offset = 0; vbuf.buffer = pipe_buffer_create_with_data(ctx, PIPE_BIND_VERTEX_BUFFER, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, sizeof(vertices), vertices); diff --git a/src/gallium/tests/graw/tri-instanced.c b/src/gallium/tests/graw/tri-instanced.c index 55bc3a551da..d7cad81b722 100644 --- a/src/gallium/tests/graw/tri-instanced.c +++ b/src/gallium/tests/graw/tri-instanced.c @@ -137,7 +137,7 @@ static void set_vertices( void ) vbuf[0].buffer_offset = 0; vbuf[0].buffer = pipe_buffer_create_with_data(ctx, PIPE_BIND_VERTEX_BUFFER, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, sizeof(vertices), vertices); @@ -146,7 +146,7 @@ static void set_vertices( void ) vbuf[1].buffer_offset = 0; vbuf[1].buffer = pipe_buffer_create_with_data(ctx, PIPE_BIND_VERTEX_BUFFER, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, sizeof(inst_data), inst_data); @@ -155,7 +155,7 @@ static void set_vertices( void ) /* index data */ ibuf.buffer = pipe_buffer_create_with_data(ctx, PIPE_BIND_INDEX_BUFFER, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, sizeof(indices), indices); ibuf.offset = 0; diff --git a/src/gallium/tests/graw/tri-large.c b/src/gallium/tests/graw/tri-large.c index 67d49b07bb0..4ccb7c52672 100644 --- a/src/gallium/tests/graw/tri-large.c +++ b/src/gallium/tests/graw/tri-large.c @@ -61,7 +61,7 @@ static void set_vertices( void ) vbuf.buffer_offset = 0; vbuf.buffer = pipe_buffer_create_with_data(info.ctx, PIPE_BIND_VERTEX_BUFFER, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, sizeof(vertices), vertices); diff --git a/src/gallium/tests/graw/tri.c b/src/gallium/tests/graw/tri.c index f1d8142bd51..0968387e1e4 100644 --- a/src/gallium/tests/graw/tri.c +++ b/src/gallium/tests/graw/tri.c @@ -58,7 +58,7 @@ static void set_vertices( void ) vbuf.buffer_offset = 0; vbuf.buffer = pipe_buffer_create_with_data(info.ctx, PIPE_BIND_VERTEX_BUFFER, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, sizeof(vertices), vertices); diff --git a/src/gallium/tests/graw/vs-test.c b/src/gallium/tests/graw/vs-test.c index 0e9fc53e1b8..187759dcba4 100644 --- a/src/gallium/tests/graw/vs-test.c +++ b/src/gallium/tests/graw/vs-test.c @@ -176,7 +176,7 @@ static void set_vertices( void ) vbuf.buffer_offset = 0; vbuf.buffer = pipe_buffer_create_with_data(ctx, PIPE_BIND_VERTEX_BUFFER, - PIPE_USAGE_STATIC, + PIPE_USAGE_DEFAULT, sizeof(vertices), vertices); diff --git a/src/gallium/tests/trivial/quad-tex.c b/src/gallium/tests/trivial/quad-tex.c index 5ed741bdfd6..1d52aff3439 100644 --- a/src/gallium/tests/trivial/quad-tex.c +++ b/src/gallium/tests/trivial/quad-tex.c @@ -131,7 +131,7 @@ static void init_prog(struct program *p) }; p->vbuf = pipe_buffer_create(p->screen, PIPE_BIND_VERTEX_BUFFER, - PIPE_USAGE_STATIC, sizeof(vertices)); + PIPE_USAGE_DEFAULT, sizeof(vertices)); pipe_buffer_write(p->pipe, p->vbuf, 0, sizeof(vertices), vertices); } diff --git a/src/gallium/tests/trivial/tri.c b/src/gallium/tests/trivial/tri.c index f93c3f78710..062d45d2fa4 100644 --- a/src/gallium/tests/trivial/tri.c +++ b/src/gallium/tests/trivial/tri.c @@ -122,7 +122,7 @@ static void init_prog(struct program *p) }; p->vbuf = pipe_buffer_create(p->screen, PIPE_BIND_VERTEX_BUFFER, - PIPE_USAGE_STATIC, sizeof(vertices)); + PIPE_USAGE_DEFAULT, sizeof(vertices)); pipe_buffer_write(p->pipe, p->vbuf, 0, sizeof(vertices), vertices); } diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.c b/src/mesa/state_tracker/st_cb_bufferobjects.c index 7a410c21941..c8f088dc82c 100644 --- a/src/mesa/state_tracker/st_cb_bufferobjects.c +++ b/src/mesa/state_tracker/st_cb_bufferobjects.c @@ -229,7 +229,8 @@ st_bufferobj_data(struct gl_context *ctx, case GL_STATIC_DRAW: case GL_STATIC_READ: case GL_STATIC_COPY: - pipe_usage = PIPE_USAGE_STATIC; + default: + pipe_usage = PIPE_USAGE_DEFAULT; break; case GL_DYNAMIC_DRAW: case GL_DYNAMIC_READ: @@ -241,8 +242,6 @@ st_bufferobj_data(struct gl_context *ctx, case GL_STREAM_COPY: pipe_usage = PIPE_USAGE_STREAM; break; - default: - pipe_usage = PIPE_USAGE_DEFAULT; } pipe_resource_reference( &st_obj->buffer, NULL ); |