Indentation cleanup, to keep consistency.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
#define RADEON_BO_FLAGS_MICRO_TILE_SQUARE 0x20
#ifndef DRM_RADEON_GEM_WAIT
#define RADEON_BO_FLAGS_MICRO_TILE_SQUARE 0x20
#ifndef DRM_RADEON_GEM_WAIT
-#define DRM_RADEON_GEM_WAIT 0x2b
+#define DRM_RADEON_GEM_WAIT 0x2b
-#define RADEON_GEM_NO_WAIT 0x1
-#define RADEON_GEM_USAGE_READ 0x2
-#define RADEON_GEM_USAGE_WRITE 0x4
+#define RADEON_GEM_NO_WAIT 0x1
+#define RADEON_GEM_USAGE_READ 0x2
+#define RADEON_GEM_USAGE_WRITE 0x4
struct drm_radeon_gem_wait {
struct drm_radeon_gem_wait {
- uint32_t handle;
- uint32_t flags; /* one of RADEON_GEM_* */
+ uint32_t handle;
+ uint32_t flags; /* one of RADEON_GEM_* */
if (_buf->vtbl == &radeon_bo_vtbl) {
bo = radeon_bo(_buf);
} else {
if (_buf->vtbl == &radeon_bo_vtbl) {
bo = radeon_bo(_buf);
} else {
- struct pb_buffer *base_buf;
- pb_size offset;
- pb_get_base_buffer(_buf, &base_buf, &offset);
+ struct pb_buffer *base_buf;
+ pb_size offset;
+ pb_get_base_buffer(_buf, &base_buf, &offset);
if (base_buf->vtbl == &radeon_bo_vtbl)
bo = radeon_bo(base_buf);
if (base_buf->vtbl == &radeon_bo_vtbl)
bo = radeon_bo(base_buf);
if (bo->name) {
pipe_mutex_lock(bo->mgr->bo_handles_mutex);
util_hash_table_remove(bo->mgr->bo_handles,
if (bo->name) {
pipe_mutex_lock(bo->mgr->bo_handles_mutex);
util_hash_table_remove(bo->mgr->bo_handles,
- (void*)(uintptr_t)bo->name);
+ (void*)(uintptr_t)bo->name);
pipe_mutex_unlock(bo->mgr->bo_handles_mutex);
}
pipe_mutex_unlock(bo->mgr->bo_handles_mutex);
}
}
static void radeon_bo_get_base_buffer(struct pb_buffer *buf,
}
static void radeon_bo_get_base_buffer(struct pb_buffer *buf,
- struct pb_buffer **base_buf,
- unsigned *offset)
+ struct pb_buffer **base_buf,
+ unsigned *offset)
{
*base_buf = buf;
*offset = 0;
}
static enum pipe_error radeon_bo_validate(struct pb_buffer *_buf,
{
*base_buf = buf;
*offset = 0;
}
static enum pipe_error radeon_bo_validate(struct pb_buffer *_buf,
- struct pb_validate *vl,
- unsigned flags)
+ struct pb_validate *vl,
+ unsigned flags)
{
/* Always pinned */
return PIPE_OK;
{
/* Always pinned */
return PIPE_OK;
};
static struct pb_buffer *radeon_bomgr_create_bo(struct pb_manager *_mgr,
};
static struct pb_buffer *radeon_bomgr_create_bo(struct pb_manager *_mgr,
- pb_size size,
- const struct pb_desc *desc)
+ pb_size size,
+ const struct pb_desc *desc)
{
struct radeon_bomgr *mgr = radeon_bomgr(_mgr);
struct radeon_drm_winsys *rws = mgr->rws;
{
struct radeon_bomgr *mgr = radeon_bomgr(_mgr);
struct radeon_drm_winsys *rws = mgr->rws;
bo = CALLOC_STRUCT(radeon_bo);
if (!bo)
bo = CALLOC_STRUCT(radeon_bo);
if (!bo)
pipe_reference_init(&bo->base.reference, 1);
bo->base.alignment = desc->alignment;
pipe_reference_init(&bo->base.reference, 1);
bo->base.alignment = desc->alignment;
mgr = CALLOC_STRUCT(radeon_bomgr);
if (!mgr)
mgr = CALLOC_STRUCT(radeon_bomgr);
if (!mgr)
mgr->base.destroy = radeon_bomgr_destroy;
mgr->base.create_buffer = radeon_bomgr_create_bo;
mgr->base.destroy = radeon_bomgr_destroy;
mgr->base.create_buffer = radeon_bomgr_create_bo;
*microtiled = RADEON_LAYOUT_LINEAR;
*macrotiled = RADEON_LAYOUT_LINEAR;
if (args.tiling_flags & RADEON_BO_FLAGS_MICRO_TILE)
*microtiled = RADEON_LAYOUT_LINEAR;
*macrotiled = RADEON_LAYOUT_LINEAR;
if (args.tiling_flags & RADEON_BO_FLAGS_MICRO_TILE)
- *microtiled = RADEON_LAYOUT_TILED;
+ *microtiled = RADEON_LAYOUT_TILED;
if (args.tiling_flags & RADEON_BO_FLAGS_MACRO_TILE)
if (args.tiling_flags & RADEON_BO_FLAGS_MACRO_TILE)
- *macrotiled = RADEON_LAYOUT_TILED;
+ *macrotiled = RADEON_LAYOUT_TILED;
}
static void radeon_bo_set_tiling(struct pb_buffer *_buf,
}
static void radeon_bo_set_tiling(struct pb_buffer *_buf,
/* Assign a buffer manager. */
if (bind & (PIPE_BIND_VERTEX_BUFFER | PIPE_BIND_INDEX_BUFFER |
PIPE_BIND_CONSTANT_BUFFER | PIPE_BIND_CUSTOM))
/* Assign a buffer manager. */
if (bind & (PIPE_BIND_VERTEX_BUFFER | PIPE_BIND_INDEX_BUFFER |
PIPE_BIND_CONSTANT_BUFFER | PIPE_BIND_CUSTOM))
else
provider = ws->kman;
buffer = provider->create_buffer(provider, size, &desc.base);
if (!buffer)
else
provider = ws->kman;
buffer = provider->create_buffer(provider, size, &desc.base);
if (!buffer)
return (struct pb_buffer*)buffer;
}
return (struct pb_buffer*)buffer;
}
/* Relocs. */
unsigned nrelocs;
unsigned crelocs;
/* Relocs. */
unsigned nrelocs;
unsigned crelocs;
- unsigned validated_crelocs;
+ unsigned validated_crelocs;
struct radeon_bo **relocs_bo;
struct drm_radeon_cs_reloc *relocs;
struct radeon_bo **relocs_bo;
struct drm_radeon_cs_reloc *relocs;
/* Create managers. */
ws->kman = radeon_bomgr_create(ws);
if (!ws->kman)
/* Create managers. */
ws->kman = radeon_bomgr_create(ws);
if (!ws->kman)
ws->cman = pb_cache_manager_create(ws->kman, 1000000);
if (!ws->cman)
ws->cman = pb_cache_manager_create(ws->kman, 1000000);
if (!ws->cman)
/* Set functions. */
ws->base.destroy = radeon_winsys_destroy;
/* Set functions. */
ws->base.destroy = radeon_winsys_destroy;
- ws->cman->destroy(ws->cman);
+ ws->cman->destroy(ws->cman);
- ws->kman->destroy(ws->kman);
+ ws->kman->destroy(ws->kman);
*
* \param cs A command stream.
* \param fid Feature ID, one of RADEON_FID_*
*
* \param cs A command stream.
* \param fid Feature ID, one of RADEON_FID_*
- * \param enable Whether to enable or disable the feature.
+ * \param enable Whether to enable or disable the feature.
*/
boolean (*cs_request_feature)(struct radeon_winsys_cs *cs,
enum radeon_feature_id fid,
*/
boolean (*cs_request_feature)(struct radeon_winsys_cs *cs,
enum radeon_feature_id fid,