AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ilo: align vertex buffer size in buf_create()

Browse Source 
With ilo_format.[ch] moved out of core, the aligning of vertex buffers does
not belong to core anymore.
This commit is contained in:
Chia-I Wu
2015-06-22 14:15:52 +08:00
parent 513bc5d90b
commit 58f95b332d
2 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/ilo/core/ilo_buffer.h
-17
View File
@@ -59,23 +59,6 @@ ilo_buffer_init(struct ilo_buffer *buf, const struct ilo_dev *dev,
*/
if (bind & PIPE_BIND_SAMPLER_VIEW)
buf->bo_size = align(buf->bo_size, 256) + 16;
if ((bind & PIPE_BIND_VERTEX_BUFFER) && ilo_dev_gen(dev) < ILO_GEN(7.5)) {
/*
* As noted in ilo_format_translate(), we treat some 3-component formats
* as 4-component formats to work around hardware limitations. Imagine
* the case where the vertex buffer holds a single
* PIPE_FORMAT_R16G16B16_FLOAT vertex, and buf->bo_size is 6. The
* hardware would fail to fetch it at boundary check because the vertex
* buffer is expected to hold a PIPE_FORMAT_R16G16B16A16_FLOAT vertex
* and that takes at least 8 bytes.
*
* For the workaround to work, we should add 2 to the bo size. But that
* would waste a page when the bo size is already page aligned. Let's
* round it to page size for now and revisit this when needed.
*/
buf->bo_size = align(buf->bo_size, 4096);
}
}
#endif /* ILO_BUFFER_H */
src/gallium/drivers/ilo/ilo_resource.c
+20 -2
View File
@@ -443,6 +443,7 @@ buf_create(struct pipe_screen *screen, const struct pipe_resource *templ)
{
const struct ilo_screen *is = ilo_screen(screen);
struct ilo_buffer_resource *buf;
unsigned size;
buf = CALLOC_STRUCT(ilo_buffer_resource);
if (!buf)
@@ -452,8 +453,25 @@ buf_create(struct pipe_screen *screen, const struct pipe_resource *templ)
buf->base.screen = screen;
pipe_reference_init(&buf->base.reference, 1);
ilo_buffer_init(&buf->buffer, &is->dev,
templ->width0, templ->bind, templ->flags);
size = templ->width0;
/*
* As noted in ilo_format_translate(), we treat some 3-component formats as
* 4-component formats to work around hardware limitations. Imagine the
* case where the vertex buffer holds a single PIPE_FORMAT_R16G16B16_FLOAT
* vertex, and buf->bo_size is 6. The hardware would fail to fetch it at
* boundary check because the vertex buffer is expected to hold a
* PIPE_FORMAT_R16G16B16A16_FLOAT vertex and that takes at least 8 bytes.
*
* For the workaround to work, we should add 2 to the bo size. But that
* would waste a page when the bo size is already page aligned. Let's
* round it to page size for now and revisit this when needed.
*/
if ((templ->bind & PIPE_BIND_VERTEX_BUFFER) &&
ilo_dev_gen(&is->dev) < ILO_GEN(7.5))
size = align(size, 4096);
ilo_buffer_init(&buf->buffer, &is->dev, size, templ->bind, templ->flags);
if (buf->buffer.bo_size < templ->width0 ||
buf->buffer.bo_size > ilo_max_resource_size ||