summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/i915/i915_resource.h6
-rw-r--r--src/gallium/drivers/i915/i915_resource_texture.c20
2 files changed, 11 insertions, 15 deletions
diff --git a/src/gallium/drivers/i915/i915_resource.h b/src/gallium/drivers/i915/i915_resource.h
index e5951395845..1093e8f41f9 100644
--- a/src/gallium/drivers/i915/i915_resource.h
+++ b/src/gallium/drivers/i915/i915_resource.h
@@ -72,19 +72,19 @@ struct i915_texture {
};
void i915_init_screen_resource_functions(struct i915_screen *is);
-void i915_init_resource_functions(struct i915_context *i915 );
+void i915_init_resource_functions(struct i915_context *i915);
extern struct u_resource_vtbl i915_buffer_vtbl;
extern struct u_resource_vtbl i915_texture_vtbl;
-static INLINE struct i915_texture *i915_texture( struct pipe_resource *resource )
+static INLINE struct i915_texture *i915_texture(struct pipe_resource *resource)
{
struct i915_texture *tex = (struct i915_texture *)resource;
assert(tex->b.vtbl == &i915_texture_vtbl);
return tex;
}
-static INLINE struct i915_buffer *i915_buffer( struct pipe_resource *resource )
+static INLINE struct i915_buffer *i915_buffer(struct pipe_resource *resource)
{
struct i915_buffer *tex = (struct i915_buffer *)resource;
assert(tex->b.vtbl == &i915_buffer_vtbl);
diff --git a/src/gallium/drivers/i915/i915_resource_texture.c b/src/gallium/drivers/i915/i915_resource_texture.c
index 92ba3ddb81e..144671228d6 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;