aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i915
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2015-09-02 15:11:34 -0700
committerIan Romanick <[email protected]>2015-09-10 20:29:51 -0700
commit307d5e58496a73bace8c89dbdbba91be171b7c95 (patch)
treeb78480a408f53607833a429a324a1ab7ddc18eb8 /src/mesa/drivers/dri/i915
parent5c8aa21309cb8cabd61b73b6706b295d6237d53d (diff)
i915: Silence unused parameter warning in intel_miptree_create_layout
The for_bo parameter of intel_miptree_create_layout appears to be unused since 27eedca when Eric removed some Gen5 code (after the i915 and i965 drivers parted ways). intel_mipmap_tree.c: In function 'old_intel_miptree_create_layout': intel_mipmap_tree.c:77:35: warning: unused parameter 'for_bo' [-Wunused-parameter] bool for_bo) ^ Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Anuj Phogat <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i915')
-rw-r--r--src/mesa/drivers/dri/i915/intel_mipmap_tree.c14
-rw-r--r--src/mesa/drivers/dri/i915/intel_mipmap_tree.h3
-rw-r--r--src/mesa/drivers/dri/i915/intel_tex_image.c3
3 files changed, 5 insertions, 15 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_mipmap_tree.c b/src/mesa/drivers/dri/i915/intel_mipmap_tree.c
index 307ad4df891..5cbf7634fcc 100644
--- a/src/mesa/drivers/dri/i915/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i915/intel_mipmap_tree.c
@@ -60,11 +60,6 @@ target_to_target(GLenum target)
}
}
-/**
- * @param for_bo Indicates that the caller is
- * intel_miptree_create_for_bo(). If true, then do not create
- * \c stencil_mt.
- */
struct intel_mipmap_tree *
intel_miptree_create_layout(struct intel_context *intel,
GLenum target,
@@ -73,8 +68,7 @@ intel_miptree_create_layout(struct intel_context *intel,
GLuint last_level,
GLuint width0,
GLuint height0,
- GLuint depth0,
- bool for_bo)
+ GLuint depth0)
{
struct intel_mipmap_tree *mt = calloc(sizeof(*mt), 1);
if (!mt)
@@ -181,8 +175,7 @@ intel_miptree_create(struct intel_context *intel,
mt = intel_miptree_create_layout(intel, target, format,
first_level, last_level, width0,
- height0, depth0,
- false);
+ height0, depth0);
/*
* pitch == 0 || height == 0 indicates the null texture
*/
@@ -262,8 +255,7 @@ intel_miptree_create_for_bo(struct intel_context *intel,
mt = intel_miptree_create_layout(intel, GL_TEXTURE_2D, format,
0, 0,
- width, height, 1,
- true);
+ width, height, 1);
if (!mt) {
free(region);
return mt;
diff --git a/src/mesa/drivers/dri/i915/intel_mipmap_tree.h b/src/mesa/drivers/dri/i915/intel_mipmap_tree.h
index aab30ed1f55..2520b3035b2 100644
--- a/src/mesa/drivers/dri/i915/intel_mipmap_tree.h
+++ b/src/mesa/drivers/dri/i915/intel_mipmap_tree.h
@@ -240,8 +240,7 @@ intel_miptree_create_layout(struct intel_context *intel,
GLuint last_level,
GLuint width0,
GLuint height0,
- GLuint depth0,
- bool for_bo);
+ GLuint depth0);
struct intel_mipmap_tree *
intel_miptree_create_for_bo(struct intel_context *intel,
diff --git a/src/mesa/drivers/dri/i915/intel_tex_image.c b/src/mesa/drivers/dri/i915/intel_tex_image.c
index 5ab60d16173..63ef08b44a6 100644
--- a/src/mesa/drivers/dri/i915/intel_tex_image.c
+++ b/src/mesa/drivers/dri/i915/intel_tex_image.c
@@ -241,8 +241,7 @@ intel_set_texture_image_region(struct gl_context *ctx,
intel_image->mt = intel_miptree_create_layout(intel, target, image->TexFormat,
0, 0,
- width, height, 1,
- true);
+ width, height, 1);
if (intel_image->mt == NULL)
return;
intel_region_reference(&intel_image->mt->region, region);