From c32114460dbb7f33885c181a0d7dee07b15b8751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 3 Feb 2014 03:42:17 +0100 Subject: gallium: remove PIPE_USAGE_STATIC Reviewed-by: Brian Paul --- src/gallium/tests/graw/fs-fragcoord.c | 2 +- src/gallium/tests/graw/fs-frontface.c | 2 +- src/gallium/tests/graw/fs-test.c | 2 +- src/gallium/tests/graw/fs-write-z.c | 2 +- src/gallium/tests/graw/gs-test.c | 4 ++-- src/gallium/tests/graw/occlusion-query.c | 2 +- src/gallium/tests/graw/quad-sample.c | 2 +- src/gallium/tests/graw/quad-tex.c | 2 +- src/gallium/tests/graw/shader-leak.c | 2 +- src/gallium/tests/graw/tex-srgb.c | 2 +- src/gallium/tests/graw/tex-swizzle.c | 2 +- src/gallium/tests/graw/tri-gs.c | 2 +- src/gallium/tests/graw/tri-instanced.c | 6 +++--- src/gallium/tests/graw/tri-large.c | 2 +- src/gallium/tests/graw/tri.c | 2 +- src/gallium/tests/graw/vs-test.c | 2 +- src/gallium/tests/trivial/quad-tex.c | 2 +- src/gallium/tests/trivial/tri.c | 2 +- 18 files changed, 21 insertions(+), 21 deletions(-) (limited to 'src/gallium/tests') diff --git a/src/gallium/tests/graw/fs-fragcoord.c b/src/gallium/tests/graw/fs-fragcoord.c index 75225b6..9b85cf7 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 faa43f3..a0c8a2d 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 0560e31..e335bc6 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 74ab2f4..eabae64 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 879bf3e..c522a8f 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 51d6326..f5227e3 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 2e248a8..4d5a597 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 9e4407e..5f90166 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 754ada6..fce3683 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 dce9118..af989d7 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 910a8ca..e45b848 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 24de12b..ab92dd0 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 55bc3a5..d7cad81 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 67d49b0..4ccb7c5 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 f1d8142..0968387 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 0e9fc53..187759d 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 5ed741b..1d52aff 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 f93c3f7..062d45d 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); } -- cgit v1.1