summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian <[email protected]>2007-08-06 15:50:03 -0600
committerBrian <[email protected]>2007-08-06 15:50:03 -0600
commit9ee61c97003ed78579d1238f552a3d815738c211 (patch)
tree0a98ee1f5220d06b05e84b5a28d630267a76d33a
parent1cc774f8da4ce9d7defb5419b07e1bdb8b8275a1 (diff)
clean-ups
-rw-r--r--src/mesa/drivers/dri/intel/intel_tex_layout.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_tex_layout.c b/src/mesa/drivers/dri/intel/intel_tex_layout.c
index 433a2c5f47e..344aff396f7 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_layout.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_layout.c
@@ -49,9 +49,9 @@ static int align(int value, int alignment)
static void
intel_miptree_set_level_info(struct pipe_mipmap_tree *mt,
- GLuint level,
- GLuint nr_images,
- GLuint x, GLuint y, GLuint w, GLuint h, GLuint d)
+ GLuint level,
+ GLuint nr_images,
+ GLuint x, GLuint y, GLuint w, GLuint h, GLuint d)
{
assert(level < MAX_TEXTURE_LEVELS);
@@ -74,8 +74,9 @@ intel_miptree_set_level_info(struct pipe_mipmap_tree *mt,
}
assert(nr_images);
+ assert(!mt->level[level].image_offset);
- mt->level[level].image_offset = malloc(nr_images * sizeof(GLuint));
+ mt->level[level].image_offset = (GLuint *) malloc(nr_images * sizeof(GLuint));
mt->level[level].image_offset[0] = 0;
}