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

i965/upload: Refactor open-coded ALIGN-like computations. 

Sadly, we can't use actual ALIGN(), since that only supports
power-of-two values for the alignment parameter.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Kenneth Graunke 2014-03-02 23:09:20 -08:00
parent b8b4e280b4
commit 91f4528da6
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mesa/drivers/dri/i965/intel_upload.c
View File

@ -45,6 +45,12 @@
#define INTEL_UPLOAD_SIZE (64*1024)
/**
* Like ALIGN(), but works with a non-power-of-two alignment.
*/
#define ALIGN_NPOT(value, alignment) \
(((value) + (alignment) - 1) / (alignment) * (alignment))
void
intel_upload_finish(struct brw_context *brw)
{
@ -83,7 +89,7 @@ intel_upload_data(struct brw_context *brw,
{
GLuint base, delta;
base = (brw->upload.offset + align - 1) / align * align;
base = ALIGN_NPOT(brw->upload.offset, align);
if (brw->upload.bo == NULL || base + size > brw->upload.bo->size) {
wrap_buffers(brw, size);
base = 0;
@ -124,7 +130,7 @@ intel_upload_map(struct brw_context *brw, GLuint size, GLuint align)
GLuint base, delta;
char *ptr;
base = (brw->upload.offset + align - 1) / align * align;
base = ALIGN_NPOT(brw->upload.offset, align);
if (brw->upload.bo == NULL || base + size > brw->upload.bo->size) {
wrap_buffers(brw, size);
base = 0;
@ -163,7 +169,7 @@ intel_upload_unmap(struct brw_context *brw,
{
GLuint base;
base = (brw->upload.offset + align - 1) / align * align;
base = ALIGN_NPOT(brw->upload.offset, align);
if (size > sizeof(brw->upload.buffer)) {
drm_intel_bo_subdata(brw->upload.bo, base, size, ptr);
free((void*)ptr);