summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/i915/i915_resource_texture.c
diff options
context:
space:
mode:
authorJakob Bornecrantz <wallbraker@gmail.com>2010-04-12 22:06:48 +0100
committerJakob Bornecrantz <wallbraker@gmail.com>2010-04-13 23:57:43 +0100
commit4e20781bac9d2c39ce8aa168950e2081014f1774 (patch)
tree33e3d70c146e611417f6354234d03cd74103d187 /src/gallium/drivers/i915/i915_resource_texture.c
parent136bcf6ceeebaa8da561bee789fa79d8e010195e (diff)
i915g: Whitespace & formating
Diffstat (limited to 'src/gallium/drivers/i915/i915_resource_texture.c')
-rw-r--r--src/gallium/drivers/i915/i915_resource_texture.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/src/gallium/drivers/i915/i915_resource_texture.c b/src/gallium/drivers/i915/i915_resource_texture.c
index 92ba3ddb81..144671228d 100644
--- a/src/gallium/drivers/i915/i915_resource_texture.c
+++ b/src/gallium/drivers/i915/i915_resource_texture.c
@@ -92,9 +92,9 @@ power_of_two(unsigned x)
static void
i915_texture_set_level_info(struct i915_texture *tex,
- unsigned level,
- unsigned nr_images,
- unsigned w, unsigned h, unsigned d)
+ unsigned level,
+ unsigned nr_images,
+ unsigned w, unsigned h, unsigned d)
{
assert(level < Elements(tex->nr_images));
@@ -425,8 +425,7 @@ i945_texture_layout_2d(struct i915_texture *tex)
*/
if (level == 1) {
x += align(nblocksx, align_x);
- }
- else {
+ } else {
y += nblocksy;
}
@@ -696,19 +695,16 @@ i915_texture_transfer_map(struct pipe_context *pipe,
if (resource->target == PIPE_TEXTURE_CUBE) {
offset = tex->image_offset[sr.level][sr.face];
- }
- else if (resource->target == PIPE_TEXTURE_3D) {
+ } else if (resource->target == PIPE_TEXTURE_3D) {
offset = tex->image_offset[sr.level][box->z];
- }
- else {
+ } else {
offset = tex->image_offset[sr.level][0];
assert(sr.face == 0);
assert(box->z == 0);
}
- map = iws->buffer_map(iws,
- tex->buffer,
- (transfer->usage & PIPE_TRANSFER_WRITE) ? TRUE : FALSE);
+ map = iws->buffer_map(iws, tex->buffer,
+ (transfer->usage & PIPE_TRANSFER_WRITE) ? TRUE : FALSE);
if (map == NULL)
return NULL;