From 7014df0d1da97b655014eb783fa9f34c78a93631 Mon Sep 17 00:00:00 2001 From: Abdiel Janulgue Date: Thu, 17 Jan 2013 17:04:01 +0200 Subject: [PATCH] intel: Expose intel_miptree_create_internal as intel_miptree_create_layout. Reviewed-by: Eric Anholt Reviewed-by: Chad Versace Signed-off-by: Abdiel Janulgue --- .../drivers/dri/intel/intel_mipmap_tree.c | 27 +++++++++---------- .../drivers/dri/intel/intel_mipmap_tree.h | 12 +++++++++ 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c index a6fa19a40d2..05f5a4d657a 100644 --- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c @@ -112,17 +112,17 @@ compute_msaa_layout(struct intel_context *intel, gl_format format) * intel_miptree_create_for_region(). If true, then do not create * \c stencil_mt. */ -static struct intel_mipmap_tree * -intel_miptree_create_internal(struct intel_context *intel, - GLenum target, - gl_format format, - GLuint first_level, - GLuint last_level, - GLuint width0, - GLuint height0, - GLuint depth0, - bool for_region, - GLuint num_samples) +struct intel_mipmap_tree * +intel_miptree_create_layout(struct intel_context *intel, + GLenum target, + gl_format format, + GLuint first_level, + GLuint last_level, + GLuint width0, + GLuint height0, + GLuint depth0, + bool for_region, + GLuint num_samples) { struct intel_mipmap_tree *mt = calloc(sizeof(*mt), 1); int compress_byte = 0; @@ -365,7 +365,7 @@ intel_miptree_create(struct intel_context *intel, tiling = I915_TILING_X; } - mt = intel_miptree_create_internal(intel, target, format, + mt = intel_miptree_create_layout(intel, target, format, first_level, last_level, width0, height0, depth0, false, num_samples); @@ -408,7 +408,6 @@ intel_miptree_create(struct intel_context *intel, return mt; } - struct intel_mipmap_tree * intel_miptree_create_for_region(struct intel_context *intel, GLenum target, @@ -417,7 +416,7 @@ intel_miptree_create_for_region(struct intel_context *intel, { struct intel_mipmap_tree *mt; - mt = intel_miptree_create_internal(intel, target, format, + mt = intel_miptree_create_layout(intel, target, format, 0, 0, region->width, region->height, 1, true, 0 /* num_samples */); diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.h b/src/mesa/drivers/dri/intel/intel_mipmap_tree.h index a3f013f4d85..a8f27d96a58 100644 --- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.h +++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.h @@ -393,6 +393,18 @@ struct intel_mipmap_tree *intel_miptree_create(struct intel_context *intel, GLuint num_samples, bool force_y_tiling); +struct intel_mipmap_tree * +intel_miptree_create_layout(struct intel_context *intel, + GLenum target, + gl_format format, + GLuint first_level, + GLuint last_level, + GLuint width0, + GLuint height0, + GLuint depth0, + bool for_region, + GLuint num_samples); + struct intel_mipmap_tree * intel_miptree_create_for_region(struct intel_context *intel, GLenum target, -- 2.30.2