From: Ian Romanick <ian.d.roman...@intel.com>
The depth0 parameter was not used in intel_miptree_create_for_region,
so remove it. All of the places that call this function, pass 1 for
that parameter, and the place where it looks like it should have been
used (the call to intel_miptree_create_internal) also had 1 hard
coded.
---
src/mesa/drivers/dri/intel/intel_mipmap_tree.c | 3 +--
src/mesa/drivers/dri/intel/intel_mipmap_tree.h | 3 +--
src/mesa/drivers/dri/intel/intel_tex_image.c | 5 ++---
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
index 72cdd4c..7739fa4 100644
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
@@ -161,8 +161,7 @@ struct intel_mipmap_tree *
intel_miptree_create_for_region(struct intel_context *intel,
GLenum target,
gl_format format,
- struct intel_region *region,
- GLuint depth0)
+ struct intel_region *region)
{
struct intel_mipmap_tree *mt;
diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.h
b/src/mesa/drivers/dri/intel/intel_mipmap_tree.h
index ff746d7..7f20319 100644
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.h
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.h
@@ -148,8 +148,7 @@ struct intel_mipmap_tree *
intel_miptree_create_for_region(struct intel_context *intel,
GLenum target,
gl_format format,
- struct intel_region *region,
- GLuint depth0);
+ struct intel_region *region);
int intel_miptree_pitch_align (struct intel_context *intel,
struct intel_mipmap_tree *mt,
diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c
b/src/mesa/drivers/dri/intel/intel_tex_image.c
index 29a6d3b..2bbd952 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_image.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c
@@ -790,8 +790,7 @@ intelSetTexBuffer2(__DRIcontext *pDRICtx, GLint target,
texFormat = MESA_FORMAT_ARGB8888;
}
- mt = intel_miptree_create_for_region(intel, target, texFormat,
- rb->region, 1);
+ mt = intel_miptree_create_for_region(intel, target, texFormat, rb->region);
if (mt == NULL)
return;
@@ -853,7 +852,7 @@ intel_image_target_texture_2d(struct gl_context *ctx,
GLenum target,
return;
mt = intel_miptree_create_for_region(intel, target, image->format,
- image->region, 1);
+ image->region);
if (mt == NULL)
return;
--
1.7.4.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
