Module Name: xsrc
Committed By: mrg
Date: Fri Jul 11 20:12:52 UTC 2014
Modified Files:
xsrc/external/mit/libdrm/dist/radeon: radeon_surface.c
Log Message:
reduce diffs to upstream
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/libdrm/dist/radeon/radeon_surface.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libdrm/dist/radeon/radeon_surface.c
diff -u xsrc/external/mit/libdrm/dist/radeon/radeon_surface.c:1.3 xsrc/external/mit/libdrm/dist/radeon/radeon_surface.c:1.4
--- xsrc/external/mit/libdrm/dist/radeon/radeon_surface.c:1.3 Fri Jul 11 19:57:33 2014
+++ xsrc/external/mit/libdrm/dist/radeon/radeon_surface.c Fri Jul 11 20:12:52 2014
@@ -282,7 +282,7 @@ static int r6_surface_init_linear(struct
surf_minify(surf, surf->level+i, surf->bpe, i, xalign, yalign, zalign, offset);
/* level0 and first mipmap need to have alignment */
offset = surf->bo_size;
- if (i == 0) {
+ if ((i == 0)) {
offset = ALIGN(offset, surf->bo_alignment);
}
}
@@ -310,7 +310,7 @@ static int r6_surface_init_linear_aligne
surf_minify(surf, surf->level+i, surf->bpe, i, xalign, yalign, zalign, offset);
/* level0 and first mipmap need to have alignment */
offset = surf->bo_size;
- if (i == 0) {
+ if ((i == 0)) {
offset = ALIGN(offset, surf->bo_alignment);
}
}
@@ -343,7 +343,7 @@ static int r6_surface_init_1d(struct rad
surf_minify(surf, surf->level+i, surf->bpe, i, xalign, yalign, zalign, offset);
/* level0 and first mipmap need to have alignment */
offset = surf->bo_size;
- if (i == 0) {
+ if ((i == 0)) {
offset = ALIGN(offset, surf->bo_alignment);
}
}
@@ -384,7 +384,7 @@ static int r6_surface_init_2d(struct rad
}
/* level0 and first mipmap need to have alignment */
offset = surf->bo_size;
- if (i == 0) {
+ if ((i == 0)) {
offset = ALIGN(offset, surf->bo_alignment);
}
}
@@ -632,7 +632,7 @@ static int eg_surface_init_1d(struct rad
surf_minify(surf, level+i, bpe, i, xalign, yalign, zalign, offset);
/* level0 and first mipmap need to have alignment */
offset = surf->bo_size;
- if (i == 0) {
+ if ((i == 0)) {
offset = ALIGN(offset, surf->bo_alignment);
}
}
@@ -685,7 +685,7 @@ static int eg_surface_init_2d(struct rad
}
/* level0 and first mipmap need to have alignment */
offset = surf->bo_size;
- if (i == 0) {
+ if ((i == 0)) {
offset = ALIGN(offset, surf->bo_alignment);
}
}
@@ -1524,7 +1524,7 @@ static int si_surface_init_linear_aligne
si_surf_minify(surf, surf->level+i, surf->bpe, i, xalign, yalign, zalign, slice_align, offset);
/* level0 and first mipmap need to have alignment */
offset = surf->bo_size;
- if (i == 0) {
+ if ((i == 0)) {
offset = ALIGN(offset, surf->bo_alignment);
}
if (surf->flags & RADEON_SURF_HAS_TILE_MODE_INDEX) {
@@ -1567,7 +1567,7 @@ static int si_surface_init_1d(struct rad
si_surf_minify(surf, level+i, bpe, i, xalign, yalign, zalign, slice_align, offset);
/* level0 and first mipmap need to have alignment */
offset = surf->bo_size;
- if (i == 0) {
+ if ((i == 0)) {
offset = ALIGN(offset, alignment);
}
if (surf->flags & RADEON_SURF_HAS_TILE_MODE_INDEX) {
@@ -1669,7 +1669,7 @@ static int si_surface_init_2d(struct rad
}
/* level0 and first mipmap need to have alignment */
aligned_offset = offset = surf->bo_size;
- if (i == 0) {
+ if ((i == 0)) {
aligned_offset = ALIGN(aligned_offset, surf->bo_alignment);
}
if (surf->flags & RADEON_SURF_HAS_TILE_MODE_INDEX) {
