summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
diff options
context:
space:
mode:
authorAnuj Phogat <anuj.phogat@gmail.com>2015-07-07 12:23:33 -0700
committerAnuj Phogat <anuj.phogat@gmail.com>2015-07-15 15:02:02 -0700
commit642f289824dc9a07e8209c905badef31b4841ae1 (patch)
treefc11c56f4595e1562ec09338962a8d1c42071108 /src/mesa/drivers/dri/i965/intel_mipmap_tree.c
parentf11c6f09cf36909ff399353b20195a31cf0f1907 (diff)
downloadexternal_mesa3d-642f289824dc9a07e8209c905badef31b4841ae1.zip
external_mesa3d-642f289824dc9a07e8209c905badef31b4841ae1.tar.gz
external_mesa3d-642f289824dc9a07e8209c905badef31b4841ae1.tar.bz2
i965: Fix 32 bit build warnings in intel_get_yf_ys_bo_size()
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>
Diffstat (limited to 'src/mesa/drivers/dri/i965/intel_mipmap_tree.c')
-rw-r--r--src/mesa/drivers/dri/i965/intel_mipmap_tree.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
index fb896a9..1529651 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -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);