i965: Fix 32 bit build warnings in intel_get_yf_ys_bo_size()
authorAnuj Phogat <anuj.phogat@gmail.com>
Tue, 7 Jul 2015 19:23:33 +0000 (12:23 -0700)
committerAnuj Phogat <anuj.phogat@gmail.com>
Wed, 15 Jul 2015 22:02:02 +0000 (15:02 -0700)
Along with fixing the type of pitch parameter, patch also changes
the types of few local variables and function return type.

Warnings fixed are:
intel_mipmap_tree.c:671:7: warning: passing argument 3 of
'intel_get_yf_ys_bo_size' from incompatible pointer type

intel_mipmap_tree.c:563:1: note: expected 'uint64_t *' but
argument is of type 'long unsigned int *'

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
src/mesa/drivers/dri/i965/intel_mipmap_tree.c

index fb896a9226363611e775dddb202906b545404267..152965189418b212e39b5b725d0096ae0598e538 100644 (file)
@@ -559,14 +559,14 @@ intel_lower_compressed_format(struct brw_context *brw, mesa_format format)
 }
 
 /* This function computes Yf/Ys tiled bo size, alignment and pitch. */
-static uint64_t
+static unsigned long
 intel_get_yf_ys_bo_size(struct intel_mipmap_tree *mt, unsigned *alignment,
-                        uint64_t *pitch)
+                        unsigned long *pitch)
 {
    const uint32_t bpp = mt->cpp * 8;
    const uint32_t aspect_ratio = (bpp == 16 || bpp == 64) ? 2 : 1;
    uint32_t tile_width, tile_height;
-   uint64_t stride, size, aligned_y;
+   unsigned long stride, size, aligned_y;
 
    assert(mt->tr_mode != INTEL_MIPTREE_TRMODE_NONE);