diff options
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.c | 18 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.h | 2 | ||||
| -rw-r--r-- | src/gallium/winsys/radeon/drm/radeon_drm_bo.c | 3 | ||||
| -rw-r--r-- | src/gallium/winsys/radeon/drm/radeon_drm_cs.h | 2 |
4 files changed, 12 insertions, 13 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index f6db3bf9699..7a7a4315ec8 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -292,21 +292,21 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void rctx->cs = rctx->ws->cs_create(rctx->ws); rctx->ws->cs_set_flush_callback(rctx->cs, r600_flush_from_winsys, rctx); - rctx->uploader = u_upload_create(&rctx->context, 1024 * 1024, 256, - PIPE_BIND_INDEX_BUFFER | - PIPE_BIND_CONSTANT_BUFFER); - if (!rctx->uploader) - goto fail; + rctx->uploader = u_upload_create(&rctx->context, 1024 * 1024, 256, + PIPE_BIND_INDEX_BUFFER | + PIPE_BIND_CONSTANT_BUFFER); + if (!rctx->uploader) + goto fail; rctx->allocator_fetch_shader = u_suballocator_create(&rctx->context, 64 * 1024, 256, 0, PIPE_USAGE_STATIC, FALSE); - if (!rctx->allocator_fetch_shader) - goto fail; + if (!rctx->allocator_fetch_shader) + goto fail; rctx->allocator_so_filled_size = u_suballocator_create(&rctx->context, 4096, 4, - 0, PIPE_USAGE_STATIC, TRUE); + 0, PIPE_USAGE_STATIC, TRUE); if (!rctx->allocator_so_filled_size) - goto fail; + goto fail; rctx->blitter = util_blitter_create(&rctx->context); if (rctx->blitter == NULL) diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h index 6b7c0537604..934a6f547c0 100644 --- a/src/gallium/drivers/r600/r600_pipe.h +++ b/src/gallium/drivers/r600/r600_pipe.h @@ -408,7 +408,7 @@ struct r600_context { struct radeon_winsys *ws; struct radeon_winsys_cs *cs; struct blitter_context *blitter; - struct u_upload_mgr *uploader; + struct u_upload_mgr *uploader; struct u_suballocator *allocator_so_filled_size; struct u_suballocator *allocator_fetch_shader; struct util_slab_mempool pool_transfers; diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c index 07e92c591b5..897e9627dbc 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c @@ -802,8 +802,7 @@ static void radeon_bo_set_tiling(struct pb_buffer *_buf, sizeof(args)); } -static struct radeon_winsys_cs_handle *radeon_drm_get_cs_handle( - struct pb_buffer *_buf) +static struct radeon_winsys_cs_handle *radeon_drm_get_cs_handle(struct pb_buffer *_buf) { /* return radeon_bo. */ return (struct radeon_winsys_cs_handle*)get_radeon_bo(_buf); diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_cs.h b/src/gallium/winsys/radeon/drm/radeon_drm_cs.h index 6336d3a3788..286eb6a3409 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_cs.h +++ b/src/gallium/winsys/radeon/drm/radeon_drm_cs.h @@ -33,7 +33,7 @@ struct radeon_cs_context { uint32_t buf[RADEON_MAX_CMDBUF_DWORDS]; - int fd; + int fd; struct drm_radeon_cs cs; struct drm_radeon_cs_chunk chunks[3]; uint64_t chunk_array[3]; |