OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium: remove PIPE_USAGE_STATIC

Browse Source 
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Marek Olšák
2014-02-03 03:42:17 +01:00
parent eeb5a4a50e
commit c32114460d
52 changed files with 69 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/auxiliary/hud/font.c
View File

@@ -401,7 +401,7 @@ util_font_create_fixed_8x13(struct pipe_context *pipe,
tex_templ.height0 = 256; tex_templ.height0 = 256;
tex_templ.depth0 = 1; tex_templ.depth0 = 1;
tex_templ.array_size = 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_templ.bind = PIPE_BIND_SAMPLER_VIEW;
tex = screen->resource_create(screen, &tex_templ); tex = screen->resource_create(screen, &tex_templ);

4
src/gallium/auxiliary/postprocess/pp_mlaa.c
View File

@@ -240,7 +240,7 @@ pp_jimenezmlaa_init_run(struct pp_queue_t *ppq, unsigned int n,
ppq->constbuf = pipe_buffer_create(ppq->p->screen, ppq->constbuf = pipe_buffer_create(ppq->p->screen,
PIPE_BIND_CONSTANT_BUFFER, PIPE_BIND_CONSTANT_BUFFER,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
sizeof(constants)); sizeof(constants));
if (ppq->constbuf == NULL) { if (ppq->constbuf == NULL) {
pp_debug("Failed to allocate constant buffer\n"); 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.format = PIPE_FORMAT_R8G8_UNORM;
res.width0 = res.height0 = 165; res.width0 = res.height0 = 165;
res.bind = PIPE_BIND_SAMPLER_VIEW; 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; res.depth0 = res.array_size = res.nr_samples = 1;
if (!ppq->p->screen->is_format_supported(ppq->p->screen, res.format, if (!ppq->p->screen->is_format_supported(ppq->p->screen, res.format,

2
src/gallium/auxiliary/postprocess/pp_program.c
View File

@@ -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, 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); pipe_buffer_write(p->pipe, p->vbuf, 0, sizeof(verts), verts);
} }

6
src/gallium/auxiliary/util/u_index_modify.c
View File

@@ -71,7 +71,7 @@ void util_shorten_ubyte_elts(struct pipe_context *context,
new_elts = pipe_buffer_create(context->screen, new_elts = pipe_buffer_create(context->screen,
PIPE_BIND_INDEX_BUFFER, PIPE_BIND_INDEX_BUFFER,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
2 * count); 2 * count);
out_map = pipe_buffer_map(context, new_elts, PIPE_TRANSFER_WRITE, 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, new_elts = pipe_buffer_create(context->screen,
PIPE_BIND_INDEX_BUFFER, PIPE_BIND_INDEX_BUFFER,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
2 * count); 2 * count);
out_map = pipe_buffer_map(context, new_elts, 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, new_elts = pipe_buffer_create(context->screen,
PIPE_BIND_INDEX_BUFFER, PIPE_BIND_INDEX_BUFFER,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
2 * count); 2 * count);
out_map = pipe_buffer_map(context, new_elts, out_map = pipe_buffer_map(context, new_elts,

2
src/gallium/auxiliary/vl/vl_compositor.c
View File

@@ -1064,7 +1064,7 @@ vl_compositor_init_state(struct vl_compositor_state *s, struct pipe_context *pip
( (
pipe->screen, pipe->screen,
PIPE_BIND_CONSTANT_BUFFER, PIPE_BIND_CONSTANT_BUFFER,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
sizeof(csc_matrix) sizeof(csc_matrix)
); );

6
src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
View File

@@ -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->idct_source = vl_video_buffer_create_ex
( (
dec->context, &templat, dec->context, &templat,
formats, 1, 1, PIPE_USAGE_STATIC formats, 1, 1, PIPE_USAGE_DEFAULT
); );
if (!dec->idct_source) 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->mc_source = vl_video_buffer_create_ex
( (
dec->context, &templat, 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) 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->mc_source = vl_video_buffer_create_ex
( (
dec->context, &templat, dec->context, &templat,
formats, 1, 1, PIPE_USAGE_STATIC formats, 1, 1, PIPE_USAGE_DEFAULT
); );
return dec->mc_source != NULL; return dec->mc_source != NULL;

4
src/gallium/auxiliary/vl/vl_vertex_buffers.c
View File

@@ -53,7 +53,7 @@ vl_vb_upload_quads(struct pipe_context *pipe)
( (
pipe->screen, pipe->screen,
PIPE_BIND_VERTEX_BUFFER, PIPE_BIND_VERTEX_BUFFER,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
sizeof(struct vertex2f) * 4 sizeof(struct vertex2f) * 4
); );
quad.user_buffer = NULL; quad.user_buffer = NULL;
@@ -98,7 +98,7 @@ vl_vb_upload_pos(struct pipe_context *pipe, unsigned width, unsigned height)
( (
pipe->screen, pipe->screen,
PIPE_BIND_VERTEX_BUFFER, PIPE_BIND_VERTEX_BUFFER,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
sizeof(struct vertex2s) * width * height sizeof(struct vertex2s) * width * height
); );
pos.user_buffer = NULL; pos.user_buffer = NULL;

2
src/gallium/auxiliary/vl/vl_video_buffer.c
View File

@@ -427,7 +427,7 @@ vl_video_buffer_create(struct pipe_context *pipe,
result = vl_video_buffer_create_ex result = vl_video_buffer_create_ex
( (
pipe, &templat, resource_formats, pipe, &templat, resource_formats,
1, tmpl->interlaced ? 2 : 1, PIPE_USAGE_STATIC 1, tmpl->interlaced ? 2 : 1, PIPE_USAGE_DEFAULT
); );

2
src/gallium/auxiliary/vl/vl_winsys_dri.c
View File

@@ -234,7 +234,7 @@ vl_screen_texture_from_drawable(struct vl_screen *vscreen, Drawable drawable)
template.height0 = reply->height; template.height0 = reply->height;
template.depth0 = 1; template.depth0 = 1;
template.array_size = 1; template.array_size = 1;
template.usage = PIPE_USAGE_STATIC; template.usage = PIPE_USAGE_DEFAULT;
template.bind = PIPE_BIND_RENDER_TARGET; template.bind = PIPE_BIND_RENDER_TARGET;
template.flags = 0; template.flags = 0;

1
src/gallium/docs/source/screen.rst
View File

@@ -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. 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 * ``PIPE_USAGE_DYNAMIC``: Expect frequent write-only CPU access. What is
uploaded is expected to be used at least several times by the GPU. 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 * ``PIPE_USAGE_STREAM``: Expect frequent write-only CPU access. What is
uploaded is expected to be used only once by the GPU. uploaded is expected to be used only once by the GPU.
* ``PIPE_USAGE_STAGING``: Optimized for fast CPU access. * ``PIPE_USAGE_STAGING``: Optimized for fast CPU access.

1
src/gallium/drivers/nouveau/nouveau_buffer.c
View File

@@ -626,7 +626,6 @@ nouveau_buffer_create(struct pipe_screen *pscreen,
switch (buffer->base.usage) { switch (buffer->base.usage) {
case PIPE_USAGE_DEFAULT: case PIPE_USAGE_DEFAULT:
case PIPE_USAGE_IMMUTABLE: case PIPE_USAGE_IMMUTABLE:
case PIPE_USAGE_STATIC:
buffer->domain = NOUVEAU_BO_VRAM; buffer->domain = NOUVEAU_BO_VRAM;
break; break;
case PIPE_USAGE_DYNAMIC: case PIPE_USAGE_DYNAMIC:

2
src/gallium/drivers/nouveau/nouveau_video.c
View File

@@ -811,7 +811,7 @@ nouveau_video_buffer_create(struct pipe_context *pipe,
templ.depth0 = 1; templ.depth0 = 1;
templ.array_size = 1; templ.array_size = 1;
templ.bind = PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET; 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; templ.flags = NOUVEAU_RESOURCE_FLAG_LINEAR;
buffer->resources[0] = pipe->screen->resource_create(pipe->screen, &templ); buffer->resources[0] = pipe->screen->resource_create(pipe->screen, &templ);

2
src/gallium/drivers/r300/r300_blit.c
View File

@@ -772,7 +772,7 @@ static void r300_msaa_resolve(struct pipe_context *pipe,
templ.height0 = info->src.resource->height0; templ.height0 = info->src.resource->height0;
templ.depth0 = 1; templ.depth0 = 1;
templ.array_size = 1; templ.array_size = 1;
templ.usage = PIPE_USAGE_STATIC; templ.usage = PIPE_USAGE_DEFAULT;
templ.flags = R300_RESOURCE_FORCE_MICROTILING; templ.flags = R300_RESOURCE_FORCE_MICROTILING;
tmp = screen->resource_create(screen, &templ); tmp = screen->resource_create(screen, &templ);

2
src/gallium/drivers/r300/r300_context.c
View File

@@ -451,7 +451,7 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen,
memset(&vb, 0, sizeof(vb)); memset(&vb, 0, sizeof(vb));
vb.target = PIPE_BUFFER; vb.target = PIPE_BUFFER;
vb.format = PIPE_FORMAT_R8_UNORM; vb.format = PIPE_FORMAT_R8_UNORM;
vb.usage = PIPE_USAGE_STATIC; vb.usage = PIPE_USAGE_DEFAULT;
vb.width0 = sizeof(float) * 16; vb.width0 = sizeof(float) * 16;
vb.height0 = 1; vb.height0 = 1;
vb.depth0 = 1; vb.depth0 = 1;

4
src/gallium/drivers/r600/r600_pipe.c
View File

@@ -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, 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) if (!rctx->allocator_fetch_shader)
goto fail; goto fail;
@@ -647,7 +647,7 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws)
templ.array_size = 1; templ.array_size = 1;
templ.target = PIPE_TEXTURE_2D; templ.target = PIPE_TEXTURE_2D;
templ.format = PIPE_FORMAT_R8G8B8A8_UNORM; 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)); 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); unsigned char *map = ws->buffer_map(res->cs_buf, NULL, PIPE_TRANSFER_WRITE);

2
src/gallium/drivers/r600/r600_state.c
View File

@@ -1244,7 +1244,7 @@ static struct r600_resource *r600_buffer_create_helper(struct r600_screen *rscre
buffer.target = PIPE_BUFFER; buffer.target = PIPE_BUFFER;
buffer.format = PIPE_FORMAT_R8_UNORM; buffer.format = PIPE_FORMAT_R8_UNORM;
buffer.bind = PIPE_BIND_CUSTOM; buffer.bind = PIPE_BIND_CUSTOM;
buffer.usage = PIPE_USAGE_STATIC; buffer.usage = PIPE_USAGE_DEFAULT;
buffer.flags = 0; buffer.flags = 0;
buffer.width0 = size; buffer.width0 = size;
buffer.height0 = 1; buffer.height0 = 1;

4
src/gallium/drivers/r600/r600_state_common.c
View File

@@ -1109,14 +1109,14 @@ static void update_gs_block_state(struct r600_context *rctx, unsigned enable)
unsigned size = 0x1C000; unsigned size = 0x1C000;
rctx->gs_rings.esgs_ring.buffer = rctx->gs_rings.esgs_ring.buffer =
pipe_buffer_create(rctx->b.b.screen, PIPE_BIND_CUSTOM, 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; rctx->gs_rings.esgs_ring.buffer_size = size;
size = 0x4000000; size = 0x4000000;
rctx->gs_rings.gsvs_ring.buffer = rctx->gs_rings.gsvs_ring.buffer =
pipe_buffer_create(rctx->b.b.screen, PIPE_BIND_CUSTOM, 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; rctx->gs_rings.gsvs_ring.buffer_size = size;
} }

6
src/gallium/drivers/r600/r600_uvd.c
View File

@@ -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.width = align(tmpl->width, VL_MACROBLOCK_WIDTH);
template.height = align(tmpl->height / array_size, VL_MACROBLOCK_HEIGHT); 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) if (ctx->b.chip_class < EVERGREEN || tmpl->interlaced)
templ.bind = PIPE_BIND_LINEAR; templ.bind = PIPE_BIND_LINEAR;
resources[0] = (struct r600_texture *) resources[0] = (struct r600_texture *)
@@ -85,7 +85,7 @@ struct pipe_video_buffer *r600_video_buffer_create(struct pipe_context *pipe,
goto error; goto error;
if (resource_formats[1] != PIPE_FORMAT_NONE) { 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) if (ctx->b.chip_class < EVERGREEN || tmpl->interlaced)
templ.bind = PIPE_BIND_LINEAR; templ.bind = PIPE_BIND_LINEAR;
resources[1] = (struct r600_texture *) 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) { 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) if (ctx->b.chip_class < EVERGREEN || tmpl->interlaced)
templ.bind = PIPE_BIND_LINEAR; templ.bind = PIPE_BIND_LINEAR;
resources[2] = (struct r600_texture *) resources[2] = (struct r600_texture *)

1
src/gallium/drivers/radeon/r600_buffer_common.c
View File

@@ -115,7 +115,6 @@ bool r600_init_resource(struct r600_common_screen *rscreen,
res->domains = RADEON_DOMAIN_GTT; res->domains = RADEON_DOMAIN_GTT;
break; break;
case PIPE_USAGE_DEFAULT: case PIPE_USAGE_DEFAULT:
case PIPE_USAGE_STATIC:
case PIPE_USAGE_IMMUTABLE: case PIPE_USAGE_IMMUTABLE:
default: default:
/* Not listing GTT here improves performance in some apps. */ /* Not listing GTT here improves performance in some apps. */

2
src/gallium/drivers/radeon/r600_pipe_common.c
View File

@@ -61,7 +61,7 @@ bool r600_common_context_init(struct r600_common_context *rctx,
r600_query_init(rctx); r600_query_init(rctx);
rctx->allocator_so_filled_size = u_suballocator_create(&rctx->b, 4096, 4, 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) if (!rctx->allocator_so_filled_size)
return false; return false;

8
src/gallium/drivers/radeon/r600_texture.c
View File

@@ -453,7 +453,7 @@ void r600_texture_init_cmask(struct r600_common_screen *rscreen,
rtex->cmask_buffer = (struct r600_resource *) rtex->cmask_buffer = (struct r600_resource *)
pipe_buffer_create(&rscreen->b, PIPE_BIND_CUSTOM, 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) { if (rtex->cmask_buffer == NULL) {
rtex->cmask.size = 0; 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 */ /* XXX don't allocate it separately */
rtex->htile_buffer = (struct r600_resource*) rtex->htile_buffer = (struct r600_resource*)
pipe_buffer_create(&rscreen->b, PIPE_BIND_CUSTOM, pipe_buffer_create(&rscreen->b, PIPE_BIND_CUSTOM,
PIPE_USAGE_STATIC, htile_size); PIPE_USAGE_DEFAULT, htile_size);
if (rtex->htile_buffer == NULL) { if (rtex->htile_buffer == NULL) {
/* this is not a fatal error as we can still keep rendering /* this is not a fatal error as we can still keep rendering
* without htile buffer */ * without htile buffer */
@@ -827,7 +827,7 @@ bool r600_init_flushed_depth_texture(struct pipe_context *ctx,
resource.array_size = texture->array_size; resource.array_size = texture->array_size;
resource.last_level = texture->last_level; resource.last_level = texture->last_level;
resource.nr_samples = texture->nr_samples; 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.bind = texture->bind & ~PIPE_BIND_DEPTH_STENCIL;
resource.flags = texture->flags | R600_RESOURCE_FLAG_FLUSHED_DEPTH; 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->height0 = box->height;
res->depth0 = 1; res->depth0 = 1;
res->array_size = 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; res->flags = flags;
/* We must set the correct texture target and dimensions for a 3D box. */ /* We must set the correct texture target and dimensions for a 3D box. */

2
src/gallium/drivers/radeonsi/si_descriptors.c
View File

@@ -126,7 +126,7 @@ static void si_init_descriptors(struct si_context *sctx,
desc->buffer = (struct r600_resource*) desc->buffer = (struct r600_resource*)
pipe_buffer_create(sctx->b.b.screen, PIPE_BIND_CUSTOM, pipe_buffer_create(sctx->b.b.screen, PIPE_BIND_CUSTOM,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
SI_NUM_CONTEXTS * desc->context_size); SI_NUM_CONTEXTS * desc->context_size);
r600_context_bo_reloc(&sctx->b, &sctx->b.rings.gfx, desc->buffer, RADEON_USAGE_READWRITE); r600_context_bo_reloc(&sctx->b, &sctx->b.rings.gfx, desc->buffer, RADEON_USAGE_READWRITE);

2
src/gallium/drivers/radeonsi/si_pipe.c
View File

@@ -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. */ * with a NULL buffer). We need to use a dummy buffer instead. */
if (sctx->b.chip_class == CIK) { if (sctx->b.chip_class == CIK) {
sctx->null_const_buf.buffer = pipe_buffer_create(screen, PIPE_BIND_CONSTANT_BUFFER, 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; sctx->null_const_buf.buffer_size = sctx->null_const_buf.buffer->width0;
for (shader = 0; shader < SI_NUM_SHADERS; shader++) { for (shader = 0; shader < SI_NUM_SHADERS; shader++) {

4
src/gallium/drivers/radeonsi/si_state_draw.c
View File

@@ -548,13 +548,13 @@ static void si_init_gs_rings(struct si_context *sctx)
sctx->esgs_ring.buffer = sctx->esgs_ring.buffer =
pipe_buffer_create(sctx->b.b.screen, PIPE_BIND_CUSTOM, pipe_buffer_create(sctx->b.b.screen, PIPE_BIND_CUSTOM,
PIPE_USAGE_STATIC, size); PIPE_USAGE_DEFAULT, size);
sctx->esgs_ring.buffer_size = size; sctx->esgs_ring.buffer_size = size;
size = 64 * 1024 * 1024; size = 64 * 1024 * 1024;
sctx->gsvs_ring.buffer = sctx->gsvs_ring.buffer =
pipe_buffer_create(sctx->b.b.screen, PIPE_BIND_CUSTOM, pipe_buffer_create(sctx->b.b.screen, PIPE_BIND_CUSTOM,
PIPE_USAGE_STATIC, size); PIPE_USAGE_DEFAULT, size);
sctx->gsvs_ring.buffer_size = size; sctx->gsvs_ring.buffer_size = size;
if (sctx->b.chip_class >= CIK) { if (sctx->b.chip_class >= CIK) {

6
src/gallium/drivers/radeonsi/si_uvd.c
View File

@@ -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.width = align(tmpl->width, VL_MACROBLOCK_WIDTH);
template.height = align(tmpl->height / array_size, VL_MACROBLOCK_HEIGHT); 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 */ /* TODO: get tiling working */
templ.bind = PIPE_BIND_LINEAR; templ.bind = PIPE_BIND_LINEAR;
resources[0] = (struct r600_texture *) resources[0] = (struct r600_texture *)
@@ -71,7 +71,7 @@ struct pipe_video_buffer *si_video_buffer_create(struct pipe_context *pipe,
goto error; goto error;
if (resource_formats[1] != PIPE_FORMAT_NONE) { 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; templ.bind = PIPE_BIND_LINEAR;
resources[1] = (struct r600_texture *) resources[1] = (struct r600_texture *)
pipe->screen->resource_create(pipe->screen, &templ); 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) { 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; templ.bind = PIPE_BIND_LINEAR;
resources[2] = (struct r600_texture *) resources[2] = (struct r600_texture *)
pipe->screen->resource_create(pipe->screen, &templ); pipe->screen->resource_create(pipe->screen, &templ);

2
src/gallium/drivers/svga/svga_draw_arrays.c
View File

@@ -50,7 +50,7 @@ generate_indices(struct svga_hwtnl *hwtnl,
void *dst_map = NULL; void *dst_map = NULL;
dst = pipe_buffer_create(pipe->screen, 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) if (dst == NULL)
goto fail; goto fail;

2
src/gallium/drivers/svga/svga_draw_elements.c
View File

@@ -58,7 +58,7 @@ translate_indices(struct svga_hwtnl *hwtnl, struct pipe_resource *src,
size = index_size * nr; size = index_size * nr;
dst = pipe_buffer_create(pipe->screen, 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) if (dst == NULL)
goto fail; goto fail;

1
src/gallium/include/pipe/p_defines.h
View File

@@ -363,7 +363,6 @@ enum pipe_flush_flags {
#define PIPE_USAGE_DYNAMIC 2 /* uploaded data is used multiple times */ #define PIPE_USAGE_DYNAMIC 2 /* uploaded data is used multiple times */
#define PIPE_USAGE_STREAM 3 /* uploaded data is used once */ #define PIPE_USAGE_STREAM 3 /* uploaded data is used once */
#define PIPE_USAGE_STAGING 4 /* fast CPU access */ #define PIPE_USAGE_STAGING 4 /* fast CPU access */
#define PIPE_USAGE_STATIC 5 /* same as DEFAULT, will be removed */
/** /**

2
src/gallium/state_trackers/vdpau/bitmap.c
View File

@@ -77,7 +77,7 @@ vlVdpBitmapSurfaceCreate(VdpDevice device,
res_tmpl.depth0 = 1; res_tmpl.depth0 = 1;
res_tmpl.array_size = 1; res_tmpl.array_size = 1;
res_tmpl.bind = PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET; 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); pipe_mutex_lock(dev->mutex);

2
src/gallium/state_trackers/vdpau/output.c
View File

@@ -80,7 +80,7 @@ vlVdpOutputSurfaceCreate(VdpDevice device,
res_tmpl.depth0 = 1; res_tmpl.depth0 = 1;
res_tmpl.array_size = 1; res_tmpl.array_size = 1;
res_tmpl.bind = PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET; 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); pipe_mutex_lock(dev->mutex);

4
src/gallium/state_trackers/vega/renderer.c
View File

@@ -173,7 +173,7 @@ static void renderer_set_mvp(struct renderer *renderer,
pipe_resource_reference(&cbuf, NULL); pipe_resource_reference(&cbuf, NULL);
cbuf = pipe_buffer_create(renderer->pipe->screen, cbuf = pipe_buffer_create(renderer->pipe->screen,
PIPE_BIND_CONSTANT_BUFFER, PIPE_BIND_CONSTANT_BUFFER,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
sizeof(consts)); sizeof(consts));
if (cbuf) { if (cbuf) {
pipe_buffer_write(renderer->pipe, 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); pipe_resource_reference(&cbuf, NULL);
cbuf = pipe_buffer_create(renderer->pipe->screen, cbuf = pipe_buffer_create(renderer->pipe->screen,
PIPE_BIND_CONSTANT_BUFFER, PIPE_USAGE_STATIC, PIPE_BIND_CONSTANT_BUFFER, PIPE_USAGE_DEFAULT,
const_buffer_len); const_buffer_len);
pipe_buffer_write(renderer->pipe, cbuf, 0, pipe_buffer_write(renderer->pipe, cbuf, 0,
const_buffer_len, const_buffer); const_buffer_len, const_buffer);

2
src/gallium/state_trackers/xa/xa_renderer.c
View File

@@ -380,7 +380,7 @@ renderer_set_constants(struct xa_context *r,
pipe_resource_reference(cbuf, NULL); pipe_resource_reference(cbuf, NULL);
*cbuf = pipe_buffer_create(r->pipe->screen, *cbuf = pipe_buffer_create(r->pipe->screen,
PIPE_BIND_CONSTANT_BUFFER, PIPE_USAGE_STATIC, PIPE_BIND_CONSTANT_BUFFER, PIPE_USAGE_DEFAULT,
param_bytes); param_bytes);
if (*cbuf) { if (*cbuf) {

2
src/gallium/state_trackers/xvmc/subpicture.c
View File

@@ -270,7 +270,7 @@ Status XvMCCreateSubpicture(Display *dpy, XvMCContext *context, XvMCSubpicture *
tex_templ.format = PIPE_FORMAT_R8G8B8X8_UNORM; tex_templ.format = PIPE_FORMAT_R8G8B8X8_UNORM;
tex_templ.width0 = subpicture->num_palette_entries; tex_templ.width0 = subpicture->num_palette_entries;
tex_templ.height0 = 1; 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); tex = pipe->screen->resource_create(pipe->screen, &tex_templ);

2
src/gallium/tests/graw/fs-fragcoord.c
View File

@@ -70,7 +70,7 @@ set_vertices(void)
vbuf.buffer_offset = 0; vbuf.buffer_offset = 0;
vbuf.buffer = pipe_buffer_create_with_data(info.ctx, vbuf.buffer = pipe_buffer_create_with_data(info.ctx,
PIPE_BIND_VERTEX_BUFFER, PIPE_BIND_VERTEX_BUFFER,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
sizeof(vertices), sizeof(vertices),
vertices); vertices);

2
src/gallium/tests/graw/fs-frontface.c
View File

@@ -92,7 +92,7 @@ set_vertices(void)
vbuf.buffer_offset = 0; vbuf.buffer_offset = 0;
vbuf.buffer = pipe_buffer_create_with_data(info.ctx, vbuf.buffer = pipe_buffer_create_with_data(info.ctx,
PIPE_BIND_VERTEX_BUFFER, PIPE_BIND_VERTEX_BUFFER,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
sizeof(vertices), sizeof(vertices),
vertices); vertices);

2
src/gallium/tests/graw/fs-test.c
View File

@@ -177,7 +177,7 @@ static void set_vertices( void )
vbuf.buffer_offset = 0; vbuf.buffer_offset = 0;
vbuf.buffer = pipe_buffer_create_with_data(ctx, vbuf.buffer = pipe_buffer_create_with_data(ctx,
PIPE_BIND_VERTEX_BUFFER, PIPE_BIND_VERTEX_BUFFER,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
sizeof(vertices), sizeof(vertices),
vertices); vertices);

2
src/gallium/tests/graw/fs-write-z.c
View File

@@ -96,7 +96,7 @@ set_vertices(void)
vbuf.buffer_offset = 0; vbuf.buffer_offset = 0;
vbuf.buffer = pipe_buffer_create_with_data(info.ctx, vbuf.buffer = pipe_buffer_create_with_data(info.ctx,
PIPE_BIND_VERTEX_BUFFER, PIPE_BIND_VERTEX_BUFFER,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
sizeof(vertices), sizeof(vertices),
vertices); vertices);

4
src/gallium/tests/graw/gs-test.c
View File

@@ -255,13 +255,13 @@ static void set_vertices( void )
if (draw_strip) { if (draw_strip) {
vbuf.buffer = pipe_buffer_create_with_data(ctx, vbuf.buffer = pipe_buffer_create_with_data(ctx,
PIPE_BIND_VERTEX_BUFFER, PIPE_BIND_VERTEX_BUFFER,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
sizeof(vertices_strip), sizeof(vertices_strip),
vertices_strip); vertices_strip);
} else { } else {
vbuf.buffer = pipe_buffer_create_with_data(ctx, vbuf.buffer = pipe_buffer_create_with_data(ctx,
PIPE_BIND_VERTEX_BUFFER, PIPE_BIND_VERTEX_BUFFER,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
sizeof(vertices), sizeof(vertices),
vertices); vertices);
} }

2
src/gallium/tests/graw/occlusion-query.c
View File

@@ -96,7 +96,7 @@ set_vertices(struct vertex *vertices, unsigned bytes)
vbuf.buffer_offset = 0; vbuf.buffer_offset = 0;
vbuf.buffer = pipe_buffer_create_with_data(info.ctx, vbuf.buffer = pipe_buffer_create_with_data(info.ctx,
PIPE_BIND_VERTEX_BUFFER, PIPE_BIND_VERTEX_BUFFER,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
bytes, bytes,
vertices); vertices);

2
src/gallium/tests/graw/quad-sample.c
View File

@@ -103,7 +103,7 @@ static void set_vertices( void )
vbuf.buffer_offset = 0; vbuf.buffer_offset = 0;
vbuf.buffer = pipe_buffer_create_with_data(ctx, vbuf.buffer = pipe_buffer_create_with_data(ctx,
PIPE_BIND_VERTEX_BUFFER, PIPE_BIND_VERTEX_BUFFER,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
sizeof(vertices), sizeof(vertices),
vertices); vertices);

2
src/gallium/tests/graw/quad-tex.c
View File

@@ -59,7 +59,7 @@ static void set_vertices( void )
vbuf.buffer_offset = 0; vbuf.buffer_offset = 0;
vbuf.buffer = pipe_buffer_create_with_data(info.ctx, vbuf.buffer = pipe_buffer_create_with_data(info.ctx,
PIPE_BIND_VERTEX_BUFFER, PIPE_BIND_VERTEX_BUFFER,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
sizeof(vertices), sizeof(vertices),
vertices); vertices);

2
src/gallium/tests/graw/shader-leak.c
View File

@@ -93,7 +93,7 @@ static void set_vertices( void )
vbuf.buffer_offset = 0; vbuf.buffer_offset = 0;
vbuf.buffer = pipe_buffer_create_with_data(ctx, vbuf.buffer = pipe_buffer_create_with_data(ctx,
PIPE_BIND_VERTEX_BUFFER, PIPE_BIND_VERTEX_BUFFER,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
sizeof(vertices), sizeof(vertices),
vertices); vertices);

2
src/gallium/tests/graw/tex-srgb.c
View File

@@ -75,7 +75,7 @@ set_vertices(struct vertex *verts, unsigned num_verts)
vbuf.buffer_offset = 0; vbuf.buffer_offset = 0;
vbuf.buffer = pipe_buffer_create_with_data(info.ctx, vbuf.buffer = pipe_buffer_create_with_data(info.ctx,
PIPE_BIND_VERTEX_BUFFER, PIPE_BIND_VERTEX_BUFFER,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
num_verts * sizeof(struct vertex), num_verts * sizeof(struct vertex),
verts); verts);

2
src/gallium/tests/graw/tex-swizzle.c
View File

@@ -57,7 +57,7 @@ static void set_vertices(void)
vbuf.buffer_offset = 0; vbuf.buffer_offset = 0;
vbuf.buffer = pipe_buffer_create_with_data(info.ctx, vbuf.buffer = pipe_buffer_create_with_data(info.ctx,
PIPE_BIND_VERTEX_BUFFER, PIPE_BIND_VERTEX_BUFFER,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
sizeof(vertices), sizeof(vertices),
vertices); vertices);

2
src/gallium/tests/graw/tri-gs.c
View File

@@ -94,7 +94,7 @@ static void set_vertices( void )
vbuf.buffer_offset = 0; vbuf.buffer_offset = 0;
vbuf.buffer = pipe_buffer_create_with_data(ctx, vbuf.buffer = pipe_buffer_create_with_data(ctx,
PIPE_BIND_VERTEX_BUFFER, PIPE_BIND_VERTEX_BUFFER,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
sizeof(vertices), sizeof(vertices),
vertices); vertices);

6
src/gallium/tests/graw/tri-instanced.c
View File

@@ -137,7 +137,7 @@ static void set_vertices( void )
vbuf[0].buffer_offset = 0; vbuf[0].buffer_offset = 0;
vbuf[0].buffer = pipe_buffer_create_with_data(ctx, vbuf[0].buffer = pipe_buffer_create_with_data(ctx,
PIPE_BIND_VERTEX_BUFFER, PIPE_BIND_VERTEX_BUFFER,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
sizeof(vertices), sizeof(vertices),
vertices); vertices);
@@ -146,7 +146,7 @@ static void set_vertices( void )
vbuf[1].buffer_offset = 0; vbuf[1].buffer_offset = 0;
vbuf[1].buffer = pipe_buffer_create_with_data(ctx, vbuf[1].buffer = pipe_buffer_create_with_data(ctx,
PIPE_BIND_VERTEX_BUFFER, PIPE_BIND_VERTEX_BUFFER,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
sizeof(inst_data), sizeof(inst_data),
inst_data); inst_data);
@@ -155,7 +155,7 @@ static void set_vertices( void )
/* index data */ /* index data */
ibuf.buffer = pipe_buffer_create_with_data(ctx, ibuf.buffer = pipe_buffer_create_with_data(ctx,
PIPE_BIND_INDEX_BUFFER, PIPE_BIND_INDEX_BUFFER,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
sizeof(indices), sizeof(indices),
indices); indices);
ibuf.offset = 0; ibuf.offset = 0;

2
src/gallium/tests/graw/tri-large.c
View File

@@ -61,7 +61,7 @@ static void set_vertices( void )
vbuf.buffer_offset = 0; vbuf.buffer_offset = 0;
vbuf.buffer = pipe_buffer_create_with_data(info.ctx, vbuf.buffer = pipe_buffer_create_with_data(info.ctx,
PIPE_BIND_VERTEX_BUFFER, PIPE_BIND_VERTEX_BUFFER,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
sizeof(vertices), sizeof(vertices),
vertices); vertices);

2
src/gallium/tests/graw/tri.c
View File

@@ -58,7 +58,7 @@ static void set_vertices( void )
vbuf.buffer_offset = 0; vbuf.buffer_offset = 0;
vbuf.buffer = pipe_buffer_create_with_data(info.ctx, vbuf.buffer = pipe_buffer_create_with_data(info.ctx,
PIPE_BIND_VERTEX_BUFFER, PIPE_BIND_VERTEX_BUFFER,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
sizeof(vertices), sizeof(vertices),
vertices); vertices);

2
src/gallium/tests/graw/vs-test.c
View File

@@ -176,7 +176,7 @@ static void set_vertices( void )
vbuf.buffer_offset = 0; vbuf.buffer_offset = 0;
vbuf.buffer = pipe_buffer_create_with_data(ctx, vbuf.buffer = pipe_buffer_create_with_data(ctx,
PIPE_BIND_VERTEX_BUFFER, PIPE_BIND_VERTEX_BUFFER,
PIPE_USAGE_STATIC, PIPE_USAGE_DEFAULT,
sizeof(vertices), sizeof(vertices),
vertices); vertices);

2
src/gallium/tests/trivial/quad-tex.c
View File

@@ -131,7 +131,7 @@ static void init_prog(struct program *p)
}; };
p->vbuf = pipe_buffer_create(p->screen, PIPE_BIND_VERTEX_BUFFER, 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); pipe_buffer_write(p->pipe, p->vbuf, 0, sizeof(vertices), vertices);
} }

2
src/gallium/tests/trivial/tri.c
View File

@@ -122,7 +122,7 @@ static void init_prog(struct program *p)
}; };
p->vbuf = pipe_buffer_create(p->screen, PIPE_BIND_VERTEX_BUFFER, 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); pipe_buffer_write(p->pipe, p->vbuf, 0, sizeof(vertices), vertices);
} }

5
src/mesa/state_tracker/st_cb_bufferobjects.c
View File

@@ -229,7 +229,8 @@ st_bufferobj_data(struct gl_context *ctx,
case GL_STATIC_DRAW: case GL_STATIC_DRAW:
case GL_STATIC_READ: case GL_STATIC_READ:
case GL_STATIC_COPY: case GL_STATIC_COPY:
pipe_usage = PIPE_USAGE_STATIC; default:
pipe_usage = PIPE_USAGE_DEFAULT;
break; break;
case GL_DYNAMIC_DRAW: case GL_DYNAMIC_DRAW:
case GL_DYNAMIC_READ: case GL_DYNAMIC_READ:
@@ -241,8 +242,6 @@ st_bufferobj_data(struct gl_context *ctx,
case GL_STREAM_COPY: case GL_STREAM_COPY:
pipe_usage = PIPE_USAGE_STREAM; pipe_usage = PIPE_USAGE_STREAM;
break; break;
default:
pipe_usage = PIPE_USAGE_DEFAULT;
} }
pipe_resource_reference( &st_obj->buffer, NULL ); pipe_resource_reference( &st_obj->buffer, NULL );