fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 05:08:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i915: Silence unused parameter warning in intel_miptree_create_layout

Browse source 
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 <ian.d.romanick@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
This commit is contained in:
Ian Romanick 2015-09-02 15:11:34 -07:00
parent 5c8aa21309
commit 307d5e5849
3 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/mesa/drivers/dri/i915/intel_mipmap_tree.c
View file

@ -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;

3
src/mesa/drivers/dri/i915/intel_mipmap_tree.h
View file

@ -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,

3
src/mesa/drivers/dri/i915/intel_tex_image.c
View file

@ -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);