i965/drm: Make brw_bo_alloc_tiled flags parameter 32-bit.

unsigned long is a terrible type for a bitfield - if you need fewer
than 32 bits, it wastes 4 bytes.  If you need more, things break on
32-bit builds.  Just use unsigned.

Even that's a bit ridiculous as we only have one flag today.
Still, it's at least somewhat better.

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Kenneth Graunke 2017-04-11 00:02:35 -07:00
parent f374b9449e
commit 44ecbbebe2
3 changed files with 4 additions and 4 deletions

View file

@ -245,7 +245,7 @@ static struct brw_bo *
bo_alloc_internal(struct brw_bufmgr *bufmgr, bo_alloc_internal(struct brw_bufmgr *bufmgr,
const char *name, const char *name,
uint64_t size, uint64_t size,
unsigned long flags, unsigned flags,
uint32_t tiling_mode, uint32_t tiling_mode,
uint32_t stride, uint64_t alignment) uint32_t stride, uint64_t alignment)
{ {
@ -377,7 +377,7 @@ brw_bo_alloc(struct brw_bufmgr *bufmgr,
struct brw_bo * struct brw_bo *
brw_bo_alloc_tiled(struct brw_bufmgr *bufmgr, const char *name, brw_bo_alloc_tiled(struct brw_bufmgr *bufmgr, const char *name,
int x, int y, int cpp, uint32_t tiling, int x, int y, int cpp, uint32_t tiling,
uint32_t *pitch, unsigned long flags) uint32_t *pitch, unsigned flags)
{ {
uint64_t size; uint64_t size;
uint32_t stride; uint32_t stride;

View file

@ -162,7 +162,7 @@ struct brw_bo *brw_bo_alloc_tiled(struct brw_bufmgr *bufmgr,
int x, int y, int cpp, int x, int y, int cpp,
uint32_t tiling_mode, uint32_t tiling_mode,
uint32_t *pitch, uint32_t *pitch,
unsigned long flags); unsigned flags);
/** Takes a reference on a buffer object */ /** Takes a reference on a buffer object */
void brw_bo_reference(struct brw_bo *bo); void brw_bo_reference(struct brw_bo *bo);

View file

@ -1290,7 +1290,7 @@ static bool
intel_detect_swizzling(struct intel_screen *screen) intel_detect_swizzling(struct intel_screen *screen)
{ {
struct brw_bo *buffer; struct brw_bo *buffer;
unsigned long flags = 0; unsigned flags = 0;
uint32_t aligned_pitch; uint32_t aligned_pitch;
uint32_t tiling = I915_TILING_X; uint32_t tiling = I915_TILING_X;
uint32_t swizzle_mode = 0; uint32_t swizzle_mode = 0;