summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2014-02-03 03:42:17 +0100
committerMarek Olšák <[email protected]>2014-02-06 17:37:34 +0100
commitc32114460dbb7f33885c181a0d7dee07b15b8751 (patch)
treefd6d0a17ed48e93e42d61138d0bef80d8577f0a8 /src/gallium/auxiliary
parenteeb5a4a50e1317a7f8d9e168c962ce3b1d7b36f9 (diff)
gallium: remove PIPE_USAGE_STATIC
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary')
-rw-r--r--src/gallium/auxiliary/hud/font.c2
-rw-r--r--src/gallium/auxiliary/postprocess/pp_mlaa.c4
-rw-r--r--src/gallium/auxiliary/postprocess/pp_program.c2
-rw-r--r--src/gallium/auxiliary/util/u_index_modify.c6
-rw-r--r--src/gallium/auxiliary/vl/vl_compositor.c2
-rw-r--r--src/gallium/auxiliary/vl/vl_mpeg12_decoder.c6
-rw-r--r--src/gallium/auxiliary/vl/vl_vertex_buffers.c4
-rw-r--r--src/gallium/auxiliary/vl/vl_video_buffer.c2
-rw-r--r--src/gallium/auxiliary/vl/vl_winsys_dri.c2
9 files changed, 15 insertions, 15 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;