gallium: add usage parameter to pipe_buffer_create
And set a reasonable buffer usage flag everywhere instead of just PIPE_USAGE_DEFAULT.
This commit is contained in:
parent
82a9794a35
commit
eafb7f234d
|
@ -199,6 +199,7 @@ get_next_slot( struct blit_state *ctx )
|
||||||
if (!ctx->vbuf) {
|
if (!ctx->vbuf) {
|
||||||
ctx->vbuf = pipe_buffer_create(ctx->pipe->screen,
|
ctx->vbuf = pipe_buffer_create(ctx->pipe->screen,
|
||||||
PIPE_BIND_VERTEX_BUFFER,
|
PIPE_BIND_VERTEX_BUFFER,
|
||||||
|
PIPE_USAGE_STREAM,
|
||||||
max_slots * sizeof ctx->vertices);
|
max_slots * sizeof ctx->vertices);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1350,6 +1350,7 @@ get_next_slot(struct gen_mipmap_state *ctx)
|
||||||
if (!ctx->vbuf) {
|
if (!ctx->vbuf) {
|
||||||
ctx->vbuf = pipe_buffer_create(ctx->pipe->screen,
|
ctx->vbuf = pipe_buffer_create(ctx->pipe->screen,
|
||||||
PIPE_BIND_VERTEX_BUFFER,
|
PIPE_BIND_VERTEX_BUFFER,
|
||||||
|
PIPE_USAGE_STREAM,
|
||||||
max_slots * sizeof ctx->vertices);
|
max_slots * sizeof ctx->vertices);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -65,6 +65,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,
|
||||||
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,
|
||||||
|
@ -116,6 +117,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,
|
||||||
2 * count);
|
2 * count);
|
||||||
|
|
||||||
out_map = pipe_buffer_map(context, new_elts,
|
out_map = pipe_buffer_map(context, new_elts,
|
||||||
|
@ -167,6 +169,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,
|
||||||
2 * count);
|
2 * count);
|
||||||
|
|
||||||
out_map = pipe_buffer_map(context, new_elts,
|
out_map = pipe_buffer_map(context, new_elts,
|
||||||
|
|
|
@ -182,6 +182,7 @@ pipe_surface_equal(struct pipe_surface *s1, struct pipe_surface *s2)
|
||||||
static INLINE struct pipe_resource *
|
static INLINE struct pipe_resource *
|
||||||
pipe_buffer_create( struct pipe_screen *screen,
|
pipe_buffer_create( struct pipe_screen *screen,
|
||||||
unsigned bind,
|
unsigned bind,
|
||||||
|
unsigned usage,
|
||||||
unsigned size )
|
unsigned size )
|
||||||
{
|
{
|
||||||
struct pipe_resource buffer;
|
struct pipe_resource buffer;
|
||||||
|
@ -189,7 +190,7 @@ pipe_buffer_create( struct pipe_screen *screen,
|
||||||
buffer.target = PIPE_BUFFER;
|
buffer.target = PIPE_BUFFER;
|
||||||
buffer.format = PIPE_FORMAT_R8_UNORM; /* want TYPELESS or similar */
|
buffer.format = PIPE_FORMAT_R8_UNORM; /* want TYPELESS or similar */
|
||||||
buffer.bind = bind;
|
buffer.bind = bind;
|
||||||
buffer.usage = PIPE_USAGE_DEFAULT;
|
buffer.usage = usage;
|
||||||
buffer.flags = 0;
|
buffer.flags = 0;
|
||||||
buffer.width0 = size;
|
buffer.width0 = size;
|
||||||
buffer.height0 = 1;
|
buffer.height0 = 1;
|
||||||
|
|
|
@ -121,6 +121,7 @@ u_upload_alloc_buffer( struct u_upload_mgr *upload,
|
||||||
|
|
||||||
upload->buffer = pipe_buffer_create( upload->pipe->screen,
|
upload->buffer = pipe_buffer_create( upload->pipe->screen,
|
||||||
upload->bind,
|
upload->bind,
|
||||||
|
PIPE_USAGE_STREAM,
|
||||||
size );
|
size );
|
||||||
if (upload->buffer == NULL)
|
if (upload->buffer == NULL)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
|
@ -931,6 +931,7 @@ static boolean r300_render_allocate_vertices(struct vbuf_render* render,
|
||||||
pipe_resource_reference(&r300->vbo, NULL);
|
pipe_resource_reference(&r300->vbo, NULL);
|
||||||
r300->vbo = pipe_buffer_create(screen,
|
r300->vbo = pipe_buffer_create(screen,
|
||||||
PIPE_BIND_VERTEX_BUFFER,
|
PIPE_BIND_VERTEX_BUFFER,
|
||||||
|
PIPE_USAGE_STREAM,
|
||||||
R300_MAX_DRAW_VBO_SIZE);
|
R300_MAX_DRAW_VBO_SIZE);
|
||||||
r300->draw_vbo_offset = 0;
|
r300->draw_vbo_offset = 0;
|
||||||
r300->draw_vbo_size = R300_MAX_DRAW_VBO_SIZE;
|
r300->draw_vbo_size = R300_MAX_DRAW_VBO_SIZE;
|
||||||
|
|
|
@ -53,6 +53,7 @@ static enum pipe_error generate_indices( struct svga_hwtnl *hwtnl,
|
||||||
|
|
||||||
dst = pipe_buffer_create( pipe->screen,
|
dst = pipe_buffer_create( pipe->screen,
|
||||||
PIPE_BIND_INDEX_BUFFER,
|
PIPE_BIND_INDEX_BUFFER,
|
||||||
|
PIPE_USAGE_STATIC,
|
||||||
size );
|
size );
|
||||||
if (dst == NULL)
|
if (dst == NULL)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
|
@ -56,6 +56,7 @@ translate_indices( struct svga_hwtnl *hwtnl,
|
||||||
|
|
||||||
dst = pipe_buffer_create( pipe->screen,
|
dst = pipe_buffer_create( pipe->screen,
|
||||||
PIPE_BIND_INDEX_BUFFER,
|
PIPE_BIND_INDEX_BUFFER,
|
||||||
|
PIPE_USAGE_STATIC,
|
||||||
size );
|
size );
|
||||||
if (dst == NULL)
|
if (dst == NULL)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
|
@ -87,12 +87,14 @@ svga_vbuf_render_allocate_vertices( struct vbuf_render *render,
|
||||||
svga_render->vbuf_size = MAX2(size, svga_render->vbuf_alloc_size);
|
svga_render->vbuf_size = MAX2(size, svga_render->vbuf_alloc_size);
|
||||||
svga_render->vbuf = pipe_buffer_create(screen,
|
svga_render->vbuf = pipe_buffer_create(screen,
|
||||||
PIPE_BIND_VERTEX_BUFFER,
|
PIPE_BIND_VERTEX_BUFFER,
|
||||||
|
PIPE_USAGE_STREAM,
|
||||||
svga_render->vbuf_size);
|
svga_render->vbuf_size);
|
||||||
if(!svga_render->vbuf) {
|
if(!svga_render->vbuf) {
|
||||||
svga_context_flush(svga, NULL);
|
svga_context_flush(svga, NULL);
|
||||||
assert(!svga_render->vbuf);
|
assert(!svga_render->vbuf);
|
||||||
svga_render->vbuf = pipe_buffer_create(screen,
|
svga_render->vbuf = pipe_buffer_create(screen,
|
||||||
PIPE_BIND_VERTEX_BUFFER,
|
PIPE_BIND_VERTEX_BUFFER,
|
||||||
|
PIPE_USAGE_STREAM,
|
||||||
svga_render->vbuf_size);
|
svga_render->vbuf_size);
|
||||||
assert(svga_render->vbuf);
|
assert(svga_render->vbuf);
|
||||||
}
|
}
|
||||||
|
@ -262,6 +264,7 @@ svga_vbuf_render_draw_elements( struct vbuf_render *render,
|
||||||
svga_render->ibuf_size = MAX2(size, svga_render->ibuf_alloc_size);
|
svga_render->ibuf_size = MAX2(size, svga_render->ibuf_alloc_size);
|
||||||
svga_render->ibuf = pipe_buffer_create(screen,
|
svga_render->ibuf = pipe_buffer_create(screen,
|
||||||
PIPE_BIND_INDEX_BUFFER,
|
PIPE_BIND_INDEX_BUFFER,
|
||||||
|
PIPE_USAGE_STREAM,
|
||||||
svga_render->ibuf_size);
|
svga_render->ibuf_size);
|
||||||
svga_render->ibuf_offset = 0;
|
svga_render->ibuf_offset = 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -794,7 +794,8 @@ struct dxgi_blitter
|
||||||
const unsigned semantic_indices[] = { 0, 0 };
|
const unsigned semantic_indices[] = { 0, 0 };
|
||||||
vs = util_make_vertex_passthrough_shader(pipe, 2, semantic_names, semantic_indices);
|
vs = util_make_vertex_passthrough_shader(pipe, 2, semantic_names, semantic_indices);
|
||||||
|
|
||||||
vbuf.buffer = pipe_buffer_create(pipe->screen, PIPE_BIND_VERTEX_BUFFER, sizeof(quad_data));
|
vbuf.buffer = pipe_buffer_create(pipe->screen, PIPE_BIND_VERTEX_BUFFER,
|
||||||
|
PIPE_USAGE_STREAM, sizeof(quad_data));
|
||||||
vbuf.buffer_offset = 0;
|
vbuf.buffer_offset = 0;
|
||||||
vbuf.stride = 4 * sizeof(float);
|
vbuf.stride = 4 * sizeof(float);
|
||||||
pipe_buffer_write(pipe, vbuf.buffer, 0, sizeof(quad_data), quad_data);
|
pipe_buffer_write(pipe, vbuf.buffer, 0, sizeof(quad_data), quad_data);
|
||||||
|
|
|
@ -174,6 +174,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,
|
||||||
sizeof(consts));
|
sizeof(consts));
|
||||||
if (cbuf) {
|
if (cbuf) {
|
||||||
pipe_buffer_write(renderer->pipe, cbuf,
|
pipe_buffer_write(renderer->pipe, cbuf,
|
||||||
|
@ -474,7 +475,8 @@ 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, const_buffer_len);
|
PIPE_BIND_CONSTANT_BUFFER, PIPE_USAGE_STATIC,
|
||||||
|
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);
|
||||||
renderer->pipe->set_constant_buffer(renderer->pipe,
|
renderer->pipe->set_constant_buffer(renderer->pipe,
|
||||||
|
|
|
@ -429,6 +429,7 @@ void renderer_set_constants(struct xorg_renderer *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_BIND_CONSTANT_BUFFER,
|
||||||
|
PIPE_USAGE_STATIC,
|
||||||
param_bytes);
|
param_bytes);
|
||||||
|
|
||||||
if (*cbuf) {
|
if (*cbuf) {
|
||||||
|
|
|
@ -129,7 +129,8 @@ static void init_prog(struct program *p)
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
p->vbuf = pipe_buffer_create(p->screen, PIPE_BIND_VERTEX_BUFFER, sizeof(vertices));
|
p->vbuf = pipe_buffer_create(p->screen, PIPE_BIND_VERTEX_BUFFER,
|
||||||
|
PIPE_USAGE_STATIC, sizeof(vertices));
|
||||||
pipe_buffer_write(p->pipe, p->vbuf, 0, sizeof(vertices), vertices);
|
pipe_buffer_write(p->pipe, p->vbuf, 0, sizeof(vertices), vertices);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -120,7 +120,8 @@ static void init_prog(struct program *p)
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
p->vbuf = pipe_buffer_create(p->screen, PIPE_BIND_VERTEX_BUFFER, sizeof(vertices));
|
p->vbuf = pipe_buffer_create(p->screen, PIPE_BIND_VERTEX_BUFFER,
|
||||||
|
PIPE_USAGE_STATIC, sizeof(vertices));
|
||||||
pipe_buffer_write(p->pipe, p->vbuf, 0, sizeof(vertices), vertices);
|
pipe_buffer_write(p->pipe, p->vbuf, 0, sizeof(vertices), vertices);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -349,6 +349,7 @@ setup_bitmap_vertex_data(struct st_context *st, bool normalized,
|
||||||
if (!st->bitmap.vbuf) {
|
if (!st->bitmap.vbuf) {
|
||||||
st->bitmap.vbuf = pipe_buffer_create(pipe->screen,
|
st->bitmap.vbuf = pipe_buffer_create(pipe->screen,
|
||||||
PIPE_BIND_VERTEX_BUFFER,
|
PIPE_BIND_VERTEX_BUFFER,
|
||||||
|
PIPE_USAGE_STREAM,
|
||||||
max_slots *
|
max_slots *
|
||||||
sizeof(st->bitmap.vertices));
|
sizeof(st->bitmap.vertices));
|
||||||
}
|
}
|
||||||
|
|
|
@ -171,7 +171,7 @@ st_bufferobj_data(struct gl_context *ctx,
|
||||||
struct st_context *st = st_context(ctx);
|
struct st_context *st = st_context(ctx);
|
||||||
struct pipe_context *pipe = st->pipe;
|
struct pipe_context *pipe = st->pipe;
|
||||||
struct st_buffer_object *st_obj = st_buffer_object(obj);
|
struct st_buffer_object *st_obj = st_buffer_object(obj);
|
||||||
unsigned buffer_usage;
|
unsigned bind, pipe_usage;
|
||||||
|
|
||||||
st_obj->Base.Size = size;
|
st_obj->Base.Size = size;
|
||||||
st_obj->Base.Usage = usage;
|
st_obj->Base.Usage = usage;
|
||||||
|
@ -179,22 +179,43 @@ st_bufferobj_data(struct gl_context *ctx,
|
||||||
switch(target) {
|
switch(target) {
|
||||||
case GL_PIXEL_PACK_BUFFER_ARB:
|
case GL_PIXEL_PACK_BUFFER_ARB:
|
||||||
case GL_PIXEL_UNPACK_BUFFER_ARB:
|
case GL_PIXEL_UNPACK_BUFFER_ARB:
|
||||||
buffer_usage = PIPE_BIND_RENDER_TARGET;
|
bind = PIPE_BIND_RENDER_TARGET | PIPE_BIND_SAMPLER_VIEW;
|
||||||
break;
|
break;
|
||||||
case GL_ARRAY_BUFFER_ARB:
|
case GL_ARRAY_BUFFER_ARB:
|
||||||
buffer_usage = PIPE_BIND_VERTEX_BUFFER;
|
bind = PIPE_BIND_VERTEX_BUFFER;
|
||||||
break;
|
break;
|
||||||
case GL_ELEMENT_ARRAY_BUFFER_ARB:
|
case GL_ELEMENT_ARRAY_BUFFER_ARB:
|
||||||
buffer_usage = PIPE_BIND_INDEX_BUFFER;
|
bind = PIPE_BIND_INDEX_BUFFER;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
buffer_usage = 0;
|
bind = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (usage) {
|
||||||
|
case GL_STATIC_DRAW:
|
||||||
|
case GL_STATIC_READ:
|
||||||
|
case GL_STATIC_COPY:
|
||||||
|
pipe_usage = PIPE_USAGE_STATIC;
|
||||||
|
break;
|
||||||
|
case GL_DYNAMIC_DRAW:
|
||||||
|
case GL_DYNAMIC_READ:
|
||||||
|
case GL_DYNAMIC_COPY:
|
||||||
|
pipe_usage = PIPE_USAGE_DYNAMIC;
|
||||||
|
break;
|
||||||
|
case GL_STREAM_DRAW:
|
||||||
|
case GL_STREAM_READ:
|
||||||
|
case GL_STREAM_COPY:
|
||||||
|
pipe_usage = PIPE_USAGE_STREAM;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
pipe_usage = PIPE_USAGE_DEFAULT;
|
||||||
}
|
}
|
||||||
|
|
||||||
pipe_resource_reference( &st_obj->buffer, NULL );
|
pipe_resource_reference( &st_obj->buffer, NULL );
|
||||||
|
|
||||||
if (size != 0) {
|
if (size != 0) {
|
||||||
st_obj->buffer = pipe_buffer_create(pipe->screen, buffer_usage, size);
|
st_obj->buffer = pipe_buffer_create(pipe->screen, bind,
|
||||||
|
pipe_usage, size);
|
||||||
|
|
||||||
if (!st_obj->buffer) {
|
if (!st_obj->buffer) {
|
||||||
return GL_FALSE;
|
return GL_FALSE;
|
||||||
|
|
|
@ -138,6 +138,7 @@ draw_quad(struct st_context *st,
|
||||||
if (!st->clear.vbuf) {
|
if (!st->clear.vbuf) {
|
||||||
st->clear.vbuf = pipe_buffer_create(pipe->screen,
|
st->clear.vbuf = pipe_buffer_create(pipe->screen,
|
||||||
PIPE_BIND_VERTEX_BUFFER,
|
PIPE_BIND_VERTEX_BUFFER,
|
||||||
|
PIPE_USAGE_STREAM,
|
||||||
max_slots * sizeof(st->clear.vertices));
|
max_slots * sizeof(st->clear.vertices));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -522,6 +522,7 @@ draw_quad(struct gl_context *ctx, GLfloat x0, GLfloat y0, GLfloat z,
|
||||||
/* allocate/load buffer object with vertex data */
|
/* allocate/load buffer object with vertex data */
|
||||||
buf = pipe_buffer_create(pipe->screen,
|
buf = pipe_buffer_create(pipe->screen,
|
||||||
PIPE_BIND_VERTEX_BUFFER,
|
PIPE_BIND_VERTEX_BUFFER,
|
||||||
|
PIPE_USAGE_STATIC,
|
||||||
sizeof(verts));
|
sizeof(verts));
|
||||||
pipe_buffer_write(st->pipe, buf, 0, sizeof(verts), verts);
|
pipe_buffer_write(st->pipe, buf, 0, sizeof(verts), verts);
|
||||||
|
|
||||||
|
|
|
@ -139,6 +139,7 @@ st_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
|
||||||
|
|
||||||
/* create the vertex buffer */
|
/* create the vertex buffer */
|
||||||
vbuffer = pipe_buffer_create(pipe->screen, PIPE_BIND_VERTEX_BUFFER,
|
vbuffer = pipe_buffer_create(pipe->screen, PIPE_BIND_VERTEX_BUFFER,
|
||||||
|
PIPE_USAGE_STREAM,
|
||||||
numAttribs * 4 * 4 * sizeof(GLfloat));
|
numAttribs * 4 * 4 * sizeof(GLfloat));
|
||||||
|
|
||||||
/* load vertex buffer */
|
/* load vertex buffer */
|
||||||
|
|
Loading…
Reference in New Issue