Mesa (master): gallium/graw: stop using user_buffer_create
Marek Olšák
mareko at kemper.freedesktop.org
Sat May 12 21:17:07 UTC 2012
Module: Mesa
Branch: master
Commit: 1a840cc5925f52079916feb2c456816a7a91d627
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1a840cc5925f52079916feb2c456816a7a91d627
Author: Marek Olšák <maraeo at gmail.com>
Date: Sat May 12 12:56:19 2012 +0200
gallium/graw: stop using user_buffer_create
This is compile-tested.
---
src/gallium/auxiliary/util/u_inlines.h | 13 +++++++++++++
src/gallium/tests/graw/fs-fragcoord.c | 9 +++++----
src/gallium/tests/graw/fs-frontface.c | 9 +++++----
src/gallium/tests/graw/fs-test.c | 9 +++++----
src/gallium/tests/graw/fs-write-z.c | 9 +++++----
src/gallium/tests/graw/gs-test.c | 18 ++++++++++--------
src/gallium/tests/graw/occlusion-query.c | 9 +++++----
src/gallium/tests/graw/quad-sample.c | 9 +++++----
src/gallium/tests/graw/quad-tex.c | 9 +++++----
src/gallium/tests/graw/shader-leak.c | 10 ++++++----
src/gallium/tests/graw/tex-srgb.c | 9 +++++----
src/gallium/tests/graw/tex-swizzle.c | 9 +++++----
src/gallium/tests/graw/tri-gs.c | 10 ++++++----
src/gallium/tests/graw/tri-instanced.c | 29 ++++++++++++++++-------------
src/gallium/tests/graw/tri.c | 9 +++++----
src/gallium/tests/graw/vs-test.c | 9 +++++----
16 files changed, 106 insertions(+), 73 deletions(-)
diff --git a/src/gallium/auxiliary/util/u_inlines.h b/src/gallium/auxiliary/util/u_inlines.h
index b0ba585..2ec1ccf 100644
--- a/src/gallium/auxiliary/util/u_inlines.h
+++ b/src/gallium/auxiliary/util/u_inlines.h
@@ -376,6 +376,19 @@ pipe_buffer_write_nooverlap(struct pipe_context *pipe,
0, 0);
}
+static INLINE struct pipe_resource *
+pipe_buffer_create_with_data(struct pipe_context *pipe,
+ unsigned bind,
+ unsigned usage,
+ unsigned size,
+ void *ptr)
+{
+ struct pipe_resource *res = pipe_buffer_create(pipe->screen,
+ bind, usage, size);
+ pipe_buffer_write_nooverlap(pipe, res, 0, size, ptr);
+ return res;
+}
+
static INLINE void
pipe_buffer_read(struct pipe_context *pipe,
struct pipe_resource *buf,
diff --git a/src/gallium/tests/graw/fs-fragcoord.c b/src/gallium/tests/graw/fs-fragcoord.c
index 471acbb..893170f 100644
--- a/src/gallium/tests/graw/fs-fragcoord.c
+++ b/src/gallium/tests/graw/fs-fragcoord.c
@@ -67,10 +67,11 @@ set_vertices(void)
vbuf.stride = sizeof(struct vertex);
vbuf.buffer_offset = 0;
- vbuf.buffer = info.screen->user_buffer_create(info.screen,
- vertices,
- sizeof(vertices),
- PIPE_BIND_VERTEX_BUFFER);
+ vbuf.buffer = pipe_buffer_create_with_data(info.ctx,
+ PIPE_BIND_VERTEX_BUFFER,
+ PIPE_USAGE_STATIC,
+ sizeof(vertices),
+ vertices);
info.ctx->set_vertex_buffers(info.ctx, 1, &vbuf);
}
diff --git a/src/gallium/tests/graw/fs-frontface.c b/src/gallium/tests/graw/fs-frontface.c
index e725255..d46ce55 100644
--- a/src/gallium/tests/graw/fs-frontface.c
+++ b/src/gallium/tests/graw/fs-frontface.c
@@ -89,10 +89,11 @@ set_vertices(void)
vbuf.stride = sizeof(struct vertex);
vbuf.buffer_offset = 0;
- vbuf.buffer = info.screen->user_buffer_create(info.screen,
- vertices,
- sizeof(vertices),
- PIPE_BIND_VERTEX_BUFFER);
+ vbuf.buffer = pipe_buffer_create_with_data(info.ctx,
+ PIPE_BIND_VERTEX_BUFFER,
+ PIPE_USAGE_STATIC,
+ sizeof(vertices),
+ vertices);
info.ctx->set_vertex_buffers(info.ctx, 1, &vbuf);
}
diff --git a/src/gallium/tests/graw/fs-test.c b/src/gallium/tests/graw/fs-test.c
index b42a86c..1c0d514 100644
--- a/src/gallium/tests/graw/fs-test.c
+++ b/src/gallium/tests/graw/fs-test.c
@@ -216,10 +216,11 @@ static void set_vertices( void )
vbuf.stride = sizeof( struct vertex );
vbuf.buffer_offset = 0;
- vbuf.buffer = screen->user_buffer_create(screen,
- vertices,
- sizeof(vertices),
- PIPE_BIND_VERTEX_BUFFER);
+ vbuf.buffer = pipe_buffer_create_with_data(ctx,
+ PIPE_BIND_VERTEX_BUFFER,
+ PIPE_USAGE_STATIC,
+ sizeof(vertices),
+ vertices);
ctx->set_vertex_buffers(ctx, 1, &vbuf);
}
diff --git a/src/gallium/tests/graw/fs-write-z.c b/src/gallium/tests/graw/fs-write-z.c
index 186e3ec..3eee2b2 100644
--- a/src/gallium/tests/graw/fs-write-z.c
+++ b/src/gallium/tests/graw/fs-write-z.c
@@ -93,10 +93,11 @@ set_vertices(void)
vbuf.stride = sizeof(struct vertex);
vbuf.buffer_offset = 0;
- vbuf.buffer = info.screen->user_buffer_create(info.screen,
- vertices,
- sizeof(vertices),
- PIPE_BIND_VERTEX_BUFFER);
+ vbuf.buffer = pipe_buffer_create_with_data(info.ctx,
+ PIPE_BIND_VERTEX_BUFFER,
+ PIPE_USAGE_STATIC,
+ sizeof(vertices),
+ vertices);
info.ctx->set_vertex_buffers(info.ctx, 1, &vbuf);
}
diff --git a/src/gallium/tests/graw/gs-test.c b/src/gallium/tests/graw/gs-test.c
index a471abd..52eb600 100644
--- a/src/gallium/tests/graw/gs-test.c
+++ b/src/gallium/tests/graw/gs-test.c
@@ -251,15 +251,17 @@ static void set_vertices( void )
vbuf.stride = sizeof( struct vertex );
vbuf.buffer_offset = 0;
if (draw_strip) {
- vbuf.buffer = screen->user_buffer_create(screen,
- vertices_strip,
- sizeof(vertices_strip),
- PIPE_BIND_VERTEX_BUFFER);
+ vbuf.buffer = pipe_buffer_create_with_data(ctx,
+ PIPE_BIND_VERTEX_BUFFER,
+ PIPE_USAGE_STATIC,
+ sizeof(vertices_strip),
+ vertices_strip);
} else {
- vbuf.buffer = screen->user_buffer_create(screen,
- vertices,
- sizeof(vertices),
- PIPE_BIND_VERTEX_BUFFER);
+ vbuf.buffer = pipe_buffer_create_with_data(ctx,
+ PIPE_BIND_VERTEX_BUFFER,
+ PIPE_USAGE_STATIC,
+ sizeof(vertices),
+ vertices);
}
ctx->set_vertex_buffers(ctx, 1, &vbuf);
diff --git a/src/gallium/tests/graw/occlusion-query.c b/src/gallium/tests/graw/occlusion-query.c
index 5c4bc8c..cfaba34 100644
--- a/src/gallium/tests/graw/occlusion-query.c
+++ b/src/gallium/tests/graw/occlusion-query.c
@@ -94,10 +94,11 @@ set_vertices(struct vertex *vertices, unsigned bytes)
vbuf.stride = sizeof(struct vertex);
vbuf.buffer_offset = 0;
- vbuf.buffer = info.screen->user_buffer_create(info.screen,
- vertices,
- bytes,
- PIPE_BIND_VERTEX_BUFFER);
+ vbuf.buffer = pipe_buffer_create_with_data(info.ctx,
+ PIPE_BIND_VERTEX_BUFFER,
+ PIPE_USAGE_STATIC,
+ bytes,
+ vertices);
info.ctx->set_vertex_buffers(info.ctx, 1, &vbuf);
}
diff --git a/src/gallium/tests/graw/quad-sample.c b/src/gallium/tests/graw/quad-sample.c
index 712ff51..4703b83 100644
--- a/src/gallium/tests/graw/quad-sample.c
+++ b/src/gallium/tests/graw/quad-sample.c
@@ -100,10 +100,11 @@ static void set_vertices( void )
vbuf.stride = sizeof( struct vertex );
vbuf.buffer_offset = 0;
- vbuf.buffer = screen->user_buffer_create(screen,
- vertices,
- sizeof(vertices),
- PIPE_BIND_VERTEX_BUFFER);
+ vbuf.buffer = pipe_buffer_create_with_data(ctx,
+ PIPE_BIND_VERTEX_BUFFER,
+ PIPE_USAGE_STATIC,
+ sizeof(vertices),
+ vertices);
ctx->set_vertex_buffers(ctx, 1, &vbuf);
}
diff --git a/src/gallium/tests/graw/quad-tex.c b/src/gallium/tests/graw/quad-tex.c
index 9f81ad5..dc3a737 100644
--- a/src/gallium/tests/graw/quad-tex.c
+++ b/src/gallium/tests/graw/quad-tex.c
@@ -56,10 +56,11 @@ static void set_vertices( void )
vbuf.stride = sizeof( struct vertex );
vbuf.buffer_offset = 0;
- vbuf.buffer = info.screen->user_buffer_create(info.screen,
- vertices,
- sizeof(vertices),
- PIPE_BIND_VERTEX_BUFFER);
+ vbuf.buffer = pipe_buffer_create_with_data(info.ctx,
+ PIPE_BIND_VERTEX_BUFFER,
+ PIPE_USAGE_STATIC,
+ sizeof(vertices),
+ vertices);
info.ctx->set_vertex_buffers(info.ctx, 1, &vbuf);
}
diff --git a/src/gallium/tests/graw/shader-leak.c b/src/gallium/tests/graw/shader-leak.c
index 103aa6d..f24490e 100644
--- a/src/gallium/tests/graw/shader-leak.c
+++ b/src/gallium/tests/graw/shader-leak.c
@@ -11,6 +11,7 @@
#include "util/u_memory.h" /* Offset() */
#include "util/u_draw_quad.h"
+#include "util/u_inlines.h"
static int num_iters = 100;
@@ -89,10 +90,11 @@ static void set_vertices( void )
vbuf.stride = sizeof(struct vertex);
vbuf.buffer_offset = 0;
- vbuf.buffer = screen->user_buffer_create(screen,
- vertices,
- sizeof(vertices),
- PIPE_BIND_VERTEX_BUFFER);
+ vbuf.buffer = pipe_buffer_create_with_data(ctx,
+ PIPE_BIND_VERTEX_BUFFER,
+ PIPE_USAGE_STATIC,
+ sizeof(vertices),
+ vertices);
ctx->set_vertex_buffers(ctx, 1, &vbuf);
}
diff --git a/src/gallium/tests/graw/tex-srgb.c b/src/gallium/tests/graw/tex-srgb.c
index 8eaf0bd..ea07b8d 100644
--- a/src/gallium/tests/graw/tex-srgb.c
+++ b/src/gallium/tests/graw/tex-srgb.c
@@ -72,10 +72,11 @@ set_vertices(struct vertex *verts, unsigned num_verts)
vbuf.stride = sizeof(struct vertex);
vbuf.buffer_offset = 0;
- vbuf.buffer = info.screen->user_buffer_create(info.screen,
- verts,
- num_verts *sizeof(struct vertex),
- PIPE_BIND_VERTEX_BUFFER);
+ vbuf.buffer = pipe_buffer_create_with_data(info.ctx,
+ PIPE_BIND_VERTEX_BUFFER,
+ PIPE_USAGE_STATIC,
+ num_verts * sizeof(struct vertex),
+ verts);
info.ctx->set_vertex_buffers(info.ctx, 1, &vbuf);
}
diff --git a/src/gallium/tests/graw/tex-swizzle.c b/src/gallium/tests/graw/tex-swizzle.c
index 80a9608..0709447 100644
--- a/src/gallium/tests/graw/tex-swizzle.c
+++ b/src/gallium/tests/graw/tex-swizzle.c
@@ -54,10 +54,11 @@ static void set_vertices(void)
vbuf.stride = sizeof(struct vertex);
vbuf.buffer_offset = 0;
- vbuf.buffer = info.screen->user_buffer_create(info.screen,
- vertices,
- sizeof(vertices),
- PIPE_BIND_VERTEX_BUFFER);
+ vbuf.buffer = pipe_buffer_create_with_data(info.ctx,
+ PIPE_BIND_VERTEX_BUFFER,
+ PIPE_USAGE_STATIC,
+ sizeof(vertices),
+ vertices);
info.ctx->set_vertex_buffers(info.ctx, 1, &vbuf);
}
diff --git a/src/gallium/tests/graw/tri-gs.c b/src/gallium/tests/graw/tri-gs.c
index 7332631..7406fbc 100644
--- a/src/gallium/tests/graw/tri-gs.c
+++ b/src/gallium/tests/graw/tri-gs.c
@@ -11,6 +11,7 @@
#include "util/u_memory.h" /* Offset() */
#include "util/u_draw_quad.h"
+#include "util/u_inlines.h"
enum pipe_format formats[] = {
PIPE_FORMAT_R8G8B8A8_UNORM,
@@ -90,10 +91,11 @@ static void set_vertices( void )
vbuf.stride = sizeof( struct vertex );
vbuf.buffer_offset = 0;
- vbuf.buffer = screen->user_buffer_create(screen,
- vertices,
- sizeof(vertices),
- PIPE_BIND_VERTEX_BUFFER);
+ vbuf.buffer = pipe_buffer_create_with_data(ctx,
+ PIPE_BIND_VERTEX_BUFFER,
+ PIPE_USAGE_STATIC,
+ sizeof(vertices),
+ vertices);
ctx->set_vertex_buffers(ctx, 1, &vbuf);
}
diff --git a/src/gallium/tests/graw/tri-instanced.c b/src/gallium/tests/graw/tri-instanced.c
index 8373815..d3de15c 100644
--- a/src/gallium/tests/graw/tri-instanced.c
+++ b/src/gallium/tests/graw/tri-instanced.c
@@ -13,6 +13,7 @@
#include "util/u_memory.h" /* Offset() */
#include "util/u_draw_quad.h"
+#include "util/u_inlines.h"
enum pipe_format formats[] = {
@@ -133,27 +134,29 @@ static void set_vertices( void )
/* vertex data */
vbuf[0].stride = sizeof( struct vertex );
vbuf[0].buffer_offset = 0;
- vbuf[0].buffer = screen->user_buffer_create(screen,
- vertices,
- sizeof(vertices),
- PIPE_BIND_VERTEX_BUFFER);
+ vbuf[0].buffer = pipe_buffer_create_with_data(ctx,
+ PIPE_BIND_VERTEX_BUFFER,
+ PIPE_USAGE_STATIC,
+ sizeof(vertices),
+ vertices);
/* instance data */
vbuf[1].stride = sizeof( inst_data[0] );
vbuf[1].buffer_offset = 0;
- vbuf[1].buffer = screen->user_buffer_create(screen,
- inst_data,
- sizeof(inst_data),
- PIPE_BIND_VERTEX_BUFFER);
-
+ vbuf[1].buffer = pipe_buffer_create_with_data(ctx,
+ PIPE_BIND_VERTEX_BUFFER,
+ PIPE_USAGE_STATIC,
+ sizeof(inst_data),
+ inst_data);
ctx->set_vertex_buffers(ctx, 2, vbuf);
/* index data */
- ibuf.buffer = screen->user_buffer_create(screen,
- indices,
- sizeof(indices),
- PIPE_BIND_VERTEX_BUFFER);
+ ibuf.buffer = pipe_buffer_create_with_data(ctx,
+ PIPE_BIND_INDEX_BUFFER,
+ PIPE_USAGE_STATIC,
+ sizeof(indices),
+ indices);
ibuf.offset = 0;
ibuf.index_size = 2;
diff --git a/src/gallium/tests/graw/tri.c b/src/gallium/tests/graw/tri.c
index 75fa88c..f6b2aa9 100644
--- a/src/gallium/tests/graw/tri.c
+++ b/src/gallium/tests/graw/tri.c
@@ -55,10 +55,11 @@ static void set_vertices( void )
vbuf.stride = sizeof( struct vertex );
vbuf.buffer_offset = 0;
- vbuf.buffer = info.screen->user_buffer_create(info.screen,
- vertices,
- sizeof(vertices),
- PIPE_BIND_VERTEX_BUFFER);
+ vbuf.buffer = pipe_buffer_create_with_data(info.ctx,
+ PIPE_BIND_VERTEX_BUFFER,
+ PIPE_USAGE_STATIC,
+ sizeof(vertices),
+ vertices);
info.ctx->set_vertex_buffers(info.ctx, 1, &vbuf);
}
diff --git a/src/gallium/tests/graw/vs-test.c b/src/gallium/tests/graw/vs-test.c
index 23b7ada..ad524c4 100644
--- a/src/gallium/tests/graw/vs-test.c
+++ b/src/gallium/tests/graw/vs-test.c
@@ -172,10 +172,11 @@ static void set_vertices( void )
vbuf.stride = sizeof( struct vertex );
vbuf.buffer_offset = 0;
- vbuf.buffer = screen->user_buffer_create(screen,
- vertices,
- sizeof(vertices),
- PIPE_BIND_VERTEX_BUFFER);
+ vbuf.buffer = pipe_buffer_create_with_data(ctx,
+ PIPE_BIND_VERTEX_BUFFER,
+ PIPE_USAGE_STATIC,
+ sizeof(vertices),
+ vertices);
ctx->set_vertex_buffers(ctx, 1, &vbuf);
}
More information about the mesa-commit
mailing list